lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sat, 2 Jul 2011 17:53:25 +0200 From: Jonas Bonn <jonas@...thpole.se> To: linux-kernel@...r.kernel.org, linux-arch@...r.kernel.org Cc: Jonas Bonn <jonas@...thpole.se>, vapier@...too.org, liqin.chen@...plusct.com, gxt@...c.pku.edu.cn Subject: [PATCH 1/2] asm-generic: add MMU variants of io.h functions Some of the implementations, in particular the ioremap variants, in asm-generic/io.h are for systems with an MMU. In order to be able to use the generic header file for systems with an MMU, this patch wraps these implementations in checks for CONFIG_MMU. Tested on OpenRISC. Signed-off-by: Jonas Bonn <jonas@...thpole.se> Cc: vapier@...too.org Cc: liqin.chen@...plusct.com Cc: gxt@...c.pku.edu.cn --- I'm not totally certain that this doesn't have implications for the other architectures, in particular Score which seems to have an MMU yet uses these ioremap functions anyway... Comments on this would be appreciated. Thanks, Jonas include/asm-generic/io.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index e0ffa3d..50f4f43 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -307,7 +307,11 @@ static inline void *phys_to_virt(unsigned long address) /* * Change "struct page" to physical address. + * + * This implementation is for the no-MMU case only... if you have an MMU + * you'll need to provide your own definitions. */ +#ifndef CONFIG_MMU static inline void __iomem *ioremap(phys_addr_t offset, unsigned long size) { return (void __iomem*) (unsigned long)offset; @@ -326,6 +330,7 @@ static inline void __iomem *ioremap(phys_addr_t offset, unsigned long size) static inline void iounmap(void *addr) { } +#endif /* CONFIG_MMU */ #ifndef CONFIG_GENERIC_IOMAP static inline void __iomem *ioport_map(unsigned long port, unsigned int nr) @@ -342,7 +347,12 @@ extern void ioport_unmap(void __iomem *p); #endif /* CONFIG_GENERIC_IOMAP */ #define xlate_dev_kmem_ptr(p) p + +#ifdef CONFIG_MMU +#define xlate_dev_mem_ptr(p) __va(p) +#else #define xlate_dev_mem_ptr(p) ((void *) (p)) +#endif #ifndef virt_to_bus static inline unsigned long virt_to_bus(volatile void *address) -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists