[Xen-changelog] [linux-2.6.18-xen] linux/x86: Remove more dead code

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1196955985 0
# Node ID 2151287a5eb9d8133f7ae9781d7d529e9c0f897d
# Parent  53d5db770cd302c31f24a343530311278c7412ea
linux/x86: Remove more dead code
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 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 -r 53d5db770cd3 -r 2151287a5eb9 arch/i386/kernel/entry-xen.S
--- a/arch/i386/kernel/entry-xen.S      Thu Dec 06 15:46:01 2007 +0000
+++ b/arch/i386/kernel/entry-xen.S      Thu Dec 06 15:46:25 2007 +0000
@@ -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 -r 53d5db770cd3 -r 2151287a5eb9 arch/x86_64/ia32/ia32entry-xen.S
--- a/arch/x86_64/ia32/ia32entry-xen.S  Thu Dec 06 15:46:01 2007 +0000
+++ b/arch/x86_64/ia32/ia32entry-xen.S  Thu Dec 06 15:46:25 2007 +0000
@@ -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 -r 53d5db770cd3 -r 2151287a5eb9 arch/x86_64/kernel/entry-xen.S
--- a/arch/x86_64/kernel/entry-xen.S    Thu Dec 06 15:46:01 2007 +0000
+++ b/arch/x86_64/kernel/entry-xen.S    Thu Dec 06 15:46:25 2007 +0000
@@ -49,8 +49,6 @@
 #include <asm/errno.h>
 #include <xen/interface/arch-x86_64.h>
 #include <xen/interface/features.h>
-
-#include "irq_vectors.h"
 
 #include "xen_entry.S"
        

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog