UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] remove direct ref to contig_page_data for x86-64 

This patch pulls out all remaining direct references to contig_page_data
from arch/x86-64, thus saving an ifdef in one case.

Signed-off-by: Matt Tolentino <matthew.e.tolentino@intel.com>
Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Matt Tolentino 2005-06-23 00:08:03 -07:00 committed by Linus Torvalds
parent 145e664231
commit 073326634b
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86_64/kernel/aperture.c
View File

@ -40,11 +40,7 @@ int fix_aperture __initdata = 1;
static u32 __init allocate_aperture(void) static u32 __init allocate_aperture(void)
{ {
#ifdef CONFIG_DISCONTIGMEM
pg_data_t *nd0 = NODE_DATA(0); pg_data_t *nd0 = NODE_DATA(0);
#else
pg_data_t *nd0 = &contig_page_data;
#endif
u32 aper_size; u32 aper_size;
void *p; void *p;

2
arch/x86_64/kernel/setup.c
View File

@ -386,7 +386,7 @@ static void __init contig_initmem_init(void)
if (bootmap == -1L) if (bootmap == -1L)
panic("Cannot find bootmem map of size %ld\n",bootmap_size); panic("Cannot find bootmem map of size %ld\n",bootmap_size);
bootmap_size = init_bootmem(bootmap >> PAGE_SHIFT, end_pfn); bootmap_size = init_bootmem(bootmap >> PAGE_SHIFT, end_pfn);
e820_bootmem_free(&contig_page_data, 0, end_pfn << PAGE_SHIFT); e820_bootmem_free(NODE_DATA(0), 0, end_pfn << PAGE_SHIFT);
reserve_bootmem(bootmap, bootmap_size); reserve_bootmem(bootmap, bootmap_size);
} }
#endif #endif