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
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
kvm.c
diff --git
a/arch/x86/kernel/kvm.c
b/arch/x86/kernel/kvm.c
index
8dc4466
..
33c07b0
100644
(file)
--- a/
arch/x86/kernel/kvm.c
+++ b/
arch/x86/kernel/kvm.c
@@
-493,7
+493,7
@@
static void __init kvm_smp_prepare_boot_cpu(void)
native_smp_prepare_boot_cpu();
}
-static void kvm_guest_cpu_online(void *dummy)
+static void
__cpuinit
kvm_guest_cpu_online(void *dummy)
{
kvm_guest_cpu_init();
}