[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <lsq.1407170912.229441953@decadent.org.uk>
Date: Mon, 04 Aug 2014 17:48:32 +0100
From: Ben Hutchings <ben@...adent.org.uk>
To: linux-kernel@...r.kernel.org, stable@...r.kernel.org
CC: akpm@...ux-foundation.org, "Guan Xuetao" <gxt@...c.pku.edu.cn>,
"Jonas Bonn" <jonas@...thpole.se>, "Arnd Bergmann" <arnd@...db.de>
Subject: [PATCH 3.2 73/94] unicore32: add ioremap_nocache definition
3.2.62-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Guan Xuetao <gxt@...c.pku.edu.cn>
commit a50e4213e71adc7dde0d514aabd8af7275fee39f upstream.
Bugfix for following error messages:
lib/iomap.c: In function 'pci_iomap':
lib/iomap.c:274: error: implicit declaration of function 'ioremap_nocache'
lib/iomap.c:274: warning: return makes pointer from integer without a cast
Also see commit <f1ecc69838a2d7c8a3e1909f637d4083c071777d>
it will hide the ioremap_nocache function for systems with an MMU
Signed-off-by: Guan Xuetao <gxt@...c.pku.edu.cn>
Cc: Arnd Bergmann <arnd@...db.de>
Cc: Jonas Bonn <jonas@...thpole.se>
Signed-off-by: Ben Hutchings <ben@...adent.org.uk>
---
arch/unicore32/include/asm/io.h | 1 +
1 file changed, 1 insertion(+)
--- a/arch/unicore32/include/asm/io.h
+++ b/arch/unicore32/include/asm/io.h
@@ -37,6 +37,7 @@ extern void __uc32_iounmap(volatile void
*/
#define ioremap(cookie, size) __uc32_ioremap(cookie, size)
#define ioremap_cached(cookie, size) __uc32_ioremap_cached(cookie, size)
+#define ioremap_nocache(cookie, size) __uc32_ioremap(cookie, size)
#define iounmap(cookie) __uc32_iounmap(cookie)
/*
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists