From mboxrd@z Thu Jan  1 00:00:00 1970
From: Olaf Hering <olaf@aepfle.de>
Subject: [PATCH 43 of 45] gcc-4.6 compile fix:
	xen/arch/x86/mm/shadow/multi.c
Date: Thu, 19 May 2011 21:06:02 +0200
Message-ID: <f64bb486b83ccefb1e13.1305831962@probook.site>
References: <patchbomb.1305831919@probook.site>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <patchbomb.1305831919@probook.site>
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: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

# HG changeset patch
# User Olaf Hering <olaf@aepfle.de>
# Date 1305824432 -7200
# Node ID f64bb486b83ccefb1e1352db56f898b8272ad56d
# Parent  2e6175d0996618f80fd26106257d6cb8b61b046d
gcc-4.6 compile fix: xen/arch/x86/mm/shadow/multi.c

multi.c: In function 'set_shadow_status':
multi.c:127:9: error: variable 'res' set but not used [-Werror=unused-but-set-variable]
multi.c: In function 'sh_rm_write_access_from_sl1p__guest_2':
multi.c:4434:9: error: variable 'r' set but not used [-Werror=unused-but-set-variable]

Signed-off-by: Olaf Hering <olaf@aepfle.de>

diff -r 2e6175d09966 -r f64bb486b83c xen/arch/x86/mm/shadow/multi.c
--- a/xen/arch/x86/mm/shadow/multi.c	Thu May 19 19:00:31 2011 +0200
+++ b/xen/arch/x86/mm/shadow/multi.c	Thu May 19 19:00:32 2011 +0200
@@ -124,7 +124,7 @@ set_shadow_status(struct vcpu *v, mfn_t 
 /* Put a shadow into the hash table */
 {
     struct domain *d = v->domain;
-    int res;
+    int res __attribute__((unused));
 
     SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx, type=%08x, smfn=%05lx\n",
                    d->domain_id, v->vcpu_id, mfn_x(gmfn),
@@ -4431,7 +4431,7 @@ sh_update_cr3(struct vcpu *v, int do_loc
 int sh_rm_write_access_from_sl1p(struct vcpu *v, mfn_t gmfn, 
                                  mfn_t smfn, unsigned long off)
 {
-    int r;
+    int r __attribute__((unused));
     shadow_l1e_t *sl1p, sl1e;
     struct page_info *sp;