The patch titled Subject: Remove remaining bits of io_remap_page_range() has been removed from the -mm tree. Its filename was remove-remaining-bits-of-io_remap_page_range.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ From: "Javi Merino" <javi.merino@xxxxxxx> Subject: Remove remaining bits of io_remap_page_range() 33bf561 ("feature removal of io_remap_page_range()") removed io_remap_page_range(), but it is still included in some arch header files. It has no in-tree users. Signed-off-by: Javi Merino <javi.merino@xxxxxxx> Cc: Russell King <linux@xxxxxxxxxxxxxxxx> Cc: Aurelien Jacquiot <a-jacquiot@xxxxxx> Cc: Michal Simek <monstr@xxxxxxxxx> Cc: Jonas Bonn <jonas@xxxxxxxxxxxx> Cc: Randy Dunlap <rdunlap@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/arm/include/asm/pgtable-nommu.h | 1 - arch/c6x/include/asm/pgtable.h | 3 --- arch/microblaze/include/asm/pgtable.h | 2 -- arch/openrisc/include/asm/pgtable.h | 1 - 4 files changed, 7 deletions(-) diff -puN arch/arm/include/asm/pgtable-nommu.h~remove-remaining-bits-of-io_remap_page_range arch/arm/include/asm/pgtable-nommu.h --- a/arch/arm/include/asm/pgtable-nommu.h~remove-remaining-bits-of-io_remap_page_range +++ a/arch/arm/include/asm/pgtable-nommu.h @@ -79,7 +79,6 @@ extern unsigned int kobjsize(const void * No page table caches to initialise. */ #define pgtable_cache_init() do { } while (0) -#define io_remap_page_range remap_page_range #define io_remap_pfn_range remap_pfn_range diff -puN arch/c6x/include/asm/pgtable.h~remove-remaining-bits-of-io_remap_page_range arch/c6x/include/asm/pgtable.h --- a/arch/c6x/include/asm/pgtable.h~remove-remaining-bits-of-io_remap_page_range +++ a/arch/c6x/include/asm/pgtable.h @@ -73,9 +73,6 @@ extern unsigned long empty_zero_page; #define pgtable_cache_init() do { } while (0) #define io_remap_pfn_range remap_pfn_range -#define io_remap_page_range(vma, vaddr, paddr, size, prot) \ - remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot) - #include <asm-generic/pgtable.h> #endif /* _ASM_C6X_PGTABLE_H */ diff -puN arch/microblaze/include/asm/pgtable.h~remove-remaining-bits-of-io_remap_page_range arch/microblaze/include/asm/pgtable.h --- a/arch/microblaze/include/asm/pgtable.h~remove-remaining-bits-of-io_remap_page_range +++ a/arch/microblaze/include/asm/pgtable.h @@ -543,8 +543,6 @@ extern unsigned long iopa(unsigned long /* Needs to be defined here and not in linux/mm.h, as it is arch dependent */ #define kern_addr_valid(addr) (1) -#define io_remap_page_range remap_page_range - /* * No page table caches to initialise */ diff -puN arch/openrisc/include/asm/pgtable.h~remove-remaining-bits-of-io_remap_page_range arch/openrisc/include/asm/pgtable.h --- a/arch/openrisc/include/asm/pgtable.h~remove-remaining-bits-of-io_remap_page_range +++ a/arch/openrisc/include/asm/pgtable.h @@ -455,7 +455,6 @@ static inline void update_mmu_cache(stru * No page table caches to initialise */ #define pgtable_cache_init() do { } while (0) -#define io_remap_page_range remap_page_range typedef pte_t *pte_addr_t; _ Patches currently in -mm which might be from javi.merino@xxxxxxx are origin.patch linux-next.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