The patch titled
Replace ARCH_HAS_VALID_PHYS_ADDR_RANGE with CONFIG_ARCH_VALID_PHYS_ADDR_RANGE
has been added to the -mm tree. Its filename is
replace-arch_has_valid_phys_addr_range-with.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Replace ARCH_HAS_VALID_PHYS_ADDR_RANGE with CONFIG_ARCH_VALID_PHYS_ADDR_RANGE
From: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
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 <rdunlap@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/ia64/Kconfig | 3 +++
drivers/char/mem.c | 2 +-
include/asm-ia64/io.h | 1 -
3 files changed, 4 insertions(+), 2 deletions(-)
diff -puN arch/ia64/Kconfig~replace-arch_has_valid_phys_addr_range-with arch/ia64/Kconfig
--- a/arch/ia64/Kconfig~replace-arch_has_valid_phys_addr_range-with
+++ a/arch/ia64/Kconfig
@@ -377,6 +377,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
diff -puN drivers/char/mem.c~replace-arch_has_valid_phys_addr_range-with drivers/char/mem.c
--- a/drivers/char/mem.c~replace-arch_has_valid_phys_addr_range-with
+++ a/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))
diff -puN include/asm-ia64/io.h~replace-arch_has_valid_phys_addr_range-with include/asm-ia64/io.h
--- a/include/asm-ia64/io.h~replace-arch_has_valid_phys_addr_range-with
+++ a/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);
_
Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxx are
acpi-bus-add-missing-newline.patch
acpi-handle-firmware_register-init-errors.patch
acpi-scan-handle-kset-kobject-errors.patch
acpi-fix-printk-format-warnings.patch
sysfs_remove_bin_file-no-return-value-dump_stack-on.patch
kobject-must_check-fixes.patch
drivers-base-check-errors.patch
sysfs-add-proper-sysfs_init-prototype.patch
bttv-must_check-fixes.patch
git-lxdialog.patch
pcmcia-ds-must_check-fixes.patch
libsas-externs-not-needed.patch
pcie-check-and-return-bus_register-errors.patch
pcie-check-and-return-bus_register-errors-fix.patch
git-scsi-misc.patch
aic7-cleanup-module_parm_desc-strings.patch
dc395x-fix-printk-format-warning.patch
add-kerneldocs-for-some-functions-in-mm-memoryc.patch
tiacx-sparse-cleanups.patch
consistently-use-max_errno-in-__syscall_return.patch
consistently-use-max_errno-in-__syscall_return-fix.patch
eisa-bus-modalias-attributes-support-1.patch
kernel-params-must_check-fixes.patch
blockdevc-check-errors.patch
block-handle-subsystem_register-init-errors.patch
fs-namespace-handle-init-registration-errors.patch
kernel-doc-for-relay-interface.patch
kernel-doc-fixes-for-debugfs.patch
kernel-doc-move-filesystems-together.patch
include-documentation-for-functions-in-drivers-base-classc.patch
fix-parameter-names-in-drivers-base-classc.patch
fix-kerneldoc-comments-in-kernel-timerc-fix.patch
replace-arch_has_sched_wake_idle-with-config_sched_smt.patch
replace-__arch_has_do_softirq-with.patch
replace-arch_has_read_current_timer-with.patch
replace-arch_has_nmi_watchdog-with.patch
replace-arch_has_flush_anon_page-with.patch
replace-arch_has_socket_types-with.patch
replace-arch_has_valid_phys_addr_range-with.patch
replace-__arch_has_no_page_zero_mapped-with.patch
replace-arch_has_power_init-with-config_acpi_power_init.patch
ecryptfs-fix-printk-format-warnings.patch
ide-core-must_check-fixes.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
