projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'arm-dt-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[linux-2.6-microblaze.git]
/
arch
/
x86
/
xen
/
setup.c
diff --git
a/arch/x86/xen/setup.c
b/arch/x86/xen/setup.c
index
81aa46f
..
cfa99e8
100644
(file)
--- a/
arch/x86/xen/setup.c
+++ b/
arch/x86/xen/setup.c
@@
-918,7
+918,7
@@
void xen_enable_sysenter(void)
if (!boot_cpu_has(sysenter_feature))
return;
if (!boot_cpu_has(sysenter_feature))
return;
- ret = register_callback(CALLBACKTYPE_sysenter, xen_
sysenter_targe
t);
+ ret = register_callback(CALLBACKTYPE_sysenter, xen_
entry_SYSENTER_compa
t);
if(ret != 0)
setup_clear_cpu_cap(sysenter_feature);
}
if(ret != 0)
setup_clear_cpu_cap(sysenter_feature);
}
@@
-927,7
+927,7
@@
void xen_enable_syscall(void)
{
int ret;
{
int ret;
- ret = register_callback(CALLBACKTYPE_syscall, xen_
syscall_target
);
+ ret = register_callback(CALLBACKTYPE_syscall, xen_
entry_SYSCALL_64
);
if (ret != 0) {
printk(KERN_ERR "Failed to set syscall callback: %d\n", ret);
/* Pretty fatal; 64-bit userspace has no other
if (ret != 0) {
printk(KERN_ERR "Failed to set syscall callback: %d\n", ret);
/* Pretty fatal; 64-bit userspace has no other
@@
-936,7
+936,7
@@
void xen_enable_syscall(void)
if (boot_cpu_has(X86_FEATURE_SYSCALL32)) {
ret = register_callback(CALLBACKTYPE_syscall32,
if (boot_cpu_has(X86_FEATURE_SYSCALL32)) {
ret = register_callback(CALLBACKTYPE_syscall32,
- xen_
syscall32_targe
t);
+ xen_
entry_SYSCALL_compa
t);
if (ret != 0)
setup_clear_cpu_cap(X86_FEATURE_SYSCALL32);
}
if (ret != 0)
setup_clear_cpu_cap(X86_FEATURE_SYSCALL32);
}