projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dd41f81
)
x86, asmlinkage, xen: Fix type of NMI
author
Andi Kleen
<ak@linux.intel.com>
Tue, 22 Oct 2013 16:07:59 +0000
(09:07 -0700)
committer
H. Peter Anvin
<hpa@linux.intel.com>
Thu, 30 Jan 2014 06:17:18 +0000
(22:17 -0800)
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>
arch/x86/xen/setup.c
patch
|
blob
|
history
diff --git
a/arch/x86/xen/setup.c
b/arch/x86/xen/setup.c
index
68c054f
..
518ab4a
100644
(file)
--- 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 xen_enable_nmi(void)
{
#ifdef CONFIG_X86_64
- if (register_callback(CALLBACKTYPE_nmi, nmi))
+ if (register_callback(CALLBACKTYPE_nmi,
(char *)
nmi))
BUG();
#endif
}