[PATCH 3.16 027/158] sh: fix build error by adding generic ioport_{map/unmap}()
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: 2014-09-15 21:14:44
Also in:
lkml
3.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pranith Kumar <redacted> commit e04aca4a769e16cf4f9b8a4bd3e761711640dc46 upstream. Fix build error as reported by Geert Uytterhoeven here: http://kisskb.ellerman.id.au/kisskb/buildresult/11607865/ The error happens when CONFIG_HAS_IOPORT_MAP=n because of which there are missing definitions of ioport_map/unmap(). Fix this build error by adding these prototypes. Signed-off-by: Pranith Kumar <redacted> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- arch/sh/include/asm/io_noioport.h | 11 +++++++++++ 1 file changed, 11 insertions(+)
--- a/arch/sh/include/asm/io_noioport.h
+++ b/arch/sh/include/asm/io_noioport.h@@ -34,6 +34,17 @@ static inline void outl(unsigned int x, BUG(); } +static inline void __iomem *ioport_map(unsigned long port, unsigned int size) +{ + BUG(); + return NULL; +} + +static inline void ioport_unmap(void __iomem *addr) +{ + BUG(); +} + #define inb_p(addr) inb(addr) #define inw_p(addr) inw(addr) #define inl_p(addr) inl(addr)