| Message ID | 20210409052038.58925-1-marcan@marcan.st (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ea96292838397682530ac77a429974f8ff5f2df3 |
| Headers | show |
| Series | asm-generic/io.h: Unbork ioremap_np() declaration | expand |
From: Arnd Bergmann <arnd@arndb.de> On Fri, 9 Apr 2021 14:20:38 +0900, Hector Martin wrote: > It accidentally slipped into the #ifdef for ioremap_uc(). Applied to arm/apple-m1, thanks! [1/1] asm-generic/io.h: Unbork ioremap_np() declaration commit: ea96292838397682530ac77a429974f8ff5f2df3 Arnd
Hello: This patch was applied to soc/soc.git (refs/heads/for-next): On Fri, 9 Apr 2021 14:20:38 +0900 you wrote: > It accidentally slipped into the #ifdef for ioremap_uc(). > > Signed-off-by: Hector Martin <marcan@marcan.st> > --- > include/asm-generic/io.h | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) Here is the summary with links: - asm-generic/io.h: Unbork ioremap_np() declaration https://git.kernel.org/soc/soc/c/ea9629283839 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index 082e0c96db6e..76d456c516a1 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -995,6 +995,7 @@ static inline void __iomem *ioremap_uc(phys_addr_t offset, size_t size) { return NULL; } +#endif /* * ioremap_np needs an explicit architecture implementation, as it @@ -1013,8 +1014,6 @@ static inline void __iomem *ioremap_np(phys_addr_t offset, size_t size) } #endif -#endif - #ifdef CONFIG_HAS_IOPORT_MAP #ifndef CONFIG_GENERIC_IOMAP #ifndef ioport_map
It accidentally slipped into the #ifdef for ioremap_uc(). Signed-off-by: Hector Martin <marcan@marcan.st> --- include/asm-generic/io.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)