summaryrefslogtreecommitdiffstats
path: root/include/asm-x86/setup.h
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-06-17 04:58:28 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-08 10:38:25 +0200
commit064d25f12014ae1d97c2882f9ab874995321f2b2 (patch)
treea6f39b226bbae5a2abc15d911cdf12d01b9c8c19 /include/asm-x86/setup.h
parentx86: kill bad_ppro (diff)
downloadlinux-064d25f12014ae1d97c2882f9ab874995321f2b2.tar.xz
linux-064d25f12014ae1d97c2882f9ab874995321f2b2.zip
x86: merge setup_memory_map with e820
... and kill e820_32/64.c and e820_32/64.h Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/setup.h')
-rw-r--r--include/asm-x86/setup.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/include/asm-x86/setup.h b/include/asm-x86/setup.h
index 9e163fc3e984..b676b0be7986 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
@@ -50,10 +49,6 @@ extern struct boot_params boot_params;
*/
#define LOWMEMSIZE() (0x9f000)
-char * __init machine_specific_memory_setup(void);
-char *memory_setup(void);
-
-
void __init i386_start_kernel(void);
extern unsigned long init_pg_tables_start;