diff options
author | Andi Kleen <ak@suse.de> | 2008-02-04 10:48:08 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-02-04 10:48:08 -0500 |
commit | 31422c51e0dc72532d82e80895932d430c3ed307 (patch) | |
tree | e1b66c4debeb83dc0fc133b13cea903096e9c933 /arch/x86/mm | |
parent | 9a14aefc1d28c6037122965ee8c10d92a970ade0 (diff) |
x86: rename LARGE_PAGE_SIZE to PMD_PAGE_SIZE
Fix up all users.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/mm')
-rw-r--r-- | arch/x86/mm/init_64.c | 6 | ||||
-rw-r--r-- | arch/x86/mm/pageattr.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index eabcaed76c28..b7a7992c28b6 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c | |||
@@ -444,10 +444,10 @@ void __init clear_kernel_mapping(unsigned long address, unsigned long size) | |||
444 | { | 444 | { |
445 | unsigned long end = address + size; | 445 | unsigned long end = address + size; |
446 | 446 | ||
447 | BUG_ON(address & ~LARGE_PAGE_MASK); | 447 | BUG_ON(address & ~PMD_PAGE_MASK); |
448 | BUG_ON(size & ~LARGE_PAGE_MASK); | 448 | BUG_ON(size & ~PMD_PAGE_MASK); |
449 | 449 | ||
450 | for (; address < end; address += LARGE_PAGE_SIZE) { | 450 | for (; address < end; address += PMD_PAGE_SIZE) { |
451 | pgd_t *pgd = pgd_offset_k(address); | 451 | pgd_t *pgd = pgd_offset_k(address); |
452 | pud_t *pud; | 452 | pud_t *pud; |
453 | pmd_t *pmd; | 453 | pmd_t *pmd; |
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index 7d21cd658ed3..74446ea23ffb 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c | |||
@@ -273,8 +273,8 @@ static int try_preserve_large_page(pte_t *kpte, unsigned long address, | |||
273 | 273 | ||
274 | switch (level) { | 274 | switch (level) { |
275 | case PG_LEVEL_2M: | 275 | case PG_LEVEL_2M: |
276 | psize = LARGE_PAGE_SIZE; | 276 | psize = PMD_PAGE_SIZE; |
277 | pmask = LARGE_PAGE_MASK; | 277 | pmask = PMD_PAGE_MASK; |
278 | break; | 278 | break; |
279 | case PG_LEVEL_1G: | 279 | case PG_LEVEL_1G: |
280 | default: | 280 | default: |
@@ -363,7 +363,7 @@ static int split_large_page(pte_t *kpte, unsigned long address) | |||
363 | } | 363 | } |
364 | 364 | ||
365 | address = __pa(address); | 365 | address = __pa(address); |
366 | addr = address & LARGE_PAGE_MASK; | 366 | addr = address & PMD_PAGE_MASK; |
367 | pbase = (pte_t *)page_address(base); | 367 | pbase = (pte_t *)page_address(base); |
368 | #ifdef CONFIG_X86_32 | 368 | #ifdef CONFIG_X86_32 |
369 | paravirt_alloc_pt(&init_mm, page_to_pfn(base)); | 369 | paravirt_alloc_pt(&init_mm, page_to_pfn(base)); |