aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/pageattr.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-01-30 07:34:04 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:34:04 -0500
commite4b71dcf54fa90fc30fb901bbce7e38a46467af7 (patch)
treee763c8e2d3f67d8b8266452e99562092c1d2f285 /arch/x86/mm/pageattr.c
parent4554ab95c2b9d6b0ee9cf2a7ed3df665422acebb (diff)
x86: clean up arch/x86/mm/pageattr.c
do some leftover cleanups in the now unified arch/x86/mm/pageattr.c file. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/mm/pageattr.c')
-rw-r--r--arch/x86/mm/pageattr.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 510ff4091667..a270f9ccebfb 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -2,7 +2,6 @@
2 * Copyright 2002 Andi Kleen, SuSE Labs. 2 * Copyright 2002 Andi Kleen, SuSE Labs.
3 * Thanks to Ben LaHaise for precious feedback. 3 * Thanks to Ben LaHaise for precious feedback.
4 */ 4 */
5
6#include <linux/highmem.h> 5#include <linux/highmem.h>
7#include <linux/module.h> 6#include <linux/module.h>
8#include <linux/sched.h> 7#include <linux/sched.h>
@@ -50,9 +49,7 @@ static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
50 /* change init_mm */ 49 /* change init_mm */
51 set_pte_atomic(kpte, pte); 50 set_pte_atomic(kpte, pte);
52#ifdef CONFIG_X86_32 51#ifdef CONFIG_X86_32
53 if (SHARED_KERNEL_PMD) 52 if (!SHARED_KERNEL_PMD) {
54 return;
55 {
56 struct page *page; 53 struct page *page;
57 54
58 for (page = pgd_list; page; page = (struct page *)page->index) { 55 for (page = pgd_list; page; page = (struct page *)page->index) {
@@ -277,14 +274,14 @@ void kernel_map_pages(struct page *page, int numpages, int enable)
277 return; 274 return;
278 275
279 /* 276 /*
280 * the return value is ignored - the calls cannot fail, 277 * The return value is ignored - the calls cannot fail,
281 * large pages are disabled at boot time. 278 * large pages are disabled at boot time:
282 */ 279 */
283 change_page_attr(page, numpages, enable ? PAGE_KERNEL : __pgprot(0)); 280 change_page_attr(page, numpages, enable ? PAGE_KERNEL : __pgprot(0));
284 281
285 /* 282 /*
286 * we should perform an IPI and flush all tlbs, 283 * We should perform an IPI and flush all tlbs,
287 * but that can deadlock->flush only current cpu. 284 * but that can deadlock->flush only current cpu:
288 */ 285 */
289 __flush_tlb_all(); 286 __flush_tlb_all();
290} 287}