projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into cpumask-for-linus
[linux-2.6-block.git]
/
arch
/
x86
/
kernel
/
cpu
/
mcheck
/
mce_intel_64.c
diff --git
a/arch/x86/kernel/cpu/mcheck/mce_intel_64.c
b/arch/x86/kernel/cpu/mcheck/mce_intel_64.c
index 96b2a85545aa8d6940775d54b191edce0aacc7dc..d6b72df89d697cb6b809cc1e3c68540d28cfe1f3 100644
(file)
--- a/
arch/x86/kernel/cpu/mcheck/mce_intel_64.c
+++ b/
arch/x86/kernel/cpu/mcheck/mce_intel_64.c
@@
-270,7
+270,7
@@
void cmci_reenable(void)
cmci_discover(banks, 0);
}
-static
__cpuinit
void intel_init_cmci(void)
+static void intel_init_cmci(void)
{
int banks;