powerpc/mm: drop #ifdef CONFIG_MMU in is_ioremap_addr()

chleroy · mpe · commit c4028fa2daa0 · 2019-11-18T22:27:51.000+11:00
powerpc always selects CONFIG_MMU and CONFIG_MMU is not checked anywhere else in powerpc code. Drop the #ifdef and the alternative part of is_ioremap_addr() Fixes: 9bd3bb6 ("mm/nvdimm: add is_ioremap_addr and use that to check ioremap address") Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/de395e444fb8dd7a6365c3314d78e15ebb3d7d1b.1566382245.git.christophe.leroy@c-s.fr
diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
@@ -157,13 +157,9 @@ static inline bool pgd_is_leaf(pgd_t pgd)
 #define is_ioremap_addr is_ioremap_addr
 static inline bool is_ioremap_addr(const void *x)
 {
-#ifdef CONFIG_MMU
 	unsigned long addr = (unsigned long)x;
 
 	return addr >= IOREMAP_BASE && addr < IOREMAP_END;
-#else
-	return false;
-#endif
 }
 #endif /* CONFIG_PPC64 */
 

Original file line number	Diff line number	Diff line change
`@@ -157,13 +157,9 @@ static inline bool pgd_is_leaf(pgd_t pgd)`
`157`	`157`	`#define is_ioremap_addr is_ioremap_addr`
`158`	`158`	`static inline bool is_ioremap_addr(const void *x)`
`159`	`159`	`{`
`160`		`-#ifdef CONFIG_MMU`
`161`	`160`	`unsigned long addr = (unsigned long)x;`
`162`	`161`
`163`	`162`	`return addr >= IOREMAP_BASE && addr < IOREMAP_END;`
`164`		`-#else`
`165`		`- return false;`
`166`		`-#endif`
`167`	`163`	`}`
`168`	`164`	`#endif /* CONFIG_PPC64 */`
`169`	`165`