From owner-svn-src-all@FreeBSD.ORG  Thu May  7 05:42:13 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C91CF106566B;
	Thu,  7 May 2009 05:42:13 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B7A6D8FC2A;
	Thu,  7 May 2009 05:42:13 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n475gDft041777;
	Thu, 7 May 2009 05:42:13 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n475gDxe041775;
	Thu, 7 May 2009 05:42:13 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <200905070542.n475gDxe041775@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Thu, 7 May 2009 05:42:13 +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: r191873 - in head/sys/arm: arm include
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 May 2009 05:42:14 -0000

Author: alc
Date: Thu May  7 05:42:13 2009
New Revision: 191873
URL: http://svn.freebsd.org/changeset/base/191873

Log:
  Define the kernel pmap in the same way on arm as on every other
  architecture.
  
  Eliminate an unused definition.
  
  Tested by:	cognet

Modified:
  head/sys/arm/arm/pmap.c
  head/sys/arm/include/pmap.h

Modified: head/sys/arm/arm/pmap.c
==============================================================================
--- head/sys/arm/arm/pmap.c	Thu May  7 03:39:23 2009	(r191872)
+++ head/sys/arm/arm/pmap.c	Thu May  7 05:42:13 2009	(r191873)
@@ -224,7 +224,6 @@ extern void *end;
 vm_offset_t kernel_vm_end = 0;
 
 struct pmap kernel_pmap_store;
-pmap_t kernel_pmap;
 
 static pt_entry_t *csrc_pte, *cdst_pte;
 static vm_offset_t csrcp, cdstp;
@@ -2337,7 +2336,6 @@ pmap_bootstrap(vm_offset_t firstaddr, vm
 	    firstaddr, loadaddr));
 	
 	virtual_avail = firstaddr;
-	kernel_pmap = &kernel_pmap_store;
 	kernel_pmap->pm_l1 = l1;
 	kernel_l1pa = l1pt->pv_pa;
 	

Modified: head/sys/arm/include/pmap.h
==============================================================================
--- head/sys/arm/include/pmap.h	Thu May  7 03:39:23 2009	(r191872)
+++ head/sys/arm/include/pmap.h	Thu May  7 05:42:13 2009	(r191873)
@@ -138,7 +138,8 @@ struct	pmap {
 typedef struct pmap *pmap_t;
 
 #ifdef _KERNEL
-extern pmap_t	kernel_pmap;
+extern struct pmap	kernel_pmap_store;
+#define kernel_pmap	(&kernel_pmap_store)
 #define pmap_kernel() kernel_pmap
 
 #define	PMAP_ASSERT_LOCKED(pmap) \
@@ -166,8 +167,6 @@ typedef struct pv_entry {
 	int		pv_flags;	/* flags (wired, etc...) */
 } *pv_entry_t;
 
-#define PV_ENTRY_NULL   ((pv_entry_t) 0)
-
 #ifdef _KERNEL
 
 boolean_t pmap_get_pde_pte(pmap_t, vm_offset_t, pd_entry_t **, pt_entry_t **);