CVS commit: src/sys/arch/powerpc/ibm4xx

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Mon Jun 20 08:13:17 UTC 2011

Modified Files:
        src/sys/arch/powerpc/ibm4xx: pmap.c

Log Message:
Get rid of extern inline.
Cleanup includes.
Rearrange pv_entry so that are pointers are first.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/powerpc/ibm4xx/pmap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/powerpc/ibm4xx/pmap.c
diff -u src/sys/arch/powerpc/ibm4xx/pmap.c:1.67 src/sys/arch/powerpc/ibm4xx/pmap.c:1.68
--- src/sys/arch/powerpc/ibm4xx/pmap.c:1.67	Sat Jun 18 06:41:41 2011
+++ src/sys/arch/powerpc/ibm4xx/pmap.c	Mon Jun 20 08:13:17 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.67 2011/06/18 06:41:41 matt Exp $	*/
+/*	$NetBSD: pmap.c,v 1.68 2011/06/20 08:13:17 matt Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -67,23 +67,24 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.67 2011/06/18 06:41:41 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.68 2011/06/20 08:13:17 matt Exp $");
 
 #include <sys/param.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
 #include <sys/malloc.h>
+#include <sys/pool.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/systm.h>
-#include <sys/pool.h>
-#include <sys/device.h>
-#include <sys/cpu.h>
 
 #include <uvm/uvm.h>
 
-#include <machine/pcb.h>
 #include <machine/powerpc.h>
 #include <machine/tlb.h>
 
+#include <powerpc/pcb.h>
+
 #include <powerpc/spr.h>
 #include <powerpc/ibm4xx/spr.h>
 
@@ -158,8 +159,8 @@
 
 struct pv_entry {
 	struct pv_entry *pv_next;	/* Linked list of mappings */
-	vaddr_t pv_va;			/* virtual address of mapping */
 	struct pmap *pv_pm;
+	vaddr_t pv_va;			/* virtual address of mapping */
 };
 
 /* Each index corresponds to TLB_SIZE_* value. */
@@ -181,7 +182,7 @@
 
 static int ctx_flush(int);
 
-inline struct pv_entry *pa_to_pv(paddr_t);
+struct pv_entry *pa_to_pv(paddr_t);
 static inline char *pa_to_attr(paddr_t);
 
 static inline volatile u_int *pte_find(struct pmap *, vaddr_t);
@@ -193,7 +194,7 @@
 static int ppc4xx_tlb_size_mask(size_t, int *, int *);
 
 
-inline struct pv_entry *
+struct pv_entry *
 pa_to_pv(paddr_t pa)
 {
 	int bank, pg;