summaryrefslogtreecommitdiffstats
path: root/arch/x86/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-06 14:00:12 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-06 14:00:12 -0800
commitcf3f33551b6d0acf8d21a53c9aa9cf8a0d73afa3 (patch)
treeb657e1b85befbcdff5b2ee39e5ff026d6342e694 /arch/x86/mm
parent69734b644bf19f20d2989e1a8e5bf59c837ee5c1 (diff)
parent1affc46cffad9f2bc7c9ffec85726446903a58f9 (diff)
downloadop-kernel-dev-cf3f33551b6d0acf8d21a53c9aa9cf8a0d73afa3.zip
op-kernel-dev-cf3f33551b6d0acf8d21a53c9aa9cf8a0d73afa3.tar.gz
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86: Use "do { } while(0)" for empty lock_cmos()/unlock_cmos() macros x86: Use "do { } while(0)" for empty flush_tlb_fix_spurious_fault() macro x86, CPU: Drop superfluous get_cpu_cap() prototype arch/x86/mm/pageattr.c: Quiet sparse noise; local functions should be static arch/x86/kernel/ptrace.c: Quiet sparse noise x86: Use kmemdup() in copy_thread(), rather than duplicating its implementation x86: Replace the EVT_TO_HPET_DEV() macro with an inline function
Diffstat (limited to 'arch/x86/mm')
-rw-r--r--arch/x86/mm/pageattr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index f9e5267..eda2acb 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -998,7 +998,7 @@ out_err:
}
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;
OpenPOWER on IntegriCloud