From: "Jan Beulich" Subject: [PATCH] linux/x86-64: slightly simplify smp-xen.c Date: Thu, 13 Mar 2008 16:24:28 +0000 Message-ID: <47D9634C.76E4.0078.0@novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-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 Two Xen conditionals can be folded into one, as the code between the two is also not used on Xen. As usual, written and tested on 2.6.25-rc5 and made apply to the 2.6.18 tree without further testing. Signed-off-by: Jan Beulich Index: head-2008-03-11/arch/x86_64/kernel/smp-xen.c =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-2008-03-11.orig/arch/x86_64/kernel/smp-xen.c 2008-03-12 = 17:16:04.000000000 +0100 +++ head-2008-03-11/arch/x86_64/kernel/smp-xen.c 2008-03-11 = 14:46:33.000000000 +0100 @@ -69,7 +69,6 @@ to a full cache line because other CPUs can access it and we don't want false sharing in the per cpu data segment. */ static DEFINE_PER_CPU(union smp_flush_state, flush_state); -#endif =20 /* * We cannot call mmdrop() because we are in interrupt context,=20 @@ -83,7 +83,6 @@ load_cr3(swapper_pg_dir); } =20 -#ifndef CONFIG_XEN /* * * The flush IPI assumes that a thread switch happens in this order: