diff options
author | Jeremy Fitzhardinge <jeremy@xensource.com> | 2007-10-16 14:51:29 -0400 |
---|---|---|
committer | Jeremy Fitzhardinge <jeremy@goop.org> | 2007-10-16 14:51:29 -0400 |
commit | 4f8178477400cfc49a0657b96e873914d95081f8 (patch) | |
tree | aa3cbcbcab4cdc1deb9aa410bb7d1dc82937c793 /arch/x86 | |
parent | 8965c1c0950d459d99b8b81dfc1ab02e3d2cfb08 (diff) |
remove dead code in pgtable_cache_init
The conversion from using a slab cache to quicklist left some residual
dead code.
I note that in the conversion it now always allocates a whole page for
the pgd, rather than the 32 bytes needed for a PAE pgd. Was this
intended?
Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Cc: Christoph Lameter <clameter@sgi.com>
Cc: Andi Kleen <ak@suse.de>
Cc: William Lee Irwin III <wli@holomorphy.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/mm/init_32.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 730a5b177b1f..aa4708fda3e2 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c | |||
@@ -746,24 +746,12 @@ struct kmem_cache *pmd_cache; | |||
746 | 746 | ||
747 | void __init pgtable_cache_init(void) | 747 | void __init pgtable_cache_init(void) |
748 | { | 748 | { |
749 | size_t pgd_size = PTRS_PER_PGD*sizeof(pgd_t); | 749 | if (PTRS_PER_PMD > 1) |
750 | |||
751 | if (PTRS_PER_PMD > 1) { | ||
752 | pmd_cache = kmem_cache_create("pmd", | 750 | pmd_cache = kmem_cache_create("pmd", |
753 | PTRS_PER_PMD*sizeof(pmd_t), | 751 | PTRS_PER_PMD*sizeof(pmd_t), |
754 | PTRS_PER_PMD*sizeof(pmd_t), | 752 | PTRS_PER_PMD*sizeof(pmd_t), |
755 | SLAB_PANIC, | 753 | SLAB_PANIC, |
756 | pmd_ctor); | 754 | pmd_ctor); |
757 | if (!SHARED_KERNEL_PMD) { | ||
758 | /* If we're in PAE mode and have a non-shared | ||
759 | kernel pmd, then the pgd size must be a | ||
760 | page size. This is because the pgd_list | ||
761 | links through the page structure, so there | ||
762 | can only be one pgd per page for this to | ||
763 | work. */ | ||
764 | pgd_size = PAGE_SIZE; | ||
765 | } | ||
766 | } | ||
767 | } | 755 | } |
768 | 756 | ||
769 | /* | 757 | /* |