diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:34:04 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:34:04 +0100 |
| commit | e4b71dcf54fa90fc30fb901bbce7e38a46467af7 (patch) | |
| tree | e763c8e2d3f67d8b8266452e99562092c1d2f285 | |
| parent | 4554ab95c2b9d6b0ee9cf2a7ed3df665422acebb (diff) | |
| download | linux-3.10-e4b71dcf54fa90fc30fb901bbce7e38a46467af7.tar.gz linux-3.10-e4b71dcf54fa90fc30fb901bbce7e38a46467af7.tar.bz2 linux-3.10-e4b71dcf54fa90fc30fb901bbce7e38a46467af7.zip | |
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>
| -rw-r--r-- | arch/x86/mm/pageattr.c | 13 | ||||
| -rw-r--r-- | include/asm-x86/pgtable_64.h | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index 510ff409166..a270f9ccebf 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c @@ -2,7 +2,6 @@ * Copyright 2002 Andi Kleen, SuSE Labs. * Thanks to Ben LaHaise for precious feedback. */ - #include <linux/highmem.h> #include <linux/module.h> #include <linux/sched.h> @@ -50,9 +49,7 @@ static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte) /* change init_mm */ set_pte_atomic(kpte, pte); #ifdef CONFIG_X86_32 - if (SHARED_KERNEL_PMD) - return; - { + if (!SHARED_KERNEL_PMD) { struct page *page; 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) return; /* - * the return value is ignored - the calls cannot fail, - * large pages are disabled at boot time. + * The return value is ignored - the calls cannot fail, + * large pages are disabled at boot time: */ change_page_attr(page, numpages, enable ? PAGE_KERNEL : __pgprot(0)); /* - * we should perform an IPI and flush all tlbs, - * but that can deadlock->flush only current cpu. + * We should perform an IPI and flush all tlbs, + * but that can deadlock->flush only current cpu: */ __flush_tlb_all(); } diff --git a/include/asm-x86/pgtable_64.h b/include/asm-x86/pgtable_64.h index 223b0032bab..faa6a96c2a5 100644 --- a/include/asm-x86/pgtable_64.h +++ b/include/asm-x86/pgtable_64.h @@ -25,6 +25,8 @@ extern void clear_kernel_mapping(unsigned long addr, unsigned long size); #endif /* !__ASSEMBLY__ */ +#define SHARED_KERNEL_PMD 1 + /* * PGDIR_SHIFT determines what a top-level page table entry can map */ |