diff options
-rw-r--r-- | arch/x86/xen/setup.c | 2 | ||||
-rw-r--r-- | drivers/xen/balloon.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 09f3059cb00b..68c054f59de6 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c | |||
@@ -556,7 +556,7 @@ void xen_enable_syscall(void) | |||
556 | } | 556 | } |
557 | #endif /* CONFIG_X86_64 */ | 557 | #endif /* CONFIG_X86_64 */ |
558 | } | 558 | } |
559 | void __cpuinit xen_enable_nmi(void) | 559 | void xen_enable_nmi(void) |
560 | { | 560 | { |
561 | #ifdef CONFIG_X86_64 | 561 | #ifdef CONFIG_X86_64 |
562 | if (register_callback(CALLBACKTYPE_nmi, nmi)) | 562 | if (register_callback(CALLBACKTYPE_nmi, nmi)) |
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c index 1b6230419704..55ea73f7c70b 100644 --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c | |||
@@ -596,7 +596,7 @@ static void __init balloon_add_region(unsigned long start_pfn, | |||
596 | } | 596 | } |
597 | } | 597 | } |
598 | 598 | ||
599 | static int __cpuinit balloon_cpu_notify(struct notifier_block *self, | 599 | static int balloon_cpu_notify(struct notifier_block *self, |
600 | unsigned long action, void *hcpu) | 600 | unsigned long action, void *hcpu) |
601 | { | 601 | { |
602 | int cpu = (long)hcpu; | 602 | int cpu = (long)hcpu; |
@@ -616,7 +616,7 @@ static int __cpuinit balloon_cpu_notify(struct notifier_block *self, | |||
616 | return NOTIFY_OK; | 616 | return NOTIFY_OK; |
617 | } | 617 | } |
618 | 618 | ||
619 | static struct notifier_block balloon_cpu_notifier __cpuinitdata = { | 619 | static struct notifier_block balloon_cpu_notifier = { |
620 | .notifier_call = balloon_cpu_notify, | 620 | .notifier_call = balloon_cpu_notify, |
621 | }; | 621 | }; |
622 | 622 | ||