From owner-svn-src-head@FreeBSD.ORG  Sat Jan 15 19:16:06 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 29DB5106564A;
	Sat, 15 Jan 2011 19:16:06 +0000 (UTC)
	(envelope-from andreast@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 18FB38FC08;
	Sat, 15 Jan 2011 19:16:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0FJG5xY034421;
	Sat, 15 Jan 2011 19:16:05 GMT
	(envelope-from andreast@svn.freebsd.org)
Received: (from andreast@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0FJG5b5034419;
	Sat, 15 Jan 2011 19:16:05 GMT
	(envelope-from andreast@svn.freebsd.org)
Message-Id: <201101151916.p0FJG5b5034419@svn.freebsd.org>
From: Andreas Tobler <andreast@FreeBSD.org>
Date: Sat, 15 Jan 2011 19:16:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217451 - head/sys/powerpc/aim
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Jan 2011 19:16:06 -0000

Author: andreast
Date: Sat Jan 15 19:16:05 2011
New Revision: 217451
URL: http://svn.freebsd.org/changeset/base/217451

Log:
  Remove unused variables. Spotted by a cppcheck
  (devel/cppcheck, http://sourceforge.net/projects/cppcheck) run.
  
  Approved by: nwhitehorn (mentor)

Modified:
  head/sys/powerpc/aim/slb.c

Modified: head/sys/powerpc/aim/slb.c
==============================================================================
--- head/sys/powerpc/aim/slb.c	Sat Jan 15 19:05:06 2011	(r217450)
+++ head/sys/powerpc/aim/slb.c	Sat Jan 15 19:16:05 2011	(r217451)
@@ -200,9 +200,7 @@ make_intermediate(uint64_t esid, struct 
 uint64_t
 kernel_va_to_slbv(vm_offset_t va)
 {
-	uint64_t esid, slbv;
-
-	esid = (uintptr_t)va >> ADDR_SR_SHFT;
+	uint64_t slbv;
 
 	/* Set kernel VSID to deterministic value */
 	slbv = (KERNEL_VSID((uintptr_t)va >> ADDR_SR_SHFT)) << SLBV_VSID_SHIFT;
@@ -485,18 +483,11 @@ slb_uma_real_alloc(uma_zone_t zone, int 
 	static vm_offset_t realmax = 0;
 	void *va;
 	vm_page_t m;
-	int pflags;
 
 	if (realmax == 0)
 		realmax = platform_real_maxaddr();
 
 	*flags = UMA_SLAB_PRIV;
-	if ((wait & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT)
-		pflags = VM_ALLOC_INTERRUPT | VM_ALLOC_WIRED;
-	else    
-		pflags = VM_ALLOC_SYSTEM | VM_ALLOC_WIRED;
-	if (wait & M_ZERO)
-		pflags |= VM_ALLOC_ZERO;
 
 	for (;;) {
 		m = vm_phys_alloc_contig(1, 0, realmax, PAGE_SIZE,