From 75925bd0e03428c7f74363d83098caac4fc933cf Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 15 Nov 2011 14:49:00 -0800
Subject: [PATCH] --- yaml --- r: 277471 b: refs/heads/master c:
 2d070eff6bbbea6137ac14190805f9549c0a8b01 h: refs/heads/master i:   277469:
 aefb689f88a57d9d6b5d8499f3c80bdef5990b61   277467:
 545574ea9fde1047a11d8130fe3f5e58fbd3d8c9   277463:
 17fd15f1889a7f35c2f2ae2cd1df6c7e97d69576   277455:
 412af8cef8ec8a9fd83da88c5a4538b4b3e67b5b   277439:
 273101f2ff90af0684fc86d5a7f3635627504a2e v: v3

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

diff --git a/[refs] b/[refs]
index 8e3a44a4c9cc..a876b9b3069c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98b8b99ae1233a5408b136544e900a9cfb46e08f
+refs/heads/master: 2d070eff6bbbea6137ac14190805f9549c0a8b01
diff --git a/trunk/arch/x86/mm/pageattr.c b/trunk/arch/x86/mm/pageattr.c
index f9e526742fa1..eda2acbb6e81 100644
--- a/trunk/arch/x86/mm/pageattr.c
+++ b/trunk/arch/x86/mm/pageattr.c
@@ -998,7 +998,7 @@ int set_memory_uc(unsigned long addr, int numpages)
 }
 EXPORT_SYMBOL(set_memory_uc);
 
-int _set_memory_array(unsigned long *addr, int addrinarray,
+static int _set_memory_array(unsigned long *addr, int addrinarray,
 		unsigned long new_type)
 {
 	int i, j;