diff options
author | Michel Lespinasse <walken@google.com> | 2013-07-10 19:05:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 21:11:34 -0400 |
commit | 98d1e64f95b177d0f14efbdf695a1b28e1428035 (patch) | |
tree | b7473b55b4b3579edfcb0c98b7c4e7d65f8c169c /arch | |
parent | 61b0d76017a50c263c303fa263b295b04e0c68f6 (diff) |
mm: remove free_area_cache
Since all architectures have been converted to use vm_unmapped_area(),
there is no remaining use for the free_area_cache.
Signed-off-by: Michel Lespinasse <walken@google.com>
Acked-by: Rik van Riel <riel@redhat.com>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mm/mmap.c | 2 | ||||
-rw-r--r-- | arch/arm64/mm/mmap.c | 2 | ||||
-rw-r--r-- | arch/mips/mm/mmap.c | 2 | ||||
-rw-r--r-- | arch/powerpc/mm/mmap.c | 2 | ||||
-rw-r--r-- | arch/s390/mm/mmap.c | 4 | ||||
-rw-r--r-- | arch/sparc/kernel/sys_sparc_64.c | 2 | ||||
-rw-r--r-- | arch/tile/mm/mmap.c | 2 | ||||
-rw-r--r-- | arch/x86/ia32/ia32_aout.c | 2 | ||||
-rw-r--r-- | arch/x86/mm/mmap.c | 2 |
9 files changed, 0 insertions, 20 deletions
diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c index 10062ceadd1c..0c6356255fe3 100644 --- a/arch/arm/mm/mmap.c +++ b/arch/arm/mm/mmap.c | |||
@@ -181,11 +181,9 @@ void arch_pick_mmap_layout(struct mm_struct *mm) | |||
181 | if (mmap_is_legacy()) { | 181 | if (mmap_is_legacy()) { |
182 | mm->mmap_base = TASK_UNMAPPED_BASE + random_factor; | 182 | mm->mmap_base = TASK_UNMAPPED_BASE + random_factor; |
183 | mm->get_unmapped_area = arch_get_unmapped_area; | 183 | mm->get_unmapped_area = arch_get_unmapped_area; |
184 | mm->unmap_area = arch_unmap_area; | ||
185 | } else { | 184 | } else { |
186 | mm->mmap_base = mmap_base(random_factor); | 185 | mm->mmap_base = mmap_base(random_factor); |
187 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; | 186 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; |
188 | mm->unmap_area = arch_unmap_area_topdown; | ||
189 | } | 187 | } |
190 | } | 188 | } |
191 | 189 | ||
diff --git a/arch/arm64/mm/mmap.c b/arch/arm64/mm/mmap.c index 7c7be7855638..8ed6cb1a900f 100644 --- a/arch/arm64/mm/mmap.c +++ b/arch/arm64/mm/mmap.c | |||
@@ -90,11 +90,9 @@ void arch_pick_mmap_layout(struct mm_struct *mm) | |||
90 | if (mmap_is_legacy()) { | 90 | if (mmap_is_legacy()) { |
91 | mm->mmap_base = TASK_UNMAPPED_BASE; | 91 | mm->mmap_base = TASK_UNMAPPED_BASE; |
92 | mm->get_unmapped_area = arch_get_unmapped_area; | 92 | mm->get_unmapped_area = arch_get_unmapped_area; |
93 | mm->unmap_area = arch_unmap_area; | ||
94 | } else { | 93 | } else { |
95 | mm->mmap_base = mmap_base(); | 94 | mm->mmap_base = mmap_base(); |
96 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; | 95 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; |
97 | mm->unmap_area = arch_unmap_area_topdown; | ||
98 | } | 96 | } |
99 | } | 97 | } |
100 | EXPORT_SYMBOL_GPL(arch_pick_mmap_layout); | 98 | EXPORT_SYMBOL_GPL(arch_pick_mmap_layout); |
diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c index 7e5fe2790d8a..f1baadd56e82 100644 --- a/arch/mips/mm/mmap.c +++ b/arch/mips/mm/mmap.c | |||
@@ -158,11 +158,9 @@ void arch_pick_mmap_layout(struct mm_struct *mm) | |||
158 | if (mmap_is_legacy()) { | 158 | if (mmap_is_legacy()) { |
159 | mm->mmap_base = TASK_UNMAPPED_BASE + random_factor; | 159 | mm->mmap_base = TASK_UNMAPPED_BASE + random_factor; |
160 | mm->get_unmapped_area = arch_get_unmapped_area; | 160 | mm->get_unmapped_area = arch_get_unmapped_area; |
161 | mm->unmap_area = arch_unmap_area; | ||
162 | } else { | 161 | } else { |
163 | mm->mmap_base = mmap_base(random_factor); | 162 | mm->mmap_base = mmap_base(random_factor); |
164 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; | 163 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; |
165 | mm->unmap_area = arch_unmap_area_topdown; | ||
166 | } | 164 | } |
167 | } | 165 | } |
168 | 166 | ||
diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c index 67a42ed0d2fc..cb8bdbe4972f 100644 --- a/arch/powerpc/mm/mmap.c +++ b/arch/powerpc/mm/mmap.c | |||
@@ -92,10 +92,8 @@ void arch_pick_mmap_layout(struct mm_struct *mm) | |||
92 | if (mmap_is_legacy()) { | 92 | if (mmap_is_legacy()) { |
93 | mm->mmap_base = TASK_UNMAPPED_BASE; | 93 | mm->mmap_base = TASK_UNMAPPED_BASE; |
94 | mm->get_unmapped_area = arch_get_unmapped_area; | 94 | mm->get_unmapped_area = arch_get_unmapped_area; |
95 | mm->unmap_area = arch_unmap_area; | ||
96 | } else { | 95 | } else { |
97 | mm->mmap_base = mmap_base(); | 96 | mm->mmap_base = mmap_base(); |
98 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; | 97 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; |
99 | mm->unmap_area = arch_unmap_area_topdown; | ||
100 | } | 98 | } |
101 | } | 99 | } |
diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c index 06bafec00278..40023290ee5b 100644 --- a/arch/s390/mm/mmap.c +++ b/arch/s390/mm/mmap.c | |||
@@ -91,11 +91,9 @@ void arch_pick_mmap_layout(struct mm_struct *mm) | |||
91 | if (mmap_is_legacy()) { | 91 | if (mmap_is_legacy()) { |
92 | mm->mmap_base = TASK_UNMAPPED_BASE; | 92 | mm->mmap_base = TASK_UNMAPPED_BASE; |
93 | mm->get_unmapped_area = arch_get_unmapped_area; | 93 | mm->get_unmapped_area = arch_get_unmapped_area; |
94 | mm->unmap_area = arch_unmap_area; | ||
95 | } else { | 94 | } else { |
96 | mm->mmap_base = mmap_base(); | 95 | mm->mmap_base = mmap_base(); |
97 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; | 96 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; |
98 | mm->unmap_area = arch_unmap_area_topdown; | ||
99 | } | 97 | } |
100 | } | 98 | } |
101 | 99 | ||
@@ -176,11 +174,9 @@ void arch_pick_mmap_layout(struct mm_struct *mm) | |||
176 | if (mmap_is_legacy()) { | 174 | if (mmap_is_legacy()) { |
177 | mm->mmap_base = TASK_UNMAPPED_BASE; | 175 | mm->mmap_base = TASK_UNMAPPED_BASE; |
178 | mm->get_unmapped_area = s390_get_unmapped_area; | 176 | mm->get_unmapped_area = s390_get_unmapped_area; |
179 | mm->unmap_area = arch_unmap_area; | ||
180 | } else { | 177 | } else { |
181 | mm->mmap_base = mmap_base(); | 178 | mm->mmap_base = mmap_base(); |
182 | mm->get_unmapped_area = s390_get_unmapped_area_topdown; | 179 | mm->get_unmapped_area = s390_get_unmapped_area_topdown; |
183 | mm->unmap_area = arch_unmap_area_topdown; | ||
184 | } | 180 | } |
185 | } | 181 | } |
186 | 182 | ||
diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c index 2daaaa6eda23..51561b8b15ba 100644 --- a/arch/sparc/kernel/sys_sparc_64.c +++ b/arch/sparc/kernel/sys_sparc_64.c | |||
@@ -290,7 +290,6 @@ void arch_pick_mmap_layout(struct mm_struct *mm) | |||
290 | sysctl_legacy_va_layout) { | 290 | sysctl_legacy_va_layout) { |
291 | mm->mmap_base = TASK_UNMAPPED_BASE + random_factor; | 291 | mm->mmap_base = TASK_UNMAPPED_BASE + random_factor; |
292 | mm->get_unmapped_area = arch_get_unmapped_area; | 292 | mm->get_unmapped_area = arch_get_unmapped_area; |
293 | mm->unmap_area = arch_unmap_area; | ||
294 | } else { | 293 | } else { |
295 | /* We know it's 32-bit */ | 294 | /* We know it's 32-bit */ |
296 | unsigned long task_size = STACK_TOP32; | 295 | unsigned long task_size = STACK_TOP32; |
@@ -302,7 +301,6 @@ void arch_pick_mmap_layout(struct mm_struct *mm) | |||
302 | 301 | ||
303 | mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor); | 302 | mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor); |
304 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; | 303 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; |
305 | mm->unmap_area = arch_unmap_area_topdown; | ||
306 | } | 304 | } |
307 | } | 305 | } |
308 | 306 | ||
diff --git a/arch/tile/mm/mmap.c b/arch/tile/mm/mmap.c index f96f4cec602a..d67d91ebf63e 100644 --- a/arch/tile/mm/mmap.c +++ b/arch/tile/mm/mmap.c | |||
@@ -66,10 +66,8 @@ void arch_pick_mmap_layout(struct mm_struct *mm) | |||
66 | if (!is_32bit || rlimit(RLIMIT_STACK) == RLIM_INFINITY) { | 66 | if (!is_32bit || rlimit(RLIMIT_STACK) == RLIM_INFINITY) { |
67 | mm->mmap_base = TASK_UNMAPPED_BASE; | 67 | mm->mmap_base = TASK_UNMAPPED_BASE; |
68 | mm->get_unmapped_area = arch_get_unmapped_area; | 68 | mm->get_unmapped_area = arch_get_unmapped_area; |
69 | mm->unmap_area = arch_unmap_area; | ||
70 | } else { | 69 | } else { |
71 | mm->mmap_base = mmap_base(mm); | 70 | mm->mmap_base = mmap_base(mm); |
72 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; | 71 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; |
73 | mm->unmap_area = arch_unmap_area_topdown; | ||
74 | } | 72 | } |
75 | } | 73 | } |
diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c index 52ff81cce008..bae3aba95b15 100644 --- a/arch/x86/ia32/ia32_aout.c +++ b/arch/x86/ia32/ia32_aout.c | |||
@@ -308,8 +308,6 @@ static int load_aout_binary(struct linux_binprm *bprm) | |||
308 | (current->mm->start_data = N_DATADDR(ex)); | 308 | (current->mm->start_data = N_DATADDR(ex)); |
309 | current->mm->brk = ex.a_bss + | 309 | current->mm->brk = ex.a_bss + |
310 | (current->mm->start_brk = N_BSSADDR(ex)); | 310 | (current->mm->start_brk = N_BSSADDR(ex)); |
311 | current->mm->free_area_cache = TASK_UNMAPPED_BASE; | ||
312 | current->mm->cached_hole_size = 0; | ||
313 | 311 | ||
314 | retval = setup_arg_pages(bprm, IA32_STACK_TOP, EXSTACK_DEFAULT); | 312 | retval = setup_arg_pages(bprm, IA32_STACK_TOP, EXSTACK_DEFAULT); |
315 | if (retval < 0) { | 313 | if (retval < 0) { |
diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c index 845df6835f9f..62c29a5bfe26 100644 --- a/arch/x86/mm/mmap.c +++ b/arch/x86/mm/mmap.c | |||
@@ -115,10 +115,8 @@ void arch_pick_mmap_layout(struct mm_struct *mm) | |||
115 | if (mmap_is_legacy()) { | 115 | if (mmap_is_legacy()) { |
116 | mm->mmap_base = mmap_legacy_base(); | 116 | mm->mmap_base = mmap_legacy_base(); |
117 | mm->get_unmapped_area = arch_get_unmapped_area; | 117 | mm->get_unmapped_area = arch_get_unmapped_area; |
118 | mm->unmap_area = arch_unmap_area; | ||
119 | } else { | 118 | } else { |
120 | mm->mmap_base = mmap_base(); | 119 | mm->mmap_base = mmap_base(); |
121 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; | 120 | mm->get_unmapped_area = arch_get_unmapped_area_topdown; |
122 | mm->unmap_area = arch_unmap_area_topdown; | ||
123 | } | 121 | } |
124 | } | 122 | } |