linux/x86: Remove more dead code

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/arch/i386/kernel/entry-xen.S b/arch/i386/kernel/entry-xen.S
index 4b7a5afc4dd281bb33dc5e724cc0cf399752dd4e..c2e390235aa4b45437643c484c2a24c3e81dc819 100644 (file)
--- 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 fe24e9b7f010cd278fc66d023a67c19e58074e3e..23f2bd11126271a279cf58a95356f2fc17d46453 100644 (file)
--- 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 d24e545935ecd0cd0b46863dacc47ccb85b104c3..f840cda2b400be3203a0fb28cf7bc9a177d702f6 100644 (file)
--- 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