git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull novell-bugzilla-156426 into release branch
[pandora-kernel.git]
/
arch
/
x86_64
/
kernel
/
mce.c
diff --git
a/arch/x86_64/kernel/mce.c
b/arch/x86_64/kernel/mce.c
index
6f0790e
..
c69fc43
100644
(file)
--- a/
arch/x86_64/kernel/mce.c
+++ b/
arch/x86_64/kernel/mce.c
@@
-629,7
+629,7
@@
static __cpuinit void mce_remove_device(unsigned int cpu)
#endif
/* Get notified when a cpu comes on/off. Be hotplug friendly. */
-static
__cpuinit
int
+static int
mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned long)hcpu;