projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
x86
/
xen
/
setup.c
diff --git
a/arch/x86/xen/setup.c
b/arch/x86/xen/setup.c
index dd5f905e33d5e187d9713d65ddaf3b721f6ad0d6..0982233b9b8433a97d6905de4aad3369c6f4c0a5 100644
(file)
--- a/
arch/x86/xen/setup.c
+++ b/
arch/x86/xen/setup.c
@@
-35,7
+35,7
@@
extern const char xen_hypervisor_callback[];
extern const char xen_failsafe_callback[];
#ifdef CONFIG_X86_64
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);
#endif
extern void xen_sysenter_target(void);
extern void xen_syscall_target(void);
@@
-577,7
+577,7
@@
void xen_enable_syscall(void)
void xen_enable_nmi(void)
{
#ifdef CONFIG_X86_64
void xen_enable_nmi(void)
{
#ifdef CONFIG_X86_64
- if (register_callback(CALLBACKTYPE_nmi, nmi))
+ if (register_callback(CALLBACKTYPE_nmi,
(char *)
nmi))
BUG();
#endif
}
BUG();
#endif
}