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

Commit 07332663 authored by Matt Tolentino's avatar Matt Tolentino Committed by Linus Torvalds
Browse files

[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: default avatarMatt Tolentino <matthew.e.tolentino@intel.com>
Signed-off-by: default avatarDave Hansen <haveblue@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 145e6642

arch/x86_64/kernel/aperture.c

+0 −4
Original line number Diff line number Diff line
@@ -40,11 +40,7 @@ int fix_aperture __initdata = 1; 


static u32 __init allocate_aperture(void) 

{

#ifdef CONFIG_DISCONTIGMEM

	pg_data_t *nd0 = NODE_DATA(0);

#else

	pg_data_t *nd0 = &contig_page_data;

#endif	

	u32 aper_size;

	void *p;

arch/x86_64/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ static void __init contig_initmem_init(void) 
        if (bootmap == -1L) 

                panic("Cannot find bootmem map of size %ld\n",bootmap_size);

        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);

} 

#endif