[Xen-devel] [PATCH] linux/x86: Remove more dead code

["Jan Beulich" <jbeulich@xxxxxxxxxx>]

As usual, written and tested against 2.6.24-rc3 and made apply against
2.6.18 without further testing.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

Index: head-2007-11-30/arch/i386/kernel/entry-xen.S
===================================================================
--- head-2007-11-30.orig/arch/i386/kernel/entry-xen.S   2007-12-04 
08:52:56.000000000 +0100
+++ head-2007-11-30/arch/i386/kernel/entry-xen.S        2007-12-04 
14:40:49.000000000 +0100
@@ -1233,7 +1233,6 @@
        CFI_ENDPROC
 
 .section .rodata,"a"
-.align 4
 #include "syscall_table.S"
 
 syscall_table_size=(.-sys_call_table)
Index: head-2007-11-30/arch/x86_64/ia32/ia32entry-xen.S
===================================================================
--- head-2007-11-30.orig/arch/x86_64/ia32/ia32entry-xen.S       2007-12-06 
09:55:21.000000000 +0100
+++ head-2007-11-30/arch/x86_64/ia32/ia32entry-xen.S    2007-12-06 
10:01:21.000000000 +0100
@@ -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
Index: head-2007-11-30/arch/x86_64/kernel/entry-xen.S
===================================================================
--- head-2007-11-30.orig/arch/x86_64/kernel/entry-xen.S 2007-12-06 
09:19:05.000000000 +0100
+++ head-2007-11-30/arch/x86_64/kernel/entry-xen.S      2007-12-06 
09:23:16.000000000 +0100
@@ -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




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