diff --git a/[refs] b/[refs]
index fb31611f8e26..2a32e6f1335a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d09951da948c0ca30944df2a9b78e68d6e0744c
+refs/heads/master: d504e39efd4e64a1a6e01dc85fd8a33fdb196dce
diff --git a/trunk/arch/x86/kernel/setup_64.c b/trunk/arch/x86/kernel/setup_64.c
index a7124bfb8578..07547febac7a 100644
--- a/trunk/arch/x86/kernel/setup_64.c
+++ b/trunk/arch/x86/kernel/setup_64.c
@@ -248,7 +248,7 @@ static inline void __init reserve_crashkernel(void)
 unsigned __initdata ebda_addr;
 unsigned __initdata ebda_size;
 
-static void discover_ebda(void)
+static void __init discover_ebda(void)
 {
 	/*
 	 * there is a real-mode segmented pointer pointing to the