Skip to content

Commit 1cdcfb4

Browse files
jmberg-intelrichardweinberger
authored andcommitted
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: Johannes Berg <johannes.berg@intel.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Richard Weinberger <richard@nod.at>
1 parent 94c41b3 commit 1cdcfb4

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

  • arch/um/include/asm

arch/um/include/asm/io.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#define ioremap ioremap
66
static inline void __iomem *ioremap(phys_addr_t offset, size_t size)
77
{
8-
return (void __iomem *)(unsigned long)offset;
8+
return NULL;
99
}
1010

1111
#define iounmap iounmap

0 commit comments

Comments
 (0)