aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-01-30 07:30:19 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:30:19 -0500
commiteaf76e8b93dd5e7a53e2cd6db53f3ca18ca0fe4c (patch)
treeeba4e635bfb671470baf01b10fd3228002459aa8
parent6fc30f9e292d2275248b6ee5ca903248b66efca1 (diff)
x86: remove duplicate start_kernel declaration
start_kernel is already declared in a generic header file. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/head64.c1
-rw-r--r--include/asm-x86/proto.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index d156bfbffa9a..6643f3f994fb 100644
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -10,6 +10,7 @@
10#include <linux/kernel.h> 10#include <linux/kernel.h>
11#include <linux/string.h> 11#include <linux/string.h>
12#include <linux/percpu.h> 12#include <linux/percpu.h>
13#include <linux/start_kernel.h>
13 14
14#include <asm/processor.h> 15#include <asm/processor.h>
15#include <asm/proto.h> 16#include <asm/proto.h>
diff --git a/include/asm-x86/proto.h b/include/asm-x86/proto.h
index 4eddf2761804..5a45478b5d3a 100644
--- a/include/asm-x86/proto.h
+++ b/include/asm-x86/proto.h
@@ -8,8 +8,6 @@
8struct cpuinfo_x86; 8struct cpuinfo_x86;
9struct pt_regs; 9struct pt_regs;
10 10
11extern void start_kernel(void);
12
13extern void early_idt_handler(void); 11extern void early_idt_handler(void);
14 12
15extern void init_memory_mapping(unsigned long start, unsigned long end); 13extern void init_memory_mapping(unsigned long start, unsigned long end);