diff --git a/[refs] b/[refs] index c1f562374e58..fe586dabc231 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6fc30f9e292d2275248b6ee5ca903248b66efca1 +refs/heads/master: eaf76e8b93dd5e7a53e2cd6db53f3ca18ca0fe4c diff --git a/trunk/arch/x86/kernel/head64.c b/trunk/arch/x86/kernel/head64.c index d156bfbffa9a..6643f3f994fb 100644 --- a/trunk/arch/x86/kernel/head64.c +++ b/trunk/arch/x86/kernel/head64.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include diff --git a/trunk/include/asm-x86/proto.h b/trunk/include/asm-x86/proto.h index 4eddf2761804..5a45478b5d3a 100644 --- a/trunk/include/asm-x86/proto.h +++ b/trunk/include/asm-x86/proto.h @@ -8,8 +8,6 @@ struct cpuinfo_x86; struct pt_regs; -extern void start_kernel(void); - extern void early_idt_handler(void); extern void init_memory_mapping(unsigned long start, unsigned long end);