evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86: rename LARGE_PAGE_SIZE to PMD_PAGE_SIZE

Browse source 
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>
This commit is contained in:
Andi Kleen 2008-02-04 16:48:08 +01:00 • committed by Ingo Molnar
parent 9a14aefc1d
commit 31422c51e0
6 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/x86/boot/compressed/head_64.S
View file

@ -80,8 +80,8 @@ startup_32:
#ifdef CONFIG_RELOCATABLE #ifdef CONFIG_RELOCATABLE
movl %ebp, %ebx movl %ebp, %ebx
addl $(LARGE_PAGE_SIZE -1), %ebx addl $(PMD_PAGE_SIZE -1), %ebx
andl $LARGE_PAGE_MASK, %ebx andl $PMD_PAGE_MASK, %ebx
#else #else
movl $CONFIG_PHYSICAL_START, %ebx movl $CONFIG_PHYSICAL_START, %ebx
#endif #endif
@ -220,8 +220,8 @@ ENTRY(startup_64)
/* Start with the delta to where the kernel will run at. */ /* Start with the delta to where the kernel will run at. */
#ifdef CONFIG_RELOCATABLE #ifdef CONFIG_RELOCATABLE
leaq startup_32(%rip) /* - $startup_32 */, %rbp leaq startup_32(%rip) /* - $startup_32 */, %rbp
addq $(LARGE_PAGE_SIZE - 1), %rbp addq $(PMD_PAGE_SIZE - 1), %rbp
andq $LARGE_PAGE_MASK, %rbp andq $PMD_PAGE_MASK, %rbp
movq %rbp, %rbx movq %rbp, %rbx
#else #else
movq $CONFIG_PHYSICAL_START, %rbp movq $CONFIG_PHYSICAL_START, %rbp

4
arch/x86/kernel/head_64.S
View file

@ -63,7 +63,7 @@ startup_64:
/* Is the address not 2M aligned? */ /* Is the address not 2M aligned? */
movq %rbp, %rax movq %rbp, %rax
andl $~LARGE_PAGE_MASK, %eax andl $~PMD_PAGE_MASK, %eax
testl %eax, %eax testl %eax, %eax
jnz bad_address jnz bad_address
@ -88,7 +88,7 @@ startup_64:
/* Add an Identity mapping if I am above 1G */ /* Add an Identity mapping if I am above 1G */
leaq _text(%rip), %rdi leaq _text(%rip), %rdi
andq $LARGE_PAGE_MASK, %rdi andq $PMD_PAGE_MASK, %rdi
movq %rdi, %rax movq %rdi, %rax
shrq $PUD_SHIFT, %rax shrq $PUD_SHIFT, %rax

2
arch/x86/kernel/pci-gart_64.c
View file

@ -501,7 +501,7 @@ static __init unsigned long check_iommu_size(unsigned long aper, u64 aper_size)
} }
a = aper + iommu_size; a = aper + iommu_size;
iommu_size -= round_up(a, LARGE_PAGE_SIZE) - a; iommu_size -= round_up(a, PMD_PAGE_SIZE) - a;
if (iommu_size < 64*1024*1024) { if (iommu_size < 64*1024*1024) {
printk(KERN_WARNING printk(KERN_WARNING

6
arch/x86/mm/init_64.c
View file

@ -444,10 +444,10 @@ void __init clear_kernel_mapping(unsigned long address, unsigned long size)
{ {
unsigned long end = address + size; unsigned long end = address + size;
BUG_ON(address & ~LARGE_PAGE_MASK); BUG_ON(address & ~PMD_PAGE_MASK);
BUG_ON(size & ~LARGE_PAGE_MASK); BUG_ON(size & ~PMD_PAGE_MASK);
for (; address < end; address += LARGE_PAGE_SIZE) { for (; address < end; address += PMD_PAGE_SIZE) {
pgd_t *pgd = pgd_offset_k(address); pgd_t *pgd = pgd_offset_k(address);
pud_t *pud; pud_t *pud;
pmd_t *pmd; pmd_t *pmd;

6
arch/x86/mm/pageattr.c
View file

@ -273,8 +273,8 @@ static int try_preserve_large_page(pte_t *kpte, unsigned long address,
switch (level) { switch (level) {
case PG_LEVEL_2M: case PG_LEVEL_2M:
psize = LARGE_PAGE_SIZE; psize = PMD_PAGE_SIZE;
pmask = LARGE_PAGE_MASK; pmask = PMD_PAGE_MASK;
break; break;
case PG_LEVEL_1G: case PG_LEVEL_1G:
default: default:
@ -363,7 +363,7 @@ static int split_large_page(pte_t *kpte, unsigned long address)
} }
address = __pa(address); address = __pa(address);
addr = address & LARGE_PAGE_MASK; addr = address & PMD_PAGE_MASK;
pbase = (pte_t *)page_address(base); pbase = (pte_t *)page_address(base);
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
paravirt_alloc_pt(&init_mm, page_to_pfn(base)); paravirt_alloc_pt(&init_mm, page_to_pfn(base));

4
include/asm-x86/page.h
View file

@ -13,8 +13,8 @@
#define PHYSICAL_PAGE_MASK (PAGE_MASK & __PHYSICAL_MASK) #define PHYSICAL_PAGE_MASK (PAGE_MASK & __PHYSICAL_MASK)
#define PTE_MASK (_AT(long, PHYSICAL_PAGE_MASK)) #define PTE_MASK (_AT(long, PHYSICAL_PAGE_MASK))
#define LARGE_PAGE_SIZE (_AC(1,UL) << PMD_SHIFT) #define PMD_PAGE_SIZE (_AC(1, UL) << PMD_SHIFT)
#define LARGE_PAGE_MASK (~(LARGE_PAGE_SIZE-1)) #define PMD_PAGE_MASK (~(PMD_PAGE_SIZE-1))
#define HPAGE_SHIFT PMD_SHIFT #define HPAGE_SHIFT PMD_SHIFT
#define HPAGE_SIZE (_AC(1,UL) << HPAGE_SHIFT) #define HPAGE_SIZE (_AC(1,UL) << HPAGE_SHIFT)