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

Commit 2b72394e authored by Pekka Enberg's avatar Pekka Enberg Committed by Ingo Molnar
Browse files

x86: move max_pfn_mapped and max_low_pfn_mapped to setup.c 



This patch moves the max_pfn_mapped and max_low_pfn_mapped global
variables to kernel/setup.c where they're initialized.

[ Impact: cleanup ]

Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
LKML-Reference: <1240923649.1982.21.camel@penberg-laptop>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 89388913

arch/x86/kernel/setup.c

+8 −0
Original line number Diff line number Diff line
@@ -112,6 +112,14 @@ 
#define ARCH_SETUP

#endif



/*

 * end_pfn only includes RAM, while max_pfn_mapped includes all e820 entries.

 * The direct mapping extends to max_pfn_mapped, so that we can directly access

 * apertures, ACPI and other tables without having to play with fixmaps.

 */

unsigned long max_low_pfn_mapped;

unsigned long max_pfn_mapped;



RESERVE_BRK(dmi_alloc, 65536);



unsigned int boot_cpu_id __read_mostly;

arch/x86/mm/init_32.c

+1 −3
Original line number Diff line number Diff line
@@ -49,11 +49,9 @@ 
#include <asm/paravirt.h>

#include <asm/setup.h>

#include <asm/cacheflush.h>

#include <asm/page_types.h>

#include <asm/init.h>



unsigned long max_low_pfn_mapped;

unsigned long max_pfn_mapped;



DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);

unsigned long highstart_pfn, highend_pfn;

arch/x86/mm/init_64.c

+0 −8
Original line number Diff line number Diff line
@@ -50,14 +50,6 @@ 
#include <asm/cacheflush.h>

#include <asm/init.h>



/*

 * end_pfn only includes RAM, while max_pfn_mapped includes all e820 entries.

 * The direct mapping extends to max_pfn_mapped, so that we can directly access

 * apertures, ACPI and other tables without having to play with fixmaps.

 */

unsigned long max_low_pfn_mapped;

unsigned long max_pfn_mapped;



static unsigned long dma_reserve __initdata;



DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);