From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D7A4C433DF for ; Wed, 15 Jul 2020 05:33:57 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E59602068F for ; Wed, 15 Jul 2020 05:33:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NhrtZKIz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E59602068F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 93A706B0006; Wed, 15 Jul 2020 01:33:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8C2698D0001; Wed, 15 Jul 2020 01:33:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 78B316B0008; Wed, 15 Jul 2020 01:33:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0079.hostedemail.com [216.40.44.79]) by kanga.kvack.org (Postfix) with ESMTP id 63B546B0006 for ; Wed, 15 Jul 2020 01:33:56 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 20D6F180AD801 for ; Wed, 15 Jul 2020 05:33:56 +0000 (UTC) X-FDA: 77039193672.16.stew47_4a1859a26ef7 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin16.hostedemail.com (Postfix) with ESMTP id E63D6100E6903 for ; Wed, 15 Jul 2020 05:33:55 +0000 (UTC) X-HE-Tag: stew47_4a1859a26ef7 X-Filterd-Recvd-Size: 3922 Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com [209.85.208.195]) by imf28.hostedemail.com (Postfix) with ESMTP for ; Wed, 15 Jul 2020 05:33:55 +0000 (UTC) Received: by mail-lj1-f195.google.com with SMTP id x9so1157015ljc.5 for ; Tue, 14 Jul 2020 22:33:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Eq+bIFfgQTb97v8yD8SXsGZ7hBTmnEuGWYIyVfq/yxU=; b=NhrtZKIz219V8XewG3GrAyE4wvFUTWamVgOH1iFD5I6vYqGbd/xWjMf3DBuRBDXFUu AXBf/X+5ho3Fin4BARKYvy8mpg/su+KFhTCFdzXDqAxwuGxzgbhnxY1ZWyNG//hdYIs2 t8ogbKWtDU6ojupKtFlLMmbUBj+nkGIXvav6el2oADN5Xg/NDwOUR3WQDR7f37Qgs2vV TNRXBSk9f82C6F9IigQ+hMbrXRjE71KVVyt5HTVU0Sul03Q9U7VVwdYY40HjnK9qhz3s 2oVwy0Bj9czZMApw+0lrSY/O1EmBMyDPtDKPo0D1E277zHnHrhDp21H0KSb+ZeNCXkf7 lLwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Eq+bIFfgQTb97v8yD8SXsGZ7hBTmnEuGWYIyVfq/yxU=; b=ooii6BpLMwSQTYdOihNXz6tKX7gfU1JIdvI1M5yGcpSZVbdE1bMCK03sOvaOd2bSTA 9xHyu8gmbjJwdTheAOAzStppoFHSIeJ2mvqkJBCtjAUsKrdrU82FbPqwqRweB7ynpaLk q6RmMKWRrefv0MJ2RsGmI9qq26C8jkWjmuD7FoivXTNn+vPxaYE4dQrT531nwGmpPo0u AktyUkHSFx9RuoRYBHmM/Zo6/y2i4Qgg1keTCfAOKEwtkdE4zaI7WBP3Vf72O2m3NFOH gpZWt4ZqibzPhgwqikE9rFqGnTj2cMuW9nx2unisa+35qzTNnvCWThACFrhZ620o4vbt 2zJw== X-Gm-Message-State: AOAM532KYHBPlqT1MZfX+Z84Jd5fv10TvyHPr+XIA6H1kA9cQB5idy6i wlw+6X6dPS3Ijhd9OlSEEdU= X-Google-Smtp-Source: ABdhPJw4nXKRH3xtt7VpkL3GFt2dkC7cG8GVkF0QkUyyTu7bZeWyycYtFmUcCvNlyA/TpM3UcgYB0g== X-Received: by 2002:a2e:9acc:: with SMTP id p12mr4276964ljj.363.1594791234334; Tue, 14 Jul 2020 22:33:54 -0700 (PDT) Received: from nero.bb.dnainternet.fi (dyn9cmyyyyyyyyyyyyyft-3.rev.dnainternet.fi. [2001:14ba:2fa:2500::9]) by smtp.gmail.com with ESMTPSA id h14sm233916ljb.53.2020.07.14.22.33.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jul 2020 22:33:53 -0700 (PDT) From: Pekka Enberg To: linux-riscv@lists.infradead.org, linux-mm@kvack.org Cc: Pekka Enberg , Palmer Dabbelt Subject: [PATCH v2 2/2] riscv: Use generic pgprot_* macros from Date: Wed, 15 Jul 2020 08:33:40 +0300 Message-Id: <20200715053340.576300-2-penberg@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200715053340.576300-1-penberg@gmail.com> References: <20200715053340.576300-1-penberg@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: E63D6100E6903 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Pekka Enberg The header now defines generic pgprot_ macros also for the no-MMU configuration, so let's use them. Cc: Palmer Dabbelt Signed-off-by: Pekka Enberg --- arch/riscv/include/asm/mmio.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/riscv/include/asm/mmio.h b/arch/riscv/include/asm/mmio.= h index 56053c9838b2..aff6c33ab0c0 100644 --- a/arch/riscv/include/asm/mmio.h +++ b/arch/riscv/include/asm/mmio.h @@ -14,12 +14,6 @@ #include #include =20 -#ifndef CONFIG_MMU -#define pgprot_noncached(x) (x) -#define pgprot_writecombine(x) (x) -#define pgprot_device(x) (x) -#endif /* CONFIG_MMU */ - /* Generic IO read/write. These perform native-endian accesses. */ #define __raw_writeb __raw_writeb static inline void __raw_writeb(u8 val, volatile void __iomem *addr) --=20 2.26.2