forked from luck/tmp_suning_uos_patched
5c95da9f5a
register_memory() becomes double definition in 2.6.20-rc1. It is defined in arch/i386/kernel/setup.c as static definition in 2.6.19. But it is moved to arch/i386/kernel/e820.c in 2.6.20-rc1. And same name function is defined in driver/base/memory.c too. So, it becomes cause of compile error of duplicate definition if memory hotplug option is on. Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com> Cc: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
50 lines
1.3 KiB
C
50 lines
1.3 KiB
C
/*
|
|
* structures and definitions for the int 15, ax=e820 memory map
|
|
* scheme.
|
|
*
|
|
* In a nutshell, arch/i386/boot/setup.S populates a scratch table
|
|
* in the empty_zero_block that contains a list of usable address/size
|
|
* duples. In arch/i386/kernel/setup.c, this information is
|
|
* transferred into the e820map, and in arch/i386/mm/init.c, that
|
|
* new information is used to mark pages reserved or not.
|
|
*
|
|
*/
|
|
#ifndef __E820_HEADER
|
|
#define __E820_HEADER
|
|
|
|
#define E820MAP 0x2d0 /* our map */
|
|
#define E820MAX 128 /* number of entries in E820MAP */
|
|
#define E820NR 0x1e8 /* # entries in E820MAP */
|
|
|
|
#define E820_RAM 1
|
|
#define E820_RESERVED 2
|
|
#define E820_ACPI 3
|
|
#define E820_NVS 4
|
|
|
|
#define HIGH_MEMORY (1024*1024)
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
struct e820map {
|
|
int nr_map;
|
|
struct e820entry {
|
|
unsigned long long addr; /* start of memory segment */
|
|
unsigned long long size; /* size of memory segment */
|
|
unsigned long type; /* type of memory segment */
|
|
} map[E820MAX];
|
|
};
|
|
|
|
extern struct e820map e820;
|
|
|
|
extern int e820_all_mapped(unsigned long start, unsigned long end,
|
|
unsigned type);
|
|
extern void find_max_pfn(void);
|
|
extern void register_bootmem_low_pages(unsigned long max_low_pfn);
|
|
extern void e820_register_memory(void);
|
|
extern void limit_regions(unsigned long long size);
|
|
extern void print_memory_map(char *who);
|
|
|
|
#endif/*!__ASSEMBLY__*/
|
|
|
|
#endif/*__E820_HEADER*/
|