x86: move max_pfn_mapped and max_low_pfn_mapped to setup.c
PATCH 1/2 x86: move max_pfn_mapped and max_low_pfn_mapped to setup.c
From: Pekka Enberg <[email protected]>
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 Pekka Enberg <[email protected]>
--- arch/x86/kernel/setup.c | 8 ++++++++ arch/x86/mm/init_32.c | 4 +--- arch/x86/mm/init_64.c | 8 -------- 3 files changed, 9 insertions(+), 11 deletions(-)
arch/x86/kernel/setup.c +8 -0
@@ -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
@@ -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
@@ -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);
Signature · 1 line
1.5.6.3
Commit-ID: 2b72394e4089643f11669d9610907a1442fe044a Gitweb: http://git.kernel.org/tip/2b72394e4089643f11669d9610907a1442fe044a Author: Pekka Enberg <[email protected]> AuthorDate: Tue, 28 Apr 2009 16:00:49 +0300 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 30 Apr 2009 10:12:36 +0200
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 Pekka Enberg <[email protected]>
LKML-Reference: <1240923649.1982.21.camel@penberg-laptop>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/kernel/setup.c | 8 ++++++++ arch/x86/mm/init_32.c | 4 +--- arch/x86/mm/init_64.c | 8 -------- 3 files changed, 9 insertions(+), 11 deletions(-)
arch/x86/kernel/setup.c +8 -0
@@ -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
@@ -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
@@ -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);