diff options
Diffstat (limited to 'arch/x86/kernel/kvm.c')
| -rw-r--r-- | arch/x86/kernel/kvm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index cd6d9a5a42f6..a96d32cc55b8 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c | |||
| @@ -320,7 +320,7 @@ static void kvm_guest_apic_eoi_write(u32 reg, u32 val) | |||
| 320 | apic_write(APIC_EOI, APIC_EOI_ACK); | 320 | apic_write(APIC_EOI, APIC_EOI_ACK); |
| 321 | } | 321 | } |
| 322 | 322 | ||
| 323 | void __cpuinit kvm_guest_cpu_init(void) | 323 | void kvm_guest_cpu_init(void) |
| 324 | { | 324 | { |
| 325 | if (!kvm_para_available()) | 325 | if (!kvm_para_available()) |
| 326 | return; | 326 | return; |
| @@ -421,7 +421,7 @@ static void __init kvm_smp_prepare_boot_cpu(void) | |||
| 421 | native_smp_prepare_boot_cpu(); | 421 | native_smp_prepare_boot_cpu(); |
| 422 | } | 422 | } |
| 423 | 423 | ||
| 424 | static void __cpuinit kvm_guest_cpu_online(void *dummy) | 424 | static void kvm_guest_cpu_online(void *dummy) |
| 425 | { | 425 | { |
| 426 | kvm_guest_cpu_init(); | 426 | kvm_guest_cpu_init(); |
| 427 | } | 427 | } |
| @@ -435,8 +435,8 @@ static void kvm_guest_cpu_offline(void *dummy) | |||
| 435 | apf_task_wake_all(); | 435 | apf_task_wake_all(); |
| 436 | } | 436 | } |
| 437 | 437 | ||
| 438 | static int __cpuinit kvm_cpu_notify(struct notifier_block *self, | 438 | static int kvm_cpu_notify(struct notifier_block *self, unsigned long action, |
| 439 | unsigned long action, void *hcpu) | 439 | void *hcpu) |
| 440 | { | 440 | { |
| 441 | int cpu = (unsigned long)hcpu; | 441 | int cpu = (unsigned long)hcpu; |
| 442 | switch (action) { | 442 | switch (action) { |
| @@ -455,7 +455,7 @@ static int __cpuinit kvm_cpu_notify(struct notifier_block *self, | |||
| 455 | return NOTIFY_OK; | 455 | return NOTIFY_OK; |
| 456 | } | 456 | } |
| 457 | 457 | ||
| 458 | static struct notifier_block __cpuinitdata kvm_cpu_notifier = { | 458 | static struct notifier_block kvm_cpu_notifier = { |
| 459 | .notifier_call = kvm_cpu_notify, | 459 | .notifier_call = kvm_cpu_notify, |
| 460 | }; | 460 | }; |
| 461 | #endif | 461 | #endif |
