path: root/arch/um
diff options
authorJohannes Berg <>2020-12-17 13:15:56 +0100
committerRichard Weinberger <>2021-01-26 22:11:37 +0100
commit1cdcfb44370b28187a0c33cdbcb4705103ed81aa (patch)
tree6a52fd9b05491dc4ab469c85303b9df042886a23 /arch/um
parent94c41b3a7c370b0d6afc5ace8fafa0531865a940 (diff)
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: Fix that now. Signed-off-by: Johannes Berg <> Acked-by: Arnd Bergmann <> Signed-off-by: Richard Weinberger <>
Diffstat (limited to 'arch/um')
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/include/asm/io.h b/arch/um/include/asm/io.h
index 96f77b5232aa..cef03e3aa0f9 100644
--- a/arch/um/include/asm/io.h
+++ b/arch/um/include/asm/io.h
@@ -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