aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-05-11 12:13:10 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2013-06-29 04:46:35 -0400
commit40d158e61840fbbe23be3f37302a3ca237c15491 (patch)
tree0421101a49c3a8e639437a6fb8a162b2bcc077ea /arch/sparc
parent605c912bb843c024b1ed173dc427cd5c08e5d54d (diff)
consolidate io_remap_pfn_range definitions
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/sparc')
-rw-r--r--arch/sparc/include/asm/pgtable_32.h1
-rw-r--r--arch/sparc/include/asm/pgtable_64.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
index 6fc13483f702..502f632f6cc7 100644
--- a/arch/sparc/include/asm/pgtable_32.h
+++ b/arch/sparc/include/asm/pgtable_32.h
@@ -443,6 +443,7 @@ static inline int io_remap_pfn_range(struct vm_area_struct *vma,
443 443
444 return remap_pfn_range(vma, from, phys_base >> PAGE_SHIFT, size, prot); 444 return remap_pfn_range(vma, from, phys_base >> PAGE_SHIFT, size, prot);
445} 445}
446#define io_remap_pfn_range io_remap_pfn_range
446 447
447#define __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS 448#define __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS
448#define ptep_set_access_flags(__vma, __address, __ptep, __entry, __dirty) \ 449#define ptep_set_access_flags(__vma, __address, __ptep, __entry, __dirty) \
diff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h
index 7619f2f792af..79c214efa3fe 100644
--- a/arch/sparc/include/asm/pgtable_64.h
+++ b/arch/sparc/include/asm/pgtable_64.h
@@ -914,6 +914,7 @@ static inline int io_remap_pfn_range(struct vm_area_struct *vma,
914 914
915 return remap_pfn_range(vma, from, phys_base >> PAGE_SHIFT, size, prot); 915 return remap_pfn_range(vma, from, phys_base >> PAGE_SHIFT, size, prot);
916} 916}
917#define io_remap_pfn_range io_remap_pfn_range
917 918
918#include <asm/tlbflush.h> 919#include <asm/tlbflush.h>
919#include <asm-generic/pgtable.h> 920#include <asm-generic/pgtable.h>