diff --git a/sys/arch/sparc64/include/pmap.h b/sys/arch/sparc64/include/pmap.h
index 6c591e63d213..c31dc0db18c0 100644
--- a/sys/arch/sparc64/include/pmap.h
+++ b/sys/arch/sparc64/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.41 2008/12/09 20:45:45 pooka Exp $	*/
+/*	$NetBSD: pmap.h,v 1.42 2008/12/10 04:23:11 mrg Exp $	*/
 
 /*-
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -168,6 +168,8 @@ struct prom_map {
    then there is an aliasing in the d$ */
 #define VA_ALIAS_MASK   (1 << 13)
 
+typedef	struct pmap *pmap_t;
+
 #ifdef	_KERNEL
 #ifdef PMAP_COUNT_DEBUG
 /* diagnostic versions if PMAP_COUNT_DEBUG option is used */
@@ -180,6 +182,8 @@ int pmap_count_wired(struct pmap *);
 #define	pmap_wired_count(pm)		((pm)->pm_stats.wired_count)
 #endif
 
+extern struct pmap kernel_pmap_store;
+#define	pmap_kernel()			(&kernel_pmap_store)
 #define	pmap_phys_address(x)		(x)
 
 void pmap_activate_pmap(struct pmap *);
diff --git a/sys/arch/sparc64/sparc64/pmap.c b/sys/arch/sparc64/sparc64/pmap.c
index 6ac798387b22..9b385425252f 100644
--- a/sys/arch/sparc64/sparc64/pmap.c
+++ b/sys/arch/sparc64/sparc64/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.228 2008/12/09 21:01:02 martin Exp $	*/
+/*	$NetBSD: pmap.c,v 1.229 2008/12/10 04:23:11 mrg Exp $	*/
 /*
  *
  * Copyright (C) 1996-1999 Eduardo Horvath.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.228 2008/12/09 21:01:02 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.229 2008/12/10 04:23:11 mrg Exp $");
 
 #undef	NO_VCACHE /* Don't forget the locked TLB in dostart */
 #define	HWREF
@@ -143,8 +143,7 @@ int tsbsize;		/* tsbents = 512 * 2^^tsbsize */
 #define TSBENTS (512<<tsbsize)
 #define	TSBSIZE	(TSBENTS * 16)
 
-static struct pmap kernel_pmap_;
-struct pmap *kernel_pmap_ptr = &kernel_pmap_;
+struct pmap kernel_pmap_store;
 
 static int ctx_alloc(struct pmap *);
 static bool pmap_is_referenced_locked(struct vm_page *);
@@ -3526,7 +3525,7 @@ pmap_testout()
 	vaddr_t va;
 	volatile int *loc;
 	int val = 0;
-	paddr_t pa;
+	paddr_t pa = 0;	/* XXX gcc */
 	struct vm_page *pg;
 	int ref, mod;