From: "Jan Beulich" <jbeulich@novell.com>
Subject: [PATCH] linux/x86: Remove more dead code
Date: Thu, 06 Dec 2007 15:41:17 +0000
Message-ID: <4758262D.76E4.0078.0@novell.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

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@novell.com>

Index: head-2007-11-30/arch/i386/kernel/entry-xen.S
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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
=20
 .section .rodata,"a"
-.align 4
 #include "syscall_table.S"
=20
 syscall_table_size=3D(.-sys_call_table)
Index: head-2007-11-30/arch/x86_64/ia32/ia32entry-xen.S
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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>
=20
-#define __XEN_X86_64 1
-
 #define IA32_NR_syscalls ((ia32_syscall_end - ia32_sys_call_table)/8)
=20
 	.macro IA32_ARG_FIXUP noebp=3D0
@@ -52,20 +50,7 @@
 	movl \offset+72(%rsp),%eax
 	.endm
=20
-#if defined (__XEN_X86_64)
 #include "../kernel/xen_entry.S"
-	=09
-#define	__swapgs
-#define __cli
-#define __sti=09
-#else
-/*
- * Use the native instructions
- */=09
-#define	__swapgs	swapgs
-#define __cli		cli
-#define __sti		sti=09
-#endif		=09
=20
 	.macro CFI_STARTPROC32 simple
 	CFI_STARTPROC	\simple
Index: head-2007-11-30/arch/x86_64/kernel/entry-xen.S
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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>
=20
-#include "irq_vectors.h"
-
 #include "xen_entry.S"
 =09
 	.code64