From: Randy Dunlap <[email protected]>
Replace ARCH_HAS_VALID_PHYS_ADDR_RANGE with CONFIG_ARCH_VALID_PHYS_ADDR_RANGE.
Move it from header files to Kconfig space.
Signed-off-by: Randy Dunlap <[email protected]>
---
arch/ia64/Kconfig | 3 +++
drivers/char/mem.c | 2 +-
include/asm-ia64/io.h | 1 -
3 files changed, 4 insertions(+), 2 deletions(-)
--- linux-2618-rc4-arch.orig/drivers/char/mem.c
+++ linux-2618-rc4-arch/drivers/char/mem.c
@@ -86,7 +86,7 @@ static inline int uncached_access(struct
#endif
}
-#ifndef ARCH_HAS_VALID_PHYS_ADDR_RANGE
+#ifndef CONFIG_ARCH_VALID_PHYS_ADDR_RANGE
static inline int valid_phys_addr_range(unsigned long addr, size_t count)
{
if (addr + count > __pa(high_memory))
--- linux-2618-rc4-arch.orig/include/asm-ia64/io.h
+++ linux-2618-rc4-arch/include/asm-ia64/io.h
@@ -87,7 +87,6 @@ phys_to_virt (unsigned long address)
return (void *) (address + PAGE_OFFSET);
}
-#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
extern u64 kern_mem_attribute (unsigned long phys_addr, unsigned long size);
extern int valid_phys_addr_range (unsigned long addr, size_t count); /* efi.c */
extern int valid_mmap_phys_addr_range (unsigned long pfn, size_t count);
--- linux-2618-rc4-arch.orig/arch/ia64/Kconfig
+++ linux-2618-rc4-arch/arch/ia64/Kconfig
@@ -386,6 +386,9 @@ config HAVE_ARCH_NODEDATA_EXTENSION
def_bool y
depends on NUMA
+config ARCH_VALID_PHYS_ADDR_RANGE
+ def_bool y
+
config IA32_SUPPORT
bool "Support for Linux/x86 binaries"
help
---