diff options
author | Andi Kleen <ak@linux.intel.com> | 2013-10-22 12:07:59 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-01-30 01:17:18 -0500 |
commit | 07ba06d9d293d3c0a512f1cb9189645c6e0424e2 (patch) | |
tree | f3f1d3db0c02e58a9255052836c3dc2b007d053b /arch/x86 | |
parent | dd41f818e581bc8244d34d594e20331fcb835524 (diff) |
x86, asmlinkage, xen: Fix type of NMI
LTO requires consistent types of symbols over all files.
So "nmi" cannot be declared as a char [] here, need to use the
correct function type.
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Link: http://lkml.kernel.org/r/1382458079-24450-8-git-send-email-andi@firstfloor.org
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86')
-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 | } |