From 1afccd80d914d4808a8e723eb352c515869a73d5 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Tue, 26 Sep 2006 10:52:37 +0200
Subject: [PATCH] --- yaml --- r: 35909 b: refs/heads/master c:
 1164c9994fe37d5b7035a5cf9328c98dd38af7b1 h: refs/heads/master i:   35907:
 5d23cd252bfc8ce3d6399a3a31ce1faf01303094 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86_64/mm/numa.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b75929107d12..61687dd8cc79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bb4996bcebca1cde49d964b4e012699ce180e61
+refs/heads/master: 1164c9994fe37d5b7035a5cf9328c98dd38af7b1
diff --git a/trunk/arch/x86_64/mm/numa.c b/trunk/arch/x86_64/mm/numa.c
index d64d6d93d04b..322bf45fc36a 100644
--- a/trunk/arch/x86_64/mm/numa.c
+++ b/trunk/arch/x86_64/mm/numa.c
@@ -225,7 +225,7 @@ void __init numa_init_array(void)
 int numa_fake __initdata = 0;
 
 /* Numa emulation */
-static int numa_emulation(unsigned long start_pfn, unsigned long end_pfn)
+static int __init numa_emulation(unsigned long start_pfn, unsigned long end_pfn)
 {
  	int i;
  	struct bootnode nodes[MAX_NUMNODES];