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;