[PATCH] sparsemem memory model for i386
Provide the architecture specific implementation for SPARSEMEM for i386 SMP and NUMA systems. Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Dave Hansen <haveblue@us.ibm.com> Signed-off-by: Martin Bligh <mbligh@aracnet.com> Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
d41dee369b
commit
05b79bdcb4
@@ -25,6 +25,7 @@
|
||||
|
||||
#include <linux/sched.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/mmzone.h>
|
||||
#include <linux/tty.h>
|
||||
#include <linux/ioport.h>
|
||||
#include <linux/acpi.h>
|
||||
@@ -1022,7 +1023,7 @@ static void __init reserve_ebda_region(void)
|
||||
reserve_bootmem(addr, PAGE_SIZE);
|
||||
}
|
||||
|
||||
#ifndef CONFIG_DISCONTIGMEM
|
||||
#ifndef CONFIG_NEED_MULTIPLE_NODES
|
||||
void __init setup_bootmem_allocator(void);
|
||||
static unsigned long __init setup_memory(void)
|
||||
{
|
||||
@@ -1072,9 +1073,9 @@ void __init zone_sizes_init(void)
|
||||
free_area_init(zones_size);
|
||||
}
|
||||
#else
|
||||
extern unsigned long setup_memory(void);
|
||||
extern unsigned long __init setup_memory(void);
|
||||
extern void zone_sizes_init(void);
|
||||
#endif /* !CONFIG_DISCONTIGMEM */
|
||||
#endif /* !CONFIG_NEED_MULTIPLE_NODES */
|
||||
|
||||
void __init setup_bootmem_allocator(void)
|
||||
{
|
||||
@@ -1475,6 +1476,7 @@ void __init setup_arch(char **cmdline_p)
|
||||
#endif
|
||||
paging_init();
|
||||
remapped_pgdat_init();
|
||||
sparse_init();
|
||||
zone_sizes_init();
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user