Module Name: src
Committed By: matt
Date: Wed Apr 21 00:36:40 UTC 2010
Modified Files:
src/sys/arch/dreamcast/dev/g2 [matt-nb5-mips64]: g2bus_bus_mem.c
src/sys/arch/dreamcast/include [matt-nb5-mips64]: bus.h
src/sys/arch/hp300/include [matt-nb5-mips64]: cpu.h
src/sys/arch/hppa/hppa [matt-nb5-mips64]: vm_machdep.c
src/sys/arch/powerpc/powerpc [matt-nb5-mips64]: locore_subr.S trap.c
vm_machdep.c
Log Message:
sync to netbsd-5
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.18.1 src/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c
cvs rdiff -u -r1.14 -r1.14.18.1 src/sys/arch/dreamcast/include/bus.h
cvs rdiff -u -r1.59 -r1.59.22.1 src/sys/arch/hp300/include/cpu.h
cvs rdiff -u -r1.33.6.1 -r1.33.6.1.2.1 src/sys/arch/hppa/hppa/vm_machdep.c
cvs rdiff -u -r1.37.20.1 -r1.37.20.1.2.1 \
src/sys/arch/powerpc/powerpc/locore_subr.S
cvs rdiff -u -r1.128 -r1.128.10.1 src/sys/arch/powerpc/powerpc/trap.c
cvs rdiff -u -r1.74.6.1 -r1.74.6.1.2.1 \
src/sys/arch/powerpc/powerpc/vm_machdep.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/dreamcast/dev/g2/g2bus_bus_mem.c
diff -u src/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c:1.14 src/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c:1.14.18.1
--- src/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c:1.14 Mon Apr 28 20:23:16 2008
+++ src/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c Wed Apr 21 00:36:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: g2bus_bus_mem.c,v 1.14 2008/04/28 20:23:16 martin Exp $ */
+/* $NetBSD: g2bus_bus_mem.c,v 1.14.18.1 2010/04/21 00:36:39 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: g2bus_bus_mem.c,v 1.14 2008/04/28 20:23:16 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: g2bus_bus_mem.c,v 1.14.18.1 2010/04/21 00:36:39 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,6 +53,7 @@
int g2bus_bus_mem_map(void *, bus_addr_t, bus_size_t, int,
bus_space_handle_t *);
void g2bus_bus_mem_unmap(void *, bus_space_handle_t, bus_size_t);
+paddr_t g2bus_bus_mem_mmap(void *, bus_addr_t, off_t, int, int);
uint8_t g2bus_bus_mem_read_1(void *, bus_space_handle_t, bus_size_t);
uint16_t g2bus_bus_mem_read_2(void *, bus_space_handle_t, bus_size_t);
@@ -114,6 +115,7 @@
t->dbs_map = g2bus_bus_mem_map;
t->dbs_unmap = g2bus_bus_mem_unmap;
+ t->dbs_mmap = g2bus_bus_mem_mmap;
t->dbs_r_1 = g2bus_bus_mem_read_1;
t->dbs_r_2 = g2bus_bus_mem_read_2;
@@ -153,6 +155,14 @@
/* Nothing to do. */
}
+paddr_t
+g2bus_bus_mem_mmap(void *v, bus_addr_t addr, off_t offset, int prot, int flags)
+{
+
+ /* XXX not implemented */
+ return -1;
+}
+
/*
* G2 bus cycles must not be interrupted by IRQs or G2 DMA.
* The following paired macros will take the necessary precautions.
Index: src/sys/arch/dreamcast/include/bus.h
diff -u src/sys/arch/dreamcast/include/bus.h:1.14 src/sys/arch/dreamcast/include/bus.h:1.14.18.1
--- src/sys/arch/dreamcast/include/bus.h:1.14 Mon Apr 28 20:23:16 2008
+++ src/sys/arch/dreamcast/include/bus.h Wed Apr 21 00:36:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.14 2008/04/28 20:23:16 martin Exp $ */
+/* $NetBSD: bus.h,v 1.14.18.1 2010/04/21 00:36:39 matt Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -121,6 +121,7 @@
bus_size_t);
int (*dbs_subregion)(void *, bus_space_handle_t,
bus_size_t, bus_size_t, bus_space_handle_t *);
+ paddr_t (*dbs_mmap)(void *, bus_addr_t, off_t, int, int);
/* allocation/deallocation */
int (*dbs_alloc)(void *, bus_addr_t, bus_addr_t,
@@ -270,6 +271,8 @@
(*(t)->dbs_unmap)((t)->dbs_cookie, (h), (s))
#define bus_space_subregion(t, h, o, s, hp) \
(*(t)->dbs_subregion)((t)->dbs_cookie, (h), (o), (s), (hp))
+#define bus_space_mmap(t, a, o, p, f) \
+ (*(t)->dbs_mmap)((t)->dbs_cookie, (a), (o), (p), (f))
#endif /* _KERNEL */
Index: src/sys/arch/hp300/include/cpu.h
diff -u src/sys/arch/hp300/include/cpu.h:1.59 src/sys/arch/hp300/include/cpu.h:1.59.22.1
--- src/sys/arch/hp300/include/cpu.h:1.59 Wed Feb 27 18:26:15 2008
+++ src/sys/arch/hp300/include/cpu.h Wed Apr 21 00:36:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.59 2008/02/27 18:26:15 xtraeme Exp $ */
+/* $NetBSD: cpu.h,v 1.59.22.1 2010/04/21 00:36:39 matt Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@@ -159,7 +159,7 @@
* through trap, marking the proc as needing a profiling tick.
*/
#define cpu_need_proftick(l) \
- do { (l)->l_flag |= LP_OWEUPC; aston(); } while (/* CONSTCOND */0)
+ do { (l)->l_pflag |= LP_OWEUPC; aston(); } while (/* CONSTCOND */0)
/*
* Notify the current process (p) that it has a signal pending,
Index: src/sys/arch/hppa/hppa/vm_machdep.c
diff -u src/sys/arch/hppa/hppa/vm_machdep.c:1.33.6.1 src/sys/arch/hppa/hppa/vm_machdep.c:1.33.6.1.2.1
--- src/sys/arch/hppa/hppa/vm_machdep.c:1.33.6.1 Fri Jun 5 18:56:01 2009
+++ src/sys/arch/hppa/hppa/vm_machdep.c Wed Apr 21 00:36:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.33.6.1 2009/06/05 18:56:01 snj Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.33.6.1.2.1 2010/04/21 00:36:39 matt Exp $ */
/* $OpenBSD: vm_machdep.c,v 1.25 2001/09/19 20:50:56 mickey Exp $ */
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.33.6.1 2009/06/05 18:56:01 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.33.6.1.2.1 2010/04/21 00:36:39 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -208,7 +208,7 @@
sp += HPPA_FRAME_SIZE;
*(register_t *)(sp + HPPA_FRAME_PSP) = osp;
- *(register_t *)(sp + HPPA_FRAME_CRP) = (register_t)setfunc_trampoline;
+ *(register_t *)(sp + HPPA_FRAME_CRP) = (register_t)lwp_trampoline;
*HPPA_FRAME_CARG(2, sp) = KERNMODE(func);
*HPPA_FRAME_CARG(3, sp) = (register_t)arg;
@@ -244,7 +244,7 @@
sp += HPPA_FRAME_SIZE;
*(register_t *)(sp + HPPA_FRAME_PSP) = osp;
- *(register_t *)(sp + HPPA_FRAME_CRP) = (register_t)lwp_trampoline;
+ *(register_t *)(sp + HPPA_FRAME_CRP) = (register_t)setfunc_trampoline;
*HPPA_FRAME_CARG(2, sp) = KERNMODE(func);
*HPPA_FRAME_CARG(3, sp) = (register_t)arg;
Index: src/sys/arch/powerpc/powerpc/locore_subr.S
diff -u src/sys/arch/powerpc/powerpc/locore_subr.S:1.37.20.1 src/sys/arch/powerpc/powerpc/locore_subr.S:1.37.20.1.2.1
--- src/sys/arch/powerpc/powerpc/locore_subr.S:1.37.20.1 Tue Jun 9 17:54:06 2009
+++ src/sys/arch/powerpc/powerpc/locore_subr.S Wed Apr 21 00:36:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore_subr.S,v 1.37.20.1 2009/06/09 17:54:06 snj Exp $ */
+/* $NetBSD: locore_subr.S,v 1.37.20.1.2.1 2010/04/21 00:36:39 matt Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
Index: src/sys/arch/powerpc/powerpc/trap.c
diff -u src/sys/arch/powerpc/powerpc/trap.c:1.128 src/sys/arch/powerpc/powerpc/trap.c:1.128.10.1
--- src/sys/arch/powerpc/powerpc/trap.c:1.128 Sat Oct 25 09:10:07 2008
+++ src/sys/arch/powerpc/powerpc/trap.c Wed Apr 21 00:36:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.128 2008/10/25 09:10:07 mrg Exp $ */
+/* $NetBSD: trap.c,v 1.128.10.1 2010/04/21 00:36:39 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.128 2008/10/25 09:10:07 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.128.10.1 2010/04/21 00:36:39 matt Exp $");
#include "opt_altivec.h"
#include "opt_ddb.h"
@@ -342,7 +342,7 @@
ci->ci_astpending = 0; /* we are about to do it */
uvmexp.softs++;
if (l->l_pflag & LP_OWEUPC) {
- l->l_flag &= ~LP_OWEUPC;
+ l->l_pflag &= ~LP_OWEUPC;
ADDUPROF(p);
}
/* Check whether we are being preempted. */
Index: src/sys/arch/powerpc/powerpc/vm_machdep.c
diff -u src/sys/arch/powerpc/powerpc/vm_machdep.c:1.74.6.1 src/sys/arch/powerpc/powerpc/vm_machdep.c:1.74.6.1.2.1
--- src/sys/arch/powerpc/powerpc/vm_machdep.c:1.74.6.1 Tue Jun 9 17:54:06 2009
+++ src/sys/arch/powerpc/powerpc/vm_machdep.c Wed Apr 21 00:36:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.74.6.1 2009/06/09 17:54:06 snj Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.74.6.1.2.1 2010/04/21 00:36:39 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.74.6.1 2009/06/09 17:54:06 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.74.6.1.2.1 2010/04/21 00:36:39 matt Exp $");
#include "opt_altivec.h"
#include "opt_multiprocessor.h"
