Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 295148
b: refs/heads/master
c: 03ff3ef
h: refs/heads/master
v: v3
  • Loading branch information
Javi Merino authored and Linus Torvalds committed Mar 23, 2012
1 parent ad96cf2 commit 0ef690e
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7ccaba5314caf3a2b1052edb3146ccc969b4d466
refs/heads/master: 03ff3efb64c8a64cb8cdf35e36bead5c78eb3024
1 change: 0 additions & 1 deletion trunk/arch/arm/include/asm/pgtable-nommu.h
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
3 changes: 0 additions & 3 deletions trunk/arch/c6x/include/asm/pgtable.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
2 changes: 0 additions & 2 deletions trunk/arch/microblaze/include/asm/pgtable.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
1 change: 0 additions & 1 deletion trunk/arch/openrisc/include/asm/pgtable.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 0ef690e

Please sign in to comment.