diff options
Diffstat (limited to 'arch/x86/xen/setup.c')
-rw-r--r-- | arch/x86/xen/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 68c054f59de6..518ab4a17b8a 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c | |||
@@ -34,7 +34,7 @@ | |||
34 | extern const char xen_hypervisor_callback[]; | 34 | extern const char xen_hypervisor_callback[]; |
35 | extern const char xen_failsafe_callback[]; | 35 | extern const char xen_failsafe_callback[]; |
36 | #ifdef CONFIG_X86_64 | 36 | #ifdef CONFIG_X86_64 |
37 | extern const char nmi[]; | 37 | extern asmlinkage void nmi(void); |
38 | #endif | 38 | #endif |
39 | extern void xen_sysenter_target(void); | 39 | extern void xen_sysenter_target(void); |
40 | extern void xen_syscall_target(void); | 40 | extern void xen_syscall_target(void); |
@@ -559,7 +559,7 @@ void xen_enable_syscall(void) | |||
559 | void 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, (char *)nmi)) |
563 | BUG(); | 563 | BUG(); |
564 | #endif | 564 | #endif |
565 | } | 565 | } |