Commit 68db065c authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

x86: unify KERNEL_PGD_PTRS 



Make KERNEL_PGD_PTRS common, as previously it was only being defined
for 32-bit.

There are a couple of follow-on changes from this:
 - KERNEL_PGD_PTRS was being defined in terms of USER_PGD_PTRS.  The
   definition of USER_PGD_PTRS doesn't really make much sense on x86-64,
   since it can have two different user address-space configurations.
   I renamed USER_PGD_PTRS to KERNEL_PGD_BOUNDARY, which is meaningful
   for all of 32/32, 32/64 and 64/64 process configurations.

 - USER_PTRS_PER_PGD was also defined and was being used for similar
   purposes.  Converting its users to KERNEL_PGD_BOUNDARY left it
   completely unused, and so I removed it.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Andi Kleen <ak@suse.de>
Cc: Zach Amsden <zach@vmware.com>

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 90e9f536

arch/x86/kernel/reboot.c

+2 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <asm/apic.h>

#include <asm/desc.h>

#include <asm/hpet.h>

#include <asm/pgtable.h>

#include <asm/reboot_fixups.h>

#include <asm/reboot.h>
@@ -15,7 +16,6 @@ 
# include <linux/dmi.h>

# include <linux/ctype.h>

# include <linux/mc146818rtc.h>

# include <asm/pgtable.h>

#else

# include <asm/iommu.h>

#endif
@@ -275,7 +275,7 @@ void machine_real_restart(unsigned char *code, int length) 
	/* Remap the kernel at virtual address zero, as well as offset zero

	   from the kernel segment.  This assumes the kernel segment starts at

	   virtual address PAGE_OFFSET. */

	memcpy(swapper_pg_dir, swapper_pg_dir + USER_PGD_PTRS,

	memcpy(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,

		sizeof(swapper_pg_dir [0]) * KERNEL_PGD_PTRS);



	/*

arch/x86/kernel/smpboot.c

+2 −2
Original line number Diff line number Diff line
@@ -1039,8 +1039,8 @@ int __cpuinit native_cpu_up(unsigned int cpu) 


#ifdef CONFIG_X86_32

	/* init low mem mapping */

	clone_pgd_range(swapper_pg_dir, swapper_pg_dir + USER_PGD_PTRS,

			min_t(unsigned long, KERNEL_PGD_PTRS, USER_PGD_PTRS));

	clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,

			min_t(unsigned long, KERNEL_PGD_PTRS, KERNEL_PGD_BOUNDARY));

	flush_tlb_all();

#endif

arch/x86/kernel/vmi_32.c

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ static void check_zeroed_page(u32 pfn, int type, struct page *page) 
	 * pdes need to be zeroed.

	 */

	if (type & VMI_PAGE_CLONE)

		limit = USER_PTRS_PER_PGD;

		limit = KERNEL_PGD_BOUNDARY;

	for (i = 0; i < limit; i++)

		BUG_ON(ptr[i]);

}

arch/x86/mach-voyager/voyager_smp.c

+2 −2
Original line number Diff line number Diff line
@@ -560,8 +560,8 @@ static void __init do_boot_cpu(__u8 cpu) 
		hijack_source.idt.Offset, stack_start.sp));



	/* init lowmem identity mapping */

	clone_pgd_range(swapper_pg_dir, swapper_pg_dir + USER_PGD_PTRS,

			min_t(unsigned long, KERNEL_PGD_PTRS, USER_PGD_PTRS));

	clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,

			min_t(unsigned long, KERNEL_PGD_PTRS, KERNEL_PGD_BOUNDARY));

	flush_tlb_all();



	if (quad_boot) {

arch/x86/mm/init_32.c

+1 −1
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ void zap_low_mappings(void) 
	 * Note that "pgd_clear()" doesn't do it for

	 * us, because pgd_clear() is a no-op on i386.

	 */

	for (i = 0; i < USER_PTRS_PER_PGD; i++) {

	for (i = 0; i < KERNEL_PGD_BOUNDARY; i++) {

#ifdef CONFIG_X86_PAE

		set_pgd(swapper_pg_dir+i, __pgd(1 + __pa(empty_zero_page)));

#else

CRA Git | Maintained and supported by SUSTech CRA and CCSE