From patchwork Fri Oct 9 22:15:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 7364571 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5627EBEEA4 for ; Fri, 9 Oct 2015 22:23:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6C53520864 for ; Fri, 9 Oct 2015 22:23:49 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4AFC020764 for ; Fri, 9 Oct 2015 22:23:46 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Zkg3B-00015l-W4; Fri, 09 Oct 2015 22:22:06 +0000 Received: from mga02.intel.com ([134.134.136.20]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Zkg32-0000xw-PJ for linux-arm-kernel@lists.infradead.org; Fri, 09 Oct 2015 22:21:58 +0000 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP; 09 Oct 2015 15:21:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,660,1437462000"; d="scan'208";a="823483513" Received: from dwillia2-desk3.jf.intel.com ([10.54.39.39]) by fmsmga002.fm.intel.com with ESMTP; 09 Oct 2015 15:21:36 -0700 Subject: [PATCH 03/20] ia64: introduce arch_memremap() From: Dan Williams To: linux-kernel@vger.kernel.org Date: Fri, 09 Oct 2015 18:15:53 -0400 Message-ID: <20151009221553.32203.23192.stgit@dwillia2-desk3.jf.intel.com> In-Reply-To: <20151009221537.32203.5867.stgit@dwillia2-desk3.jf.intel.com> References: <20151009221537.32203.5867.stgit@dwillia2-desk3.jf.intel.com> User-Agent: StGit/0.17.1-9-g687f MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151009_152157_002415_BC8F9EDA X-CRM114-Status: GOOD ( 11.78 ) X-Spam-Score: -6.9 (------) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arch@vger.kernel.org, Ross Zwisler , Tony Luck , Arnd Bergmann , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In preparation for removing ioremap_cache() introduce arch_memremap() for ia64. Given that ia64 does not allow external control for caching types, this simply aliases arch_memremap() with the ia64 ioremap() implementation. Cc: Arnd Bergmann Cc: Tony Luck Cc: Ross Zwisler Signed-off-by: Dan Williams --- arch/ia64/Kconfig | 1 + arch/ia64/mm/ioremap.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index eb0249e37981..b39bab1da7dd 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -52,6 +52,7 @@ config IA64 select HAVE_MOD_ARCH_SPECIFIC select MODULES_USE_ELF_RELA select ARCH_USE_CMPXCHG_LOCKREF + select ARCH_HAS_MEMREMAP select HAVE_ARCH_AUDITSYSCALL default y help diff --git a/arch/ia64/mm/ioremap.c b/arch/ia64/mm/ioremap.c index 43964cde6214..53a1faa0e5da 100644 --- a/arch/ia64/mm/ioremap.c +++ b/arch/ia64/mm/ioremap.c @@ -101,6 +101,16 @@ ioremap (unsigned long phys_addr, unsigned long size) } EXPORT_SYMBOL(ioremap); +/* + * Cache mapping-type is determined internal to ioremap and can't be + * externally specified + */ +void *arch_memremap(resource_size_t offset, size_t size, unsigned long flags) +{ + return (void __force *) ioremap(offset, size); +} +EXPORT_SYMBOL(arch_memremap); + void __iomem * ioremap_nocache (unsigned long phys_addr, unsigned long size) {