Module Name: src
Committed By: skrll
Date: Thu Apr 30 15:34:25 UTC 2009
Modified Files:
src/sys/arch/hp700/include: cpu.h
src/sys/arch/hppa/hppa: fpu.c kobj_machdep.c process_machdep.c
src/sys/arch/hppa/include: pmap.h
Log Message:
Move HPPA_SID_KERNEL into pmap.h and deal with the move.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/hp700/include/cpu.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hppa/hppa/fpu.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hppa/hppa/kobj_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hppa/hppa/process_machdep.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hppa/include/pmap.h
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/hp700/include/cpu.h
diff -u src/sys/arch/hp700/include/cpu.h:1.29 src/sys/arch/hp700/include/cpu.h:1.30
--- src/sys/arch/hp700/include/cpu.h:1.29 Thu Apr 30 07:01:27 2009
+++ src/sys/arch/hp700/include/cpu.h Thu Apr 30 15:34:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.29 2009/04/30 07:01:27 skrll Exp $ */
+/* $NetBSD: cpu.h,v 1.30 2009/04/30 15:34:25 skrll Exp $ */
/* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */
@@ -235,11 +235,6 @@
void cpu_boot_secondary_processors(void);
#endif
-/*
- * DON'T CHANGE THIS - this is assumed in lots of places.
- */
-#define HPPA_SID_KERNEL 0
-
static __inline struct lwp *
hppa_curlwp(void)
{
Index: src/sys/arch/hppa/hppa/fpu.c
diff -u src/sys/arch/hppa/hppa/fpu.c:1.16 src/sys/arch/hppa/hppa/fpu.c:1.17
--- src/sys/arch/hppa/hppa/fpu.c:1.16 Thu Aug 28 08:45:26 2008
+++ src/sys/arch/hppa/hppa/fpu.c Thu Apr 30 15:34:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.16 2008/08/28 08:45:26 skrll Exp $ */
+/* $NetBSD: fpu.c,v 1.17 2009/04/30 15:34:24 skrll Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.16 2008/08/28 08:45:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.17 2009/04/30 15:34:24 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,10 +42,12 @@
#include <sys/signalvar.h>
#include <sys/user.h>
-#include <machine/cpu.h>
+#include <uvm/uvm_extern.h>
+
#include <machine/cpufunc.h>
#include <machine/frame.h>
#include <machine/reg.h>
+#include <machine/pmap.h>
#include <hppa/hppa/machdep.h>
Index: src/sys/arch/hppa/hppa/kobj_machdep.c
diff -u src/sys/arch/hppa/hppa/kobj_machdep.c:1.4 src/sys/arch/hppa/hppa/kobj_machdep.c:1.5
--- src/sys/arch/hppa/hppa/kobj_machdep.c:1.4 Mon Apr 28 20:23:23 2008
+++ src/sys/arch/hppa/hppa/kobj_machdep.c Thu Apr 30 15:34:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kobj_machdep.c,v 1.4 2008/04/28 20:23:23 martin Exp $ */
+/* $NetBSD: kobj_machdep.c,v 1.5 2009/04/30 15:34:24 skrll Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.4 2008/04/28 20:23:23 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.5 2009/04/30 15:34:24 skrll Exp $");
#define ELFSIZE ARCH_ELFSIZE
@@ -62,7 +62,10 @@
#include <sys/exec.h>
#include <sys/exec_elf.h>
+#include <uvm/uvm_extern.h>
+
#include <machine/cpufunc.h>
+#include <machine/pmap.h>
static inline unsigned int
RND(unsigned int x)
Index: src/sys/arch/hppa/hppa/process_machdep.c
diff -u src/sys/arch/hppa/hppa/process_machdep.c:1.10 src/sys/arch/hppa/hppa/process_machdep.c:1.11
--- src/sys/arch/hppa/hppa/process_machdep.c:1.10 Wed Mar 18 17:06:44 2009
+++ src/sys/arch/hppa/hppa/process_machdep.c Thu Apr 30 15:34:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: process_machdep.c,v 1.10 2009/03/18 17:06:44 cegger Exp $ */
+/* $NetBSD: process_machdep.c,v 1.11 2009/04/30 15:34:24 skrll Exp $ */
/* $OpenBSD: process_machdep.c,v 1.3 1999/06/18 05:19:52 mickey Exp $ */
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.10 2009/03/18 17:06:44 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.11 2009/04/30 15:34:24 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,7 +41,10 @@
#include <sys/ptrace.h>
#include <sys/user.h>
+#include <uvm/uvm_extern.h>
+
#include <machine/cpufunc.h>
+#include <machine/pmap.h>
#include <machine/frame.h>
#include <hppa/hppa/machdep.h>
Index: src/sys/arch/hppa/include/pmap.h
diff -u src/sys/arch/hppa/include/pmap.h:1.18 src/sys/arch/hppa/include/pmap.h:1.19
--- src/sys/arch/hppa/include/pmap.h:1.18 Thu Apr 30 07:01:27 2009
+++ src/sys/arch/hppa/include/pmap.h Thu Apr 30 15:34:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.18 2009/04/30 07:01:27 skrll Exp $ */
+/* $NetBSD: pmap.h,v 1.19 2009/04/30 15:34:24 skrll Exp $ */
/* $OpenBSD: pmap.h,v 1.35 2007/12/14 18:32:23 deraadt Exp $ */
@@ -90,9 +90,11 @@
#define HPPA_MAX_PID 0xfffa
#define HPPA_SID_MAX 0x7ffd
-#if 0
+
+/*
+ * DON'T CHANGE THIS - this is assumed in lots of places.
+ */
#define HPPA_SID_KERNEL 0
-#endif
#define HPPA_PID_KERNEL 2
struct pv_entry { /* locked by its list's pvh_lock */
