From 0ef690e347d1867864781d6cdf2e6b3b1cb83af2 Mon Sep 17 00:00:00 2001 From: Javi Merino Date: Fri, 23 Mar 2012 15:01:52 -0700 Subject: [PATCH] --- yaml --- r: 295148 b: refs/heads/master c: 03ff3efb64c8a64cb8cdf35e36bead5c78eb3024 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/include/asm/pgtable-nommu.h | 1 - trunk/arch/c6x/include/asm/pgtable.h | 3 --- trunk/arch/microblaze/include/asm/pgtable.h | 2 -- trunk/arch/openrisc/include/asm/pgtable.h | 1 - 5 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 2343b3626589..e6b1f9417848 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ccaba5314caf3a2b1052edb3146ccc969b4d466 +refs/heads/master: 03ff3efb64c8a64cb8cdf35e36bead5c78eb3024 diff --git a/trunk/arch/arm/include/asm/pgtable-nommu.h b/trunk/arch/arm/include/asm/pgtable-nommu.h index ffc0e85775b4..7ec60d6075bf 100644 --- a/trunk/arch/arm/include/asm/pgtable-nommu.h +++ b/trunk/arch/arm/include/asm/pgtable-nommu.h @@ -79,7 +79,6 @@ extern unsigned int kobjsize(const void *objp); * 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 --git a/trunk/arch/c6x/include/asm/pgtable.h b/trunk/arch/c6x/include/asm/pgtable.h index 68c8af4f1f97..38a4312eb2cb 100644 --- a/trunk/arch/c6x/include/asm/pgtable.h +++ b/trunk/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 #endif /* _ASM_C6X_PGTABLE_H */ diff --git a/trunk/arch/microblaze/include/asm/pgtable.h b/trunk/arch/microblaze/include/asm/pgtable.h index b2af42311a12..44dc67aa0277 100644 --- a/trunk/arch/microblaze/include/asm/pgtable.h +++ b/trunk/arch/microblaze/include/asm/pgtable.h @@ -543,8 +543,6 @@ extern unsigned long iopa(unsigned long addr); /* 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 --git a/trunk/arch/openrisc/include/asm/pgtable.h b/trunk/arch/openrisc/include/asm/pgtable.h index 043505d7f684..14c900cfd30a 100644 --- a/trunk/arch/openrisc/include/asm/pgtable.h +++ b/trunk/arch/openrisc/include/asm/pgtable.h @@ -455,7 +455,6 @@ static inline void update_mmu_cache(struct vm_area_struct *vma, * 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;