The patch titled
valid_mmap_phys_addr_range() cleanup
has been added to the -mm tree. Its filename is
valid_mmap_phys_addr_range-cleanup.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: valid_mmap_phys_addr_range() cleanup
From: Andrew Morton <akpm@xxxxxxxx>
- Use __attribute__((weak)) to get rid of ARCH_HAS_VALID_PHYS_ADDR_RANGE
- Move the prototype to a sensible place.
Signed-off-by: Lennert Buytenhek <buytenh@xxxxxxxxxxxxxx>
Cc: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Cc: "Luck, Tony" <tony.luck@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/ia64/kernel/efi.c | 2 +-
arch/ia64/pci/pci.c | 2 +-
drivers/char/mem.c | 10 +++++-----
include/asm-ia64/io.h | 3 ---
include/linux/io.h | 2 ++
5 files changed, 9 insertions(+), 10 deletions(-)
diff -puN arch/ia64/kernel/efi.c~valid_mmap_phys_addr_range-cleanup arch/ia64/kernel/efi.c
--- a/arch/ia64/kernel/efi.c~valid_mmap_phys_addr_range-cleanup
+++ a/arch/ia64/kernel/efi.c
@@ -27,8 +27,8 @@
#include <linux/time.h>
#include <linux/efi.h>
#include <linux/kexec.h>
+#include <linux/io.h>
-#include <asm/io.h>
#include <asm/kregs.h>
#include <asm/meminit.h>
#include <asm/pgtable.h>
diff -puN arch/ia64/pci/pci.c~valid_mmap_phys_addr_range-cleanup arch/ia64/pci/pci.c
--- a/arch/ia64/pci/pci.c~valid_mmap_phys_addr_range-cleanup
+++ a/arch/ia64/pci/pci.c
@@ -20,11 +20,11 @@
#include <linux/slab.h>
#include <linux/smp_lock.h>
#include <linux/spinlock.h>
+#include <linux/io.h>
#include <asm/machvec.h>
#include <asm/page.h>
#include <asm/system.h>
-#include <asm/io.h>
#include <asm/sal.h>
#include <asm/smp.h>
#include <asm/irq.h>
diff -puN drivers/char/mem.c~valid_mmap_phys_addr_range-cleanup drivers/char/mem.c
--- a/drivers/char/mem.c~valid_mmap_phys_addr_range-cleanup
+++ a/drivers/char/mem.c
@@ -26,9 +26,9 @@
#include <linux/backing-dev.h>
#include <linux/bootmem.h>
#include <linux/pipe_fs_i.h>
+#include <linux/io.h>
#include <asm/uaccess.h>
-#include <asm/io.h>
#ifdef CONFIG_IA64
# include <linux/efi.h>
@@ -86,8 +86,8 @@ static inline int uncached_access(struct
#endif
}
-#ifndef ARCH_HAS_VALID_PHYS_ADDR_RANGE
-static inline int valid_phys_addr_range(unsigned long addr, size_t count)
+int __attribute__((weak)) valid_phys_addr_range(unsigned long addr,
+ size_t count)
{
if (addr + count > __pa(high_memory))
return 0;
@@ -95,11 +95,11 @@ static inline int valid_phys_addr_range(
return 1;
}
-static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t size)
+int __attribute__((weak)) valid_mmap_phys_addr_range(unsigned long pfn,
+ size_t size)
{
return 1;
}
-#endif
/*
* This funcion reads the *physical* memory. The f_pos points directly to the
diff -puN include/asm-ia64/io.h~valid_mmap_phys_addr_range-cleanup include/asm-ia64/io.h
--- a/include/asm-ia64/io.h~valid_mmap_phys_addr_range-cleanup
+++ a/include/asm-ia64/io.h
@@ -87,10 +87,7 @@ 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);
/*
* The following two macros are deprecated and scheduled for removal.
diff -puN include/linux/io.h~valid_mmap_phys_addr_range-cleanup include/linux/io.h
--- a/include/linux/io.h~valid_mmap_phys_addr_range-cleanup
+++ a/include/linux/io.h
@@ -22,5 +22,7 @@
void __iowrite32_copy(void __iomem *to, const void *from, size_t count);
void __iowrite64_copy(void __iomem *to, const void *from, size_t count);
+int valid_mmap_phys_addr_range(unsigned long pfn, size_t count);
+int valid_phys_addr_range(unsigned long addr, size_t count);
#endif /* _LINUX_IO_H */
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
lockdep-add-disable-enable_irq_lockdep-api.patch
lockdep-irqtrace-subsystem-x86_64-support.patch
forcedeth-typecast-cleanup.patch
disable-debugging-version-of-write_lock.patch
acpi-asus-s3-resume-fix-fix.patch
sony_apci-resume.patch
kauditd_thread-warning-fix.patch
git-geode-fixup.patch
git-gfs2.patch
git-gfs2-fixup.patch
gfs2-get_sb_dev-fix.patch
git-ia64.patch
git-ia64-fixup.patch
revert-sparc-build-breakage.patch
git-klibc.patch
git-hdrcleanup-vs-git-klibc-on-ia64.patch
git-hdrcleanup-vs-git-klibc-on-ia64-2.patch
git-libata-all.patch
sata-is-bust-on-s390.patch
git-netdev-all-fixup.patch
8139cp-printk-fix.patch
drivers-net-ns83820c-add-paramter-to-disable-auto.patch
af_unix-datagram-getpeersec-fix.patch
git-pcmcia-fixup.patch
git-sas.patch
serial-8250-sysrq-deadlock-fix.patch
serial-fix-uart_bug_txen-test.patch
revert-gregkh-pci-pci-test-that-drivers-properly-call-pci_set_master.patch
msi-oops-workaround.patch
revert-VIA-quirk-fixup-additional-PCI-IDs.patch
revert-PCI-quirk-VIA-IRQ-fixup-should-only-run-for-VIA-southbridges.patch
areca-raid-linux-scsi-driver.patch
git-scsi-target-fixup.patch
pm-usb-hcds-use-pm_event_prethaw-fix.patch
kill-usb-kconfig-warning.patch
git-supertrak-fixup.patch
bcm43xx-opencoded-locking.patch
sleazy-fpu-feature-x86_64-support-fix.patch
zvc-zone_reclaim-leave-1%-of-unmapped-pagecache-pages-for-file-i-o-tunable-rename.patch
adix-tree-rcu-lockless-readside-update-tidy.patch
mm-tracking-shared-dirty-pages-checks.patch
mm-tracking-shared-dirty-pages-wimp.patch
acx1xx-wireless-driver.patch
tiacx-pci-build-fix.patch
tiacx-ia64-fix.patch
sched-clean-up-fallout-of-recent-changes.patch
deprecate-smbfs-in-favour-of-cifs.patch
edac-new-opteron-athlon64-memory-controller-driver-tidy.patch
valid_mmap_phys_addr_range-cleanup.patch
reiserfs-on-demand-bitmap-loading.patch
per-task-delay-accounting-taskstats-interface.patch
per-task-delay-accounting-proc-export-of-aggregated-block-i-o-delays.patch
delay-accounting-taskstats-interface-send-tgid-once.patch
swap_prefetch-vs-zoned-counters.patch
ecryptfs-mmap-operations.patch
ecryptfs-alpha-build-fix.patch
ecryptfs-more-elegant-aes-key-size-manipulation.patch
ecryptfs-get_sb_dev-fix.patch
namespaces-add-nsproxy-dont-include-compileh.patch
namespaces-utsname-switch-to-using-uts-namespaces.patch
namespaces-utsname-use-init_utsname-when-appropriate.patch
namespaces-utsname-implement-utsname-namespaces.patch
namespaces-utsname-sysctl-hack.patch
ipc-namespace-core.patch
task-watchers-task-watchers.patch
task-watchers-add-support-for-per-task-watchers.patch
readahead-sysctl-parameters-fix.patch
make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch
reiser4-hardirq-include-fix.patch
reiser4-run-truncate_inode_pages-in-reiser4_delete_inode.patch
reiser4-get_sb_dev-fix.patch
reiser4-vs-zoned-allocator.patch
hpt3xx-rework-rate-filtering-tidy.patch
md-oops-workaround.patch
genirq-convert-the-i386-architecture-to-irq-chips.patch
genirq-x86_64-irq-reenable-migrating-irqs-to-other-cpus.patch
genirq-msi-simplify-msi-enable-and-disable.patch
genirq-ia64-irq-dynamic-irq-support.patch
genirq-i386-irq-remove-the-msi-assumption-that-irq-==-vector.patch
srcu-rcu-variant-permitting-read-side-blocking.patch
srcu-add-srcu-operations-to-rcutorture.patch
srcu-2-add-srcu-operations-to-rcutorture.patch
make-more-file_operation-structs-static.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
revert-tty-buffering-comment-out-debug-code.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.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
