The patch titled
Replace __ARCH_HAS_NO_PAGE_ZERO_MAPPED with CONFIG_NO_PAGE_ZERO_MAPPED
has been removed from the -mm tree. Its filename is
replace-__arch_has_no_page_zero_mapped-with.patch
This patch was dropped because it looks like we should be adding all-arch stubs
------------------------------------------------------
Subject: Replace __ARCH_HAS_NO_PAGE_ZERO_MAPPED with CONFIG_NO_PAGE_ZERO_MAPPED
From: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Replace __ARCH_HAS_NO_PAGE_ZERO_MAPPED with CONFIG_NO_PAGE_ZERO_MAPPED. Move
it from header files to Kconfig space.
Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/m68k/Kconfig | 3 +++
arch/sparc/Kconfig | 3 +++
drivers/char/mem.c | 8 ++++----
include/asm-m68k/io.h | 2 --
include/asm-sparc/io.h | 2 --
5 files changed, 10 insertions(+), 8 deletions(-)
diff -puN arch/m68k/Kconfig~replace-__arch_has_no_page_zero_mapped-with arch/m68k/Kconfig
--- a/arch/m68k/Kconfig~replace-__arch_has_no_page_zero_mapped-with
+++ a/arch/m68k/Kconfig
@@ -366,6 +366,9 @@ config 060_WRITETHROUGH
is hardwired on. The 53c710 SCSI driver is known to suffer from
this problem.
+config NO_PAGE_ZERO_MAPPED
+ def_bool y
+
source "mm/Kconfig"
endmenu
diff -puN arch/sparc/Kconfig~replace-__arch_has_no_page_zero_mapped-with arch/sparc/Kconfig
--- a/arch/sparc/Kconfig~replace-__arch_has_no_page_zero_mapped-with
+++ a/arch/sparc/Kconfig
@@ -229,6 +229,9 @@ config SUNOS_EMUL
source "mm/Kconfig"
+config NO_PAGE_ZERO_MAPPED
+ def_bool y
+
endmenu
source "net/Kconfig"
diff -puN drivers/char/mem.c~replace-__arch_has_no_page_zero_mapped-with drivers/char/mem.c
--- a/drivers/char/mem.c~replace-__arch_has_no_page_zero_mapped-with
+++ a/drivers/char/mem.c
@@ -115,7 +115,7 @@ static ssize_t read_mem(struct file * fi
if (!valid_phys_addr_range(p, count))
return -EFAULT;
read = 0;
-#ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED
+#ifdef CONFIG_NO_PAGE_ZERO_MAPPED
/* we don't have page 0 mapped on sparc and m68k.. */
if (p < PAGE_SIZE) {
sz = PAGE_SIZE - p;
@@ -175,7 +175,7 @@ static ssize_t write_mem(struct file * f
written = 0;
-#ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED
+#ifdef CONFIG_NO_PAGE_ZERO_MAPPED
/* we don't have page 0 mapped on sparc and m68k.. */
if (p < PAGE_SIZE) {
unsigned long sz = PAGE_SIZE - p;
@@ -333,7 +333,7 @@ static ssize_t read_kmem(struct file *fi
if (count > (unsigned long) high_memory - p)
low_count = (unsigned long) high_memory - p;
-#ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED
+#ifdef CONFIG_NO_PAGE_ZERO_MAPPED
/* we don't have page 0 mapped on sparc and m68k.. */
if (p < PAGE_SIZE && low_count > 0) {
size_t tmp = PAGE_SIZE - p;
@@ -411,7 +411,7 @@ do_write_kmem(void *p, unsigned long rea
unsigned long copied;
written = 0;
-#ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED
+#ifdef CONFIG_NO_PAGE_ZERO_MAPPED
/* we don't have page 0 mapped on sparc and m68k.. */
if (realp < PAGE_SIZE) {
unsigned long sz = PAGE_SIZE - realp;
diff -puN include/asm-m68k/io.h~replace-__arch_has_no_page_zero_mapped-with include/asm-m68k/io.h
--- a/include/asm-m68k/io.h~replace-__arch_has_no_page_zero_mapped-with
+++ a/include/asm-m68k/io.h
@@ -360,8 +360,6 @@ extern void dma_cache_inv(unsigned long
#endif /* __KERNEL__ */
-#define __ARCH_HAS_NO_PAGE_ZERO_MAPPED 1
-
/*
* Convert a physical pointer to a virtual kernel pointer for /dev/mem
* access
diff -puN include/asm-sparc/io.h~replace-__arch_has_no_page_zero_mapped-with include/asm-sparc/io.h
--- a/include/asm-sparc/io.h~replace-__arch_has_no_page_zero_mapped-with
+++ a/include/asm-sparc/io.h
@@ -290,8 +290,6 @@ extern void sbus_iounmap(volatile void _
#endif
-#define __ARCH_HAS_NO_PAGE_ZERO_MAPPED 1
-
/*
* Convert a physical pointer to a virtual kernel pointer for /dev/mem
* access
_
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
mtd-printk-format-warning.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
scsi-target-printk-format-warnings.patch
usbnet-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-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_no_page_zero_mapped-with.patch
replace-arch_has_power_init-with-config_acpi_power_init.patch
fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-cachefiles-printk-format-warning.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
