From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Jan Beulich" <JBeulich@novell.com>
Subject: Re: [PATCH 44 of 45] gcc-4.6 compile fix:
	xen/arch/x86/traps.c
Date: Fri, 20 May 2011 09:12:03 +0100
Message-ID: <4DD63E730200007800042756@vpn.id2.novell.com>
References: <patchbomb.1305831919@probook.site>
	<9c4ff80169706c948442.1305831963@probook.site>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <9c4ff80169706c948442.1305831963@probook.site>
Content-Disposition: inline
List-Unsubscribe: <http://lists.xensource.com/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/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: Olaf Hering <olaf@aepfle.de>
Cc: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

>>> On 19.05.11 at 21:06, Olaf Hering <olaf@aepfle.de> wrote:
> # HG changeset patch
> # User Olaf Hering <olaf@aepfle.de>
> # Date 1305824433 -7200
> # Node ID 9c4ff80169706c948442799f82c15cc65ad403c8
> # Parent  f64bb486b83ccefb1e1352db56f898b8272ad56d
> gcc-4.6 compile fix: xen/arch/x86/traps.c
>=20
> traps.c: In function 'emulate_privileged_op':
> traps.c:1742:48: error: variable 'lm_ovr' set but not used=20
> [-Werror=3Dunused-but-set-variable]

Instead of these many #ifdef-s, wouldn't just adding (void)lm_ovr
somewhere work too?

Jan

> Signed-off-by: Olaf Hering <olaf@aepfle.de>
>=20
> diff -r f64bb486b83c -r 9c4ff8016970 xen/arch/x86/traps.c
> --- a/xen/arch/x86/traps.c	Thu May 19 19:00:32 2011 +0200
> +++ b/xen/arch/x86/traps.c	Thu May 19 19:00:33 2011 +0200
> @@ -1739,7 +1739,9 @@ static int emulate_privileged_op(struct=20
>      struct vcpu *v =3D current;
>      unsigned long *reg, eip =3D regs->eip;
>      u8 opcode, modrm_reg =3D 0, modrm_rm =3D 0, rep_prefix =3D 0, lock =
=3D 0, rex =3D 0;
> +#ifdef CONFIG_X86_64
>      enum { lm_seg_none, lm_seg_fs, lm_seg_gs } lm_ovr =3D lm_seg_none;
> +#endif
>      int rc;
>      unsigned int port, i, data_sel, ar, data, bpmatch =3D 0;
>      unsigned int op_bytes, op_default, ad_bytes, ad_default, opsize_pref=
ix=3D 0;
> @@ -1795,11 +1797,15 @@ static int emulate_privileged_op(struct=20
>              continue;
>          case 0x64: /* FS override */
>              data_sel =3D read_sreg(regs, fs);
> +#ifdef CONFIG_X86_64
>              lm_ovr =3D lm_seg_fs;
> +#endif
>              continue;
>          case 0x65: /* GS override */
>              data_sel =3D read_sreg(regs, gs);
> +#ifdef CONFIG_X86_64
>              lm_ovr =3D lm_seg_gs;
> +#endif
>              continue;
>          case 0x36: /* SS override */
>              data_sel =3D regs->ss;
> @@ -1846,7 +1852,9 @@ static int emulate_privileged_op(struct=20
>          if ( !(opcode & 2) )
>          {
>              data_sel =3D read_sreg(regs, es);
> +#ifdef CONFIG_X86_64
>              lm_ovr =3D lm_seg_none;
> +#endif
>          }
> =20
>          if ( !(ar & _SEGMENT_L) )
>=20
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xensource.com=20
> http://lists.xensource.com/xen-devel=20