The patch titled resources-introduce-generic-page_is_ram-fix-2 has been added to the -mm tree. Its filename is resources-introduce-generic-page_is_ram-fix-2.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: resources-introduce-generic-page_is_ram-fix-2 From: Wu Fengguang <fengguang.wu@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/ioport.h | 2 -- include/linux/mm.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN include/linux/ioport.h~resources-introduce-generic-page_is_ram-fix-2 include/linux/ioport.h --- a/include/linux/ioport.h~resources-introduce-generic-page_is_ram-fix-2 +++ a/include/linux/ioport.h @@ -191,7 +191,5 @@ extern int walk_system_ram_range(unsigned long start_pfn, unsigned long nr_pages, void *arg, int (*func)(unsigned long, unsigned long, void *)); -extern int page_is_ram(unsigned long pfn); - #endif /* __ASSEMBLY__ */ #endif /* _LINUX_IOPORT_H */ diff -puN include/linux/mm.h~resources-introduce-generic-page_is_ram-fix-2 include/linux/mm.h --- a/include/linux/mm.h~resources-introduce-generic-page_is_ram-fix-2 +++ a/include/linux/mm.h @@ -265,6 +265,8 @@ static inline int get_page_unless_zero(s return atomic_inc_not_zero(&page->_count); } +extern int page_is_ram(unsigned long pfn); + /* Support for virtually mapped pages */ struct page *vmalloc_to_page(const void *addr); unsigned long vmalloc_to_pfn(const void *addr); _ Patches currently in -mm which might be from fengguang.wu@xxxxxxxxx are linux-next.patch devmem-check-vmalloc-address-on-kmem-read-write.patch devmem-fix-kmem-write-bug-on-memory-holes.patch mm-introduce-dump_page-and-print-symbolic-flag-names.patch vmscan-check-high-watermark-after-shrink-zone.patch vmscan-check-high-watermark-after-shrink-zone-fix.patch mm-restore-zone-all_unreclaimable-to-independence-word.patch mm-restore-zone-all_unreclaimable-to-independence-word-fix.patch mm-restore-zone-all_unreclaimable-to-independence-word-fix-2.patch memory-hotplug-create-sys-firmware-memmap-entry-for-new-memory.patch memory-hotplug-create-sys-firmware-memmap-entry-for-new-memory-fix.patch vfs-take-f_lock-on-modifying-f_mode-after-open-time.patch readahead-introduce-fmode_random-for-posix_fadv_random.patch include-linux-fsh-convert-fmode_-constants-to-hex.patch resources-introduce-generic-page_is_ram.patch resources-introduce-generic-page_is_ram-fix.patch resources-introduce-generic-page_is_ram-fix-2.patch x86-remove-bios-data-range-from-e820.patch x86-use-the-generic-page_is_ram.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