From 25353e24efd4f4037267fed0fa4e8c5dcbcd9575 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 6 Oct 2015 22:00:43 +0100 Subject: [PATCH] [mips*] io: Define ioremap_uc (fixes FTBFS) --- debian/changelog | 1 + .../mips/mips-io-define-ioremap_uc.patch | 27 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 29 insertions(+) create mode 100644 debian/patches/bugfix/mips/mips-io-define-ioremap_uc.patch diff --git a/debian/changelog b/debian/changelog index 79729d717..2f923ae7a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ linux (4.3~rc3-1~exp2) UNRELEASED; urgency=medium * [armhf] dts: Fix Makefile target for sun4i-a10-itead-iteaduino-plus (fixes FTBFS) + * [mips*] io: Define ioremap_uc (fixes FTBFS) -- Ben Hutchings Tue, 06 Oct 2015 00:01:29 +0100 diff --git a/debian/patches/bugfix/mips/mips-io-define-ioremap_uc.patch b/debian/patches/bugfix/mips/mips-io-define-ioremap_uc.patch new file mode 100644 index 000000000..ebee872f7 --- /dev/null +++ b/debian/patches/bugfix/mips/mips-io-define-ioremap_uc.patch @@ -0,0 +1,27 @@ +From: Ben Hutchings +Date: Tue, 6 Oct 2015 00:17:04 +0100 +Subject: MIPS: io: Define ioremap_uc +Forwarded: http://mid.gmane.org/1444089416.2956.2.camel@decadent.org.uk + +All architectures must now define ioremap_uc(), but MIPS currently +only has ioremap_nocache(). + +Fixes: 4c73e8926623 ("arch/*/io.h: Add ioremap_uc() to all architectures") +Signed-off-by: Ben Hutchings +Cc: Luis R. Rodriguez +--- + arch/mips/include/asm/io.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h +index 9e777cd..d10fd80 100644 +--- a/arch/mips/include/asm/io.h ++++ b/arch/mips/include/asm/io.h +@@ -256,6 +256,7 @@ static inline void __iomem * __ioremap_mode(phys_addr_t offset, unsigned long si + */ + #define ioremap_nocache(offset, size) \ + __ioremap_mode((offset), (size), _CACHE_UNCACHED) ++#define ioremap_uc ioremap_nocache + + /* + * ioremap_cachable - map bus memory into CPU space diff --git a/debian/patches/series b/debian/patches/series index 9a043fefe..4829aa939 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -83,3 +83,4 @@ features/all/grsecurity/grkernsec_perf_harden.patch bugfix/all/media-uvcvideo-disable-hardware-timestamps-by-defaul.patch bugfix/arm/arm-dts-fix-makefile-target-for-sun4i-a10-itead-itea.patch +bugfix/mips/mips-io-define-ioremap_uc.patch