Commit 1cdcfb44 authored by Johannes Berg's avatar Johannes Berg Committed by Richard Weinberger
Browse files

um: return error from ioremap() 

Back a few years ago, ioremap() was added to UML so that we'd
not break the build for everything all the time. However, for
some reason, v1 of the patch got applied, rather than the v2
that returned NULL, which was discussed here:

https://lore.kernel.org/lkml/1495726955-27497-1-git-send-email-logang@deltatee.com/



Fix that now.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 94c41b3a

arch/um/include/asm/io.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#define ioremap ioremap

static inline void __iomem *ioremap(phys_addr_t offset, size_t size)

{

	return (void __iomem *)(unsigned long)offset;

	return NULL;

}



#define iounmap iounmap