From f3d4a1a0b8856060f29e73c4330e34a2e38d7949 Mon Sep 17 00:00:00 2001
From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 6 Dec 2007 15:46:25 +0000
Subject: [PATCH] linux/x86: Remove more dead code Signed-off-by: Jan Beulich
 <jbeulich@novell.com>

---
 arch/i386/kernel/entry-xen.S     |  1 -
 arch/x86_64/ia32/ia32entry-xen.S | 15 ---------------
 arch/x86_64/kernel/entry-xen.S   |  2 --
 3 files changed, 18 deletions(-)

diff --git a/arch/i386/kernel/entry-xen.S b/arch/i386/kernel/entry-xen.S
index 4b7a5afc..c2e39023 100644
--- a/arch/i386/kernel/entry-xen.S
+++ b/arch/i386/kernel/entry-xen.S
@@ -1233,7 +1233,6 @@ ENTRY(fixup_4gb_segment)
 	CFI_ENDPROC
 
 .section .rodata,"a"
-.align 4
 #include "syscall_table.S"
 
 syscall_table_size=(.-sys_call_table)
diff --git a/arch/x86_64/ia32/ia32entry-xen.S b/arch/x86_64/ia32/ia32entry-xen.S
index fe24e9b7..23f2bd11 100644
--- a/arch/x86_64/ia32/ia32entry-xen.S
+++ b/arch/x86_64/ia32/ia32entry-xen.S
@@ -16,8 +16,6 @@
 #include <asm/irqflags.h>
 #include <linux/linkage.h>
 
-#define __XEN_X86_64 1
-
 #define IA32_NR_syscalls ((ia32_syscall_end - ia32_sys_call_table)/8)
 
 	.macro IA32_ARG_FIXUP noebp=0
@@ -52,20 +50,7 @@
 	movl \offset+72(%rsp),%eax
 	.endm
 
-#if defined (__XEN_X86_64)
 #include "../kernel/xen_entry.S"
-		
-#define	__swapgs
-#define __cli
-#define __sti	
-#else
-/*
- * Use the native instructions
- */	
-#define	__swapgs	swapgs
-#define __cli		cli
-#define __sti		sti	
-#endif			
 
 	.macro CFI_STARTPROC32 simple
 	CFI_STARTPROC	\simple
diff --git a/arch/x86_64/kernel/entry-xen.S b/arch/x86_64/kernel/entry-xen.S
index d24e5459..f840cda2 100644
--- a/arch/x86_64/kernel/entry-xen.S
+++ b/arch/x86_64/kernel/entry-xen.S
@@ -50,8 +50,6 @@
 #include <xen/interface/arch-x86_64.h>
 #include <xen/interface/features.h>
 
-#include "irq_vectors.h"
-
 #include "xen_entry.S"
 	
 	.code64
-- 
2.39.5