diff options
Diffstat (limited to 'arch/arm/mm')
-rw-r--r-- | arch/arm/mm/Kconfig | 3 | ||||
-rw-r--r-- | arch/arm/mm/ioremap.c | 6 | ||||
-rw-r--r-- | arch/arm/mm/mmu.c | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index a25f34bd99da..83c025e72ceb 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
@@ -656,7 +656,6 @@ config CPU_ENDIAN_BE32 | |||
656 | config CPU_HIGH_VECTOR | 656 | config CPU_HIGH_VECTOR |
657 | depends on !MMU && CPU_CP15 && !CPU_ARM740T | 657 | depends on !MMU && CPU_CP15 && !CPU_ARM740T |
658 | bool "Select the High exception vector" | 658 | bool "Select the High exception vector" |
659 | default n | ||
660 | help | 659 | help |
661 | Say Y here to select high exception vector(0xFFFF0000~). | 660 | Say Y here to select high exception vector(0xFFFF0000~). |
662 | The exception vector can be vary depending on the platform | 661 | The exception vector can be vary depending on the platform |
@@ -740,7 +739,6 @@ config NEEDS_SYSCALL_FOR_CMPXCHG | |||
740 | 739 | ||
741 | config OUTER_CACHE | 740 | config OUTER_CACHE |
742 | bool | 741 | bool |
743 | default n | ||
744 | 742 | ||
745 | config CACHE_FEROCEON_L2 | 743 | config CACHE_FEROCEON_L2 |
746 | bool "Enable the Feroceon L2 cache controller" | 744 | bool "Enable the Feroceon L2 cache controller" |
@@ -753,7 +751,6 @@ config CACHE_FEROCEON_L2 | |||
753 | config CACHE_FEROCEON_L2_WRITETHROUGH | 751 | config CACHE_FEROCEON_L2_WRITETHROUGH |
754 | bool "Force Feroceon L2 cache write through" | 752 | bool "Force Feroceon L2 cache write through" |
755 | depends on CACHE_FEROCEON_L2 | 753 | depends on CACHE_FEROCEON_L2 |
756 | default n | ||
757 | help | 754 | help |
758 | Say Y here to use the Feroceon L2 cache in writethrough mode. | 755 | Say Y here to use the Feroceon L2 cache in writethrough mode. |
759 | Unless you specifically require this, say N for writeback mode. | 756 | Unless you specifically require this, say N for writeback mode. |
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c index 9f88dd3be601..0ab75c60f7cf 100644 --- a/arch/arm/mm/ioremap.c +++ b/arch/arm/mm/ioremap.c | |||
@@ -110,6 +110,12 @@ static int remap_area_pages(unsigned long start, unsigned long pfn, | |||
110 | return err; | 110 | return err; |
111 | } | 111 | } |
112 | 112 | ||
113 | int ioremap_page(unsigned long virt, unsigned long phys, | ||
114 | const struct mem_type *mtype) | ||
115 | { | ||
116 | return remap_area_pages(virt, __phys_to_pfn(phys), PAGE_SIZE, mtype); | ||
117 | } | ||
118 | EXPORT_SYMBOL(ioremap_page); | ||
113 | 119 | ||
114 | void __check_kvm_seq(struct mm_struct *mm) | 120 | void __check_kvm_seq(struct mm_struct *mm) |
115 | { | 121 | { |
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index e6344ece00ce..70974d75a075 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c | |||
@@ -255,6 +255,7 @@ const struct mem_type *get_mem_type(unsigned int type) | |||
255 | { | 255 | { |
256 | return type < ARRAY_SIZE(mem_types) ? &mem_types[type] : NULL; | 256 | return type < ARRAY_SIZE(mem_types) ? &mem_types[type] : NULL; |
257 | } | 257 | } |
258 | EXPORT_SYMBOL(get_mem_type); | ||
258 | 259 | ||
259 | /* | 260 | /* |
260 | * Adjust the PMD section entries according to the CPU in use. | 261 | * Adjust the PMD section entries according to the CPU in use. |