diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 11:14:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 11:14:58 +0200 |
| commit | 3de352bbd86f890dd0c5e1c09a6a1b0b29e0f8ce (patch) | |
| tree | d4c5eba8cd2abefd7c9f16d089393f0f5999cf63 /include/asm-x86/setup.h | |
| parent | 1b8ba39a3fad9c58532f6dad12c94d6e675be656 (diff) | |
| parent | 9340e1ccdf7b9b22a2be7f51cd74e8b5e11961bf (diff) | |
| download | kernel-crypto-3de352bbd86f890dd0c5e1c09a6a1b0b29e0f8ce.tar.gz kernel-crypto-3de352bbd86f890dd0c5e1c09a6a1b0b29e0f8ce.tar.xz kernel-crypto-3de352bbd86f890dd0c5e1c09a6a1b0b29e0f8ce.zip | |
Merge branch 'x86/mpparse' into x86/devel
Conflicts:
arch/x86/Kconfig
arch/x86/kernel/io_apic_32.c
arch/x86/kernel/setup_64.c
arch/x86/mm/init_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/setup.h')
| -rw-r--r-- | include/asm-x86/setup.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/include/asm-x86/setup.h b/include/asm-x86/setup.h index fa6763af8d2..e14b6e73d26 100644 --- a/include/asm-x86/setup.h +++ b/include/asm-x86/setup.h @@ -8,7 +8,6 @@ /* Interrupt control for vSMPowered x86_64 systems */ void vsmp_init(void); -char *machine_specific_memory_setup(void); #ifndef CONFIG_PARAVIRT #define paravirt_post_allocator_init() do {} while (0) #endif @@ -43,27 +42,19 @@ char *machine_specific_memory_setup(void); */ extern struct boot_params boot_params; -#ifdef __i386__ /* * Do NOT EVER look at the BIOS memory size location. * It does not work on many machines. */ #define LOWMEMSIZE() (0x9f000) -struct e820entry; - -char * __init machine_specific_memory_setup(void); -char *memory_setup(void); +#ifdef __i386__ -int __init copy_e820_map(struct e820entry *biosmap, int nr_map); -int __init sanitize_e820_map(struct e820entry *biosmap, char *pnr_map); -void __init add_memory_region(unsigned long long start, - unsigned long long size, int type); +void __init i386_start_kernel(void); +extern unsigned long init_pg_tables_start; extern unsigned long init_pg_tables_end; - - #endif /* __i386__ */ #endif /* _SETUP */ #endif /* __ASSEMBLY__ */ |