From: Christian Limpach <Christian.Limpach@xensource.com>
Date: Thu, 18 Jan 2007 15:33:59 +0000 (+0000)
Subject: [linux] remove gratuitous differences with plain linux.
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9cc42dd899d1482d65bcacb1dbe361c7312c1ef8;p=xen.git

[linux] remove gratuitous differences with plain linux.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
---

diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/sysenter.c b/linux-2.6-xen-sparse/arch/i386/kernel/sysenter.c
index f300bd159e..1631c182c9 100644
--- a/linux-2.6-xen-sparse/arch/i386/kernel/sysenter.c
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/sysenter.c
@@ -56,7 +56,9 @@ static void *syscall_page;
 
 int __init sysenter_setup(void)
 {
-	syscall_page = (void *)get_zeroed_page(GFP_ATOMIC);
+	void *page = (void *)get_zeroed_page(GFP_ATOMIC);
+
+	syscall_page = page;
 
 #ifdef CONFIG_XEN
 	if (boot_cpu_has(X86_FEATURE_SEP)) {
@@ -70,16 +72,16 @@ int __init sysenter_setup(void)
 	}
 #endif
 
-	if (boot_cpu_has(X86_FEATURE_SEP)) {
-		memcpy(syscall_page,
-		       &vsyscall_sysenter_start,
-		       &vsyscall_sysenter_end - &vsyscall_sysenter_start);
+	if (!boot_cpu_has(X86_FEATURE_SEP)) {
+		memcpy(page,
+		       &vsyscall_int80_start,
+		       &vsyscall_int80_end - &vsyscall_int80_start);
 		return 0;
 	}
 
-	memcpy(syscall_page,
-	       &vsyscall_int80_start,
-	       &vsyscall_int80_end - &vsyscall_int80_start);
+	memcpy(page,
+	       &vsyscall_sysenter_start,
+	       &vsyscall_sysenter_end - &vsyscall_sysenter_start);
 
 	return 0;
 }