From aa08a00ab4f174ebe40ff5cb329792d229bb80d5 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Wed, 24 Oct 2007 18:24:47 +0200
Subject: [PATCH] --- yaml --- r: 72807 b: refs/heads/master c:
 fb8c177fe04c81ef5abe603e01d51eafa02d903a h: refs/heads/master i:   72805:
 429f20f12d88e31665321b883115d54d286428cb   72803:
 dbe4451045777f08d4e57ff1a37afe8dcbdd1129   72799:
 d6c20e336f0c7126b5bd5ab1f0f35182217d7c63 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/mm/discontig_32.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ebc7140af12c..2418e3ab6620 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1aa14b2e930a6dfab888ded1a2a951a0ff279dc
+refs/heads/master: fb8c177fe04c81ef5abe603e01d51eafa02d903a
diff --git a/trunk/arch/x86/mm/discontig_32.c b/trunk/arch/x86/mm/discontig_32.c
index fe608a45ffb6..13a474d3c6e9 100644
--- a/trunk/arch/x86/mm/discontig_32.c
+++ b/trunk/arch/x86/mm/discontig_32.c
@@ -40,7 +40,7 @@
 
 struct pglist_data *node_data[MAX_NUMNODES] __read_mostly;
 EXPORT_SYMBOL(node_data);
-bootmem_data_t node0_bdata;
+static bootmem_data_t node0_bdata;
 
 /*
  * numa interface - we expect the numa architecture specific code to have
@@ -404,7 +404,7 @@ void __init set_highmem_pages_init(int bad_ppro)
 }
 
 #ifdef CONFIG_MEMORY_HOTPLUG
-int paddr_to_nid(u64 addr)
+static int paddr_to_nid(u64 addr)
 {
 	int nid;
 	unsigned long pfn = PFN_DOWN(addr);