Messages in this thread Patch in this message | | | From | Andi Kleen <> | Subject | [PATCH 7/7] x86, asmlinkage, xen: Fix type of nmi | Date | Tue, 22 Oct 2013 09:07:59 -0700 |
| |
From: Andi Kleen <ak@linux.intel.com>
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.wilk@oracle.com Signed-off-by: Andi Kleen <ak@linux.intel.com> --- arch/x86/xen/setup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 09f3059..a55ff2f 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -34,7 +34,7 @@ extern const char xen_hypervisor_callback[]; extern const char xen_failsafe_callback[]; #ifdef CONFIG_X86_64 -extern const char nmi[]; +extern asmlinkage void nmi(void); #endif extern void xen_sysenter_target(void); extern void xen_syscall_target(void); @@ -559,7 +559,7 @@ void xen_enable_syscall(void) void __cpuinit xen_enable_nmi(void) { #ifdef CONFIG_X86_64 - if (register_callback(CALLBACKTYPE_nmi, nmi)) + if (register_callback(CALLBACKTYPE_nmi, (char *)nmi)) BUG(); #endif } -- 1.8.3.1
| |