Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31422c51 authored by Andi Kleen's avatar Andi Kleen Committed by Ingo Molnar
Browse files

x86: rename LARGE_PAGE_SIZE to PMD_PAGE_SIZE 



Fix up all users.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 9a14aefc

arch/x86/boot/compressed/head_64.S

+4 −4
Original line number Diff line number Diff line
@@ -80,8 +80,8 @@ startup_32: 


#ifdef CONFIG_RELOCATABLE

	movl	%ebp, %ebx

	addl	$(LARGE_PAGE_SIZE -1), %ebx

	andl	$LARGE_PAGE_MASK, %ebx

	addl	$(PMD_PAGE_SIZE -1), %ebx

	andl	$PMD_PAGE_MASK, %ebx

#else

	movl	$CONFIG_PHYSICAL_START, %ebx

#endif
@@ -220,8 +220,8 @@ ENTRY(startup_64) 
	/* Start with the delta to where the kernel will run at. */

#ifdef CONFIG_RELOCATABLE

	leaq	startup_32(%rip) /* - $startup_32 */, %rbp

	addq	$(LARGE_PAGE_SIZE - 1), %rbp

	andq	$LARGE_PAGE_MASK, %rbp

	addq	$(PMD_PAGE_SIZE - 1), %rbp

	andq	$PMD_PAGE_MASK, %rbp

	movq	%rbp, %rbx

#else

	movq	$CONFIG_PHYSICAL_START, %rbp

arch/x86/kernel/head_64.S

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ startup_64: 


	/* Is the address not 2M aligned? */

	movq	%rbp, %rax

	andl	$~LARGE_PAGE_MASK, %eax

	andl	$~PMD_PAGE_MASK, %eax

	testl	%eax, %eax

	jnz	bad_address
@@ -88,7 +88,7 @@ startup_64: 


	/* Add an Identity mapping if I am above 1G */

	leaq	_text(%rip), %rdi

	andq	$LARGE_PAGE_MASK, %rdi

	andq	$PMD_PAGE_MASK, %rdi



	movq	%rdi, %rax

	shrq	$PUD_SHIFT, %rax

arch/x86/kernel/pci-gart_64.c

+1 −1
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ static __init unsigned long check_iommu_size(unsigned long aper, u64 aper_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) {

		printk(KERN_WARNING

arch/x86/mm/init_64.c

+3 −3
Original line number Diff line number Diff line
@@ -444,10 +444,10 @@ void __init clear_kernel_mapping(unsigned long address, unsigned long size) 
{

	unsigned long end = address + size;



	BUG_ON(address & ~LARGE_PAGE_MASK);

	BUG_ON(size & ~LARGE_PAGE_MASK);

	BUG_ON(address & ~PMD_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);

		pud_t *pud;

		pmd_t *pmd;

arch/x86/mm/pageattr.c

+3 −3
Original line number Diff line number Diff line
@@ -273,8 +273,8 @@ static int try_preserve_large_page(pte_t *kpte, unsigned long address, 


	switch (level) {

	case PG_LEVEL_2M:

		psize = LARGE_PAGE_SIZE;

		pmask = LARGE_PAGE_MASK;

		psize = PMD_PAGE_SIZE;

		pmask = PMD_PAGE_MASK;

		break;

	case PG_LEVEL_1G:

	default:
@@ -363,7 +363,7 @@ static int split_large_page(pte_t *kpte, unsigned long address) 
	}



	address = __pa(address);

	addr = address & LARGE_PAGE_MASK;

	addr = address & PMD_PAGE_MASK;

	pbase = (pte_t *)page_address(base);

#ifdef CONFIG_X86_32

	paravirt_alloc_pt(&init_mm, page_to_pfn(base));