diff mbox series

um: return error from ioremap()

Message ID 20201217131556.6d1a5546bd43.I2fcd1dfac11d31e1a83a26488f396d97ba03ddda@changeid
State Accepted
Headers show
Series um: return error from ioremap() | expand

Commit Message

Johannes Berg Dec. 17, 2020, 12:15 p.m. UTC 
From: Johannes Berg <johannes.berg@intel.com>

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>
---
 arch/um/include/asm/io.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Arnd Bergmann Dec. 17, 2020, 2:52 p.m. UTC | #1 
On Thu, Dec 17, 2020 at 1:15 PM Johannes Berg <johannes@sipsolutions.net> wrote:
>
> From: Johannes Berg <johannes.berg@intel.com>
>
> 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>
Richard Weinberger Dec. 23, 2020, 10:18 a.m. UTC | #2 
On Thu, Dec 17, 2020 at 3:53 PM Arnd Bergmann <arnd@kernel.org> wrote:
>
> On Thu, Dec 17, 2020 at 1:15 PM Johannes Berg <johannes@sipsolutions.net> wrote:
> >
> > From: Johannes Berg <johannes.berg@intel.com>
> >
> > 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.

Thanks, applied.
I think marking this patch for stable is worth it.

> > Signed-off-by: Johannes Berg <johannes.berg@intel.com>
>
> Acked-by: Arnd Bergmann <arnd@arndb.de>
>
> _______________________________________________
> linux-um mailing list
> linux-um@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-um
diff mbox series

Patch

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