From 817388fb19c9652dd1bec0bde4112034225fae19 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Wed, 30 Jan 2008 13:32:49 +0100
Subject: [PATCH] --- yaml --- r: 80184 b: refs/heads/master c:
 e3cfac84cfbc8c9f17817573befc0f4913b1a4dc h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/kernel/setup_64.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dbc59f97ecdd..fe35d4161bfe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9a832902fccc958caa339677dbff766e51b02c3
+refs/heads/master: e3cfac84cfbc8c9f17817573befc0f4913b1a4dc
diff --git a/trunk/arch/x86/kernel/setup_64.c b/trunk/arch/x86/kernel/setup_64.c
index 1caf7458dc48..a7124bfb8578 100644
--- a/trunk/arch/x86/kernel/setup_64.c
+++ b/trunk/arch/x86/kernel/setup_64.c
@@ -279,7 +279,7 @@ static void discover_ebda(void)
 }
 
 /* Overridden in paravirt.c if CONFIG_PARAVIRT */
-void __attribute__((weak)) memory_setup(void)
+void __attribute__((weak)) __init memory_setup(void)
 {
        machine_specific_memory_setup();
 }