5 files changed, 10 insertions, 7 deletions

diff --git a/sys/powerpc/include/cpu.h b/sys/powerpc/include/cpu.h
index 37ca02bca530..a7c70c174366 100644
--- a/sys/powerpc/include/cpu.h
+++ b/sys/powerpc/include/cpu.h
@@ -92,7 +92,7 @@ get_cyclecount(void)
 	return (time);
 }
 
-#define	cpu_getstack(p)		((p)->p_frame->fixreg[1])
+#define	cpu_getstack(td)	((td)->td_frame->fixreg[1])
 
 void	savectx __P((struct pcb *));
 
diff --git a/sys/powerpc/include/frame.h b/sys/powerpc/include/frame.h
index 927c5748a06b..3865de440dbe 100644
--- a/sys/powerpc/include/frame.h
+++ b/sys/powerpc/include/frame.h
@@ -63,8 +63,7 @@ struct trapframe {
  * This is to ensure alignment of the stackpointer
  */
 #define	FRAMELEN	roundup(sizeof(struct trapframe) + 8, 16)
-#define	trapframe(p)	((struct trapframe *)((char *)(p)->p_addr \
-			    + USPACE - FRAMELEN + 8))
+#define	trapframe(td)	((td)->td_frame)
 
 struct switchframe {
 	register_t sp;
diff --git a/sys/powerpc/include/param.h b/sys/powerpc/include/param.h
index 3ebcd9454550..3ac5646b583f 100644
--- a/sys/powerpc/include/param.h
+++ b/sys/powerpc/include/param.h
@@ -112,8 +112,11 @@
 #define	MAXPHYS		(128 * 1024)	/* max raw I/O transfer size */
 #define	MAXDUMPPGS	(DFLTPHYS/PAGE_SIZE)
 
-#define	UPAGES		2		/* pages of u-area */
-#define	USPACE		(UPAGES * PAGE_SIZE)	/* total size of u-area */
+#ifndef KSTACK_UPAGES
+#define	KSTACK_PAGES	2		/* includes pcb */
+#endif
+#define	USPACE		(KSTACK_PAGES * PAGE_SIZE)	/* total size of pcb */
+#define	UAREA_PAGES	1		/* holds struct user WITHOUT PCB */
 
 /*
  * Constants related to network buffer management.
diff --git a/sys/powerpc/include/pmap.h b/sys/powerpc/include/pmap.h
index 83adf0d81730..26c0d6a5f87b 100644
--- a/sys/powerpc/include/pmap.h
+++ b/sys/powerpc/include/pmap.h
@@ -95,7 +95,8 @@ extern vm_offset_t	phys_avail[];
 extern vm_offset_t	virtual_avail;
 extern vm_offset_t	virtual_end;
 
-void pmap_bootstrap __P((u_int kernelstart, u_int kernelend));
+void pmap_bootstrap __P((void));
+void pmap_setavailmem __P((u_int kernelstart, u_int kernelend));
 vm_offset_t pmap_steal_memory __P((vm_size_t));
 boolean_t ptemodify __P((struct vm_page *, u_int, u_int));
 int ptebits __P((struct vm_page *, int));
diff --git a/sys/powerpc/include/reg.h b/sys/powerpc/include/reg.h
index dfe9d96919a9..a05e566ca67f 100644
--- a/sys/powerpc/include/reg.h
+++ b/sys/powerpc/include/reg.h
@@ -22,6 +22,6 @@ struct dbreg {
 	unsigned long	junk;
 };
 
-void	setregs(struct proc *, u_long, u_long, u_long);
+void	setregs(struct thread *, u_long, u_long, u_long);
 
 #endif /* _POWERPC_REG_H_ */