PERFORCE change 57013 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sat Jul 10 16:17:12 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=57013
Change 57013 by marcel at marcel_nfs on 2004/07/10 23:16:27
IFC @57012 (md file & alpha console)
Affected files ...
.. //depot/projects/gdb/sys/alpha/alpha/api_up1000.c#3 integrate
.. //depot/projects/gdb/sys/alpha/alpha/dec_1000a.c#3 integrate
.. //depot/projects/gdb/sys/alpha/alpha/dec_2100_a50.c#3 integrate
.. //depot/projects/gdb/sys/alpha/alpha/dec_2100_a500.c#3 integrate
.. //depot/projects/gdb/sys/alpha/alpha/dec_axppci_33.c#3 integrate
.. //depot/projects/gdb/sys/alpha/alpha/dec_eb164.c#3 integrate
.. //depot/projects/gdb/sys/alpha/alpha/dec_eb64plus.c#3 integrate
.. //depot/projects/gdb/sys/alpha/alpha/dec_kn20aa.c#3 integrate
.. //depot/projects/gdb/sys/alpha/alpha/dec_kn300.c#3 integrate
.. //depot/projects/gdb/sys/alpha/alpha/dec_st550.c#3 integrate
.. //depot/projects/gdb/sys/alpha/alpha/dec_st6600.c#3 integrate
.. //depot/projects/gdb/sys/alpha/alpha/interrupt.c#10 integrate
.. //depot/projects/gdb/sys/alpha/alpha/machdep.c#13 integrate
.. //depot/projects/gdb/sys/alpha/alpha/trap.c#9 integrate
.. //depot/projects/gdb/sys/alpha/conf/NOTES#3 integrate
.. //depot/projects/gdb/sys/amd64/amd64/machdep.c#18 integrate
.. //depot/projects/gdb/sys/amd64/amd64/support.S#10 integrate
.. //depot/projects/gdb/sys/amd64/amd64/trap.c#11 integrate
.. //depot/projects/gdb/sys/amd64/include/frame.h#4 integrate
.. //depot/projects/gdb/sys/amd64/isa/clock.c#6 integrate
.. //depot/projects/gdb/sys/conf/options.alpha#3 integrate
.. //depot/projects/gdb/sys/dev/gfb/gfb_pci.c#5 integrate
.. //depot/projects/gdb/sys/dev/sio/sio.c#19 integrate
.. //depot/projects/gdb/sys/dev/syscons/syscons.c#12 integrate
.. //depot/projects/gdb/sys/i386/i386/machdep.c#14 integrate
.. //depot/projects/gdb/sys/i386/i386/trap.c#13 integrate
.. //depot/projects/gdb/sys/i386/include/frame.h#5 integrate
.. //depot/projects/gdb/sys/i386/isa/clock.c#12 integrate
.. //depot/projects/gdb/sys/ia64/ia64/machdep.c#11 integrate
.. //depot/projects/gdb/sys/ia64/ia64/trap.c#13 integrate
.. //depot/projects/gdb/sys/ia64/ia64/unwind.c#9 integrate
.. //depot/projects/gdb/sys/ia64/include/md_var.h#4 integrate
.. //depot/projects/gdb/sys/ia64/include/unwind.h#3 integrate
.. //depot/projects/gdb/sys/modules/uart/Makefile#5 integrate
.. //depot/projects/gdb/sys/pc98/i386/machdep.c#10 integrate
.. //depot/projects/gdb/sys/pc98/pc98/sio.c#16 integrate
.. //depot/projects/gdb/sys/sparc64/include/frame.h#3 integrate
.. //depot/projects/gdb/sys/sparc64/pci/psycho.c#8 integrate
.. //depot/projects/gdb/sys/sparc64/sparc64/machdep.c#9 integrate
.. //depot/projects/gdb/sys/sparc64/sparc64/mp_machdep.c#3 integrate
.. //depot/projects/gdb/sys/sparc64/sparc64/trap.c#8 integrate
.. //depot/projects/gdb/sys/vm/vm_page.c#12 integrate
Differences ...
==== //depot/projects/gdb/sys/alpha/alpha/api_up1000.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.10 2003/08/25 03:43:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.11 2004/07/10 22:29:40 marcel Exp $");
#include <sys/param.h>
#include <sys/reboot.h>
==== //depot/projects/gdb/sys/alpha/alpha/dec_1000a.c#3 (text+ko) ====
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_1000a.c,v 1.17 2003/08/25 03:43:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_1000a.c,v 1.18 2004/07/10 22:29:40 marcel Exp $");
#include <sys/param.h>
#include <sys/reboot.h>
==== //depot/projects/gdb/sys/alpha/alpha/dec_2100_a50.c#3 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a50.c,v 1.18 2003/08/25 03:43:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a50.c,v 1.19 2004/07/10 22:29:40 marcel Exp $");
#include <sys/param.h>
#include <sys/reboot.h>
==== //depot/projects/gdb/sys/alpha/alpha/dec_2100_a500.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a500.c,v 1.17 2003/08/25 03:43:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a500.c,v 1.18 2004/07/10 22:29:40 marcel Exp $");
#include <sys/param.h>
#include <sys/reboot.h>
==== //depot/projects/gdb/sys/alpha/alpha/dec_axppci_33.c#3 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.21 2003/08/25 03:43:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.22 2004/07/10 22:29:40 marcel Exp $");
#include <sys/param.h>
#include <sys/reboot.h>
==== //depot/projects/gdb/sys/alpha/alpha/dec_eb164.c#3 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_eb164.c,v 1.19 2003/08/25 03:43:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_eb164.c,v 1.20 2004/07/10 22:29:40 marcel Exp $");
#include <sys/param.h>
#include <sys/reboot.h>
==== //depot/projects/gdb/sys/alpha/alpha/dec_eb64plus.c#3 (text+ko) ====
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_eb64plus.c,v 1.16 2003/08/25 03:43:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_eb64plus.c,v 1.17 2004/07/10 22:29:40 marcel Exp $");
#include <sys/param.h>
#include <sys/reboot.h>
==== //depot/projects/gdb/sys/alpha/alpha/dec_kn20aa.c#3 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn20aa.c,v 1.18 2003/08/25 03:43:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn20aa.c,v 1.19 2004/07/10 22:29:40 marcel Exp $");
#include <sys/param.h>
#include <sys/reboot.h>
==== //depot/projects/gdb/sys/alpha/alpha/dec_kn300.c#3 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn300.c,v 1.13 2003/08/25 03:43:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn300.c,v 1.14 2004/07/10 22:29:40 marcel Exp $");
#include <sys/param.h>
#include <sys/reboot.h>
==== //depot/projects/gdb/sys/alpha/alpha/dec_st550.c#3 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st550.c,v 1.16 2003/08/25 03:43:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st550.c,v 1.17 2004/07/10 22:29:40 marcel Exp $");
#include <sys/param.h>
#include <sys/reboot.h>
==== //depot/projects/gdb/sys/alpha/alpha/dec_st6600.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st6600.c,v 1.17 2003/08/25 03:43:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st6600.c,v 1.18 2004/07/10 22:29:40 marcel Exp $");
#include <sys/param.h>
#include <sys/reboot.h>
==== //depot/projects/gdb/sys/alpha/alpha/interrupt.c#10 (text+ko) ====
@@ -33,7 +33,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
/* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.79 2004/07/02 20:21:41 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.80 2004/07/10 22:35:05 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/gdb/sys/alpha/alpha/machdep.c#13 (text+ko) ====
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.221 2004/07/10 19:55:58 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.222 2004/07/10 22:35:05 marcel Exp $");
#include "opt_compat.h"
#include "opt_ddb.h"
==== //depot/projects/gdb/sys/alpha/alpha/trap.c#9 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.117 2003/10/09 10:17:15 robert Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.118 2004/07/10 22:35:05 marcel Exp $");
/* #include "opt_fix_unaligned_vax_fp.h" */
#include "opt_ddb.h"
==== //depot/projects/gdb/sys/alpha/conf/NOTES#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.153 2003/08/25 03:43:08 marcel Exp $
+# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.154 2004/07/10 22:29:40 marcel Exp $
#
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
==== //depot/projects/gdb/sys/amd64/amd64/machdep.c#18 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.612 2004/07/10 19:55:58 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.613 2004/07/10 22:39:17 marcel Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
==== //depot/projects/gdb/sys/amd64/amd64/support.S#10 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.112 2004/05/29 01:13:28 tjr Exp $
+ * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.113 2004/07/10 22:39:17 marcel Exp $
*/
#include "opt_ddb.h"
==== //depot/projects/gdb/sys/amd64/amd64/trap.c#11 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.276 2004/06/02 07:52:33 tjr Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.277 2004/07/10 22:39:17 marcel Exp $");
/*
* AMD64 Trap and System call handling
==== //depot/projects/gdb/sys/amd64/include/frame.h#4 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)frame.h 5.2 (Berkeley) 1/18/91
- * $FreeBSD: src/sys/amd64/include/frame.h,v 1.27 2004/04/05 23:55:14 imp Exp $
+ * $FreeBSD: src/sys/amd64/include/frame.h,v 1.28 2004/07/10 22:39:56 marcel Exp $
*/
#ifndef _MACHINE_FRAME_H_
==== //depot/projects/gdb/sys/amd64/isa/clock.c#6 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.211 2004/06/03 20:21:30 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.212 2004/07/10 22:42:22 marcel Exp $");
/*
* Routines to handle clock hardware.
==== //depot/projects/gdb/sys/conf/options.alpha#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.alpha,v 1.42 2003/08/25 03:43:08 marcel Exp $
+# $FreeBSD: src/sys/conf/options.alpha,v 1.43 2004/07/10 22:29:40 marcel Exp $
# Options specific to the Alpha platform kernels
EV5 opt_global.h
==== //depot/projects/gdb/sys/dev/gfb/gfb_pci.c#5 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/gfb/gfb_pci.c,v 1.12 2004/06/16 09:46:44 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/gfb/gfb_pci.c,v 1.13 2004/07/10 22:29:41 marcel Exp $");
#include "opt_fb.h"
==== //depot/projects/gdb/sys/dev/sio/sio.c#19 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.446 2004/06/30 21:38:07 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.447 2004/07/10 22:29:41 marcel Exp $");
#include "opt_comconsole.h"
#include "opt_compat.h"
==== //depot/projects/gdb/sys/dev/syscons/syscons.c#12 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.422 2004/06/17 17:16:46 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.423 2004/07/10 22:29:41 marcel Exp $");
#include "opt_syscons.h"
#include "opt_splash.h"
==== //depot/projects/gdb/sys/i386/i386/machdep.c#14 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.593 2004/07/10 19:55:59 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.594 2004/07/10 22:47:06 marcel Exp $");
#include "opt_apic.h"
#include "opt_atalk.h"
==== //depot/projects/gdb/sys/i386/i386/trap.c#13 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.265 2004/06/02 07:52:33 tjr Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.266 2004/07/10 22:11:14 marcel Exp $");
/*
* 386 Trap and System call handling
==== //depot/projects/gdb/sys/i386/include/frame.h#5 (text+ko) ====
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* from: @(#)frame.h 5.2 (Berkeley) 1/18/91
- * $FreeBSD: src/sys/i386/include/frame.h,v 1.24 2004/04/07 20:46:05 imp Exp $
+ * $FreeBSD: src/sys/i386/include/frame.h,v 1.25 2004/07/10 22:11:14 marcel Exp $
*/
#ifndef _MACHINE_FRAME_H_
==== //depot/projects/gdb/sys/i386/isa/clock.c#12 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.211 2004/05/30 17:57:43 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.212 2004/07/10 22:16:18 marcel Exp $");
/*
* Routines to handle clock hardware.
==== //depot/projects/gdb/sys/ia64/ia64/machdep.c#11 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.179 2004/07/10 19:55:59 marcel Exp $
+ * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.180 2004/07/10 22:59:30 marcel Exp $
*/
#include "opt_compat.h"
==== //depot/projects/gdb/sys/ia64/ia64/trap.c#13 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ia64/ia64/trap.c,v 1.101 2004/07/08 21:08:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/trap.c,v 1.102 2004/07/10 22:59:30 marcel Exp $");
#include "opt_ddb.h"
#include "opt_ktrace.h"
==== //depot/projects/gdb/sys/ia64/ia64/unwind.c#9 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ia64/ia64/unwind.c,v 1.10 2003/10/09 03:11:37 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/unwind.c,v 1.11 2004/07/10 22:59:30 marcel Exp $");
#include <sys/param.h>
#include <sys/kdb.h>
==== //depot/projects/gdb/sys/ia64/include/md_var.h#4 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/ia64/include/md_var.h,v 1.16 2004/02/22 02:10:48 marcel Exp $
+ * $FreeBSD: src/sys/ia64/include/md_var.h,v 1.17 2004/07/10 22:59:30 marcel Exp $
*/
#ifndef _MACHINE_MD_VAR_H_
==== //depot/projects/gdb/sys/ia64/include/unwind.h#3 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/ia64/include/unwind.h,v 1.5 2003/07/12 04:35:09 marcel Exp $
+ * $FreeBSD: src/sys/ia64/include/unwind.h,v 1.6 2004/07/10 22:59:30 marcel Exp $
*/
#ifndef _MACHINE_UNWIND_H_
==== //depot/projects/gdb/sys/modules/uart/Makefile#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/uart/Makefile,v 1.8 2004/05/26 00:53:09 imp Exp $
+# $FreeBSD: src/sys/modules/uart/Makefile,v 1.9 2004/07/10 23:01:35 marcel Exp $
.PATH: ${.CURDIR}/../../dev/uart
==== //depot/projects/gdb/sys/pc98/i386/machdep.c#10 (text+ko) ====
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
- * $FreeBSD: src/sys/pc98/i386/machdep.c,v 1.338 2004/06/22 12:11:20 nyan Exp $
+ * $FreeBSD: src/sys/pc98/i386/machdep.c,v 1.339 2004/07/10 23:04:42 marcel Exp $
*/
#include "opt_atalk.h"
@@ -2274,6 +2274,25 @@
}
#endif /* defined(I586_CPU) && !NO_F00F_HACK */
+/*
+ * Construct a PCB from a trapframe. This is called from kdb_trap() where
+ * we want to start a backtrace from the function that caused us to enter
+ * the debugger. We have the context in the trapframe, but base the trace
+ * on the PCB. The PCB doesn't have to be perfect, as long as it contains
+ * enough for a backtrace.
+ */
+void
+makectx(struct trapframe *tf, struct pcb *pcb)
+{
+
+ pcb->pcb_edi = tf->tf_edi;
+ pcb->pcb_esi = tf->tf_esi;
+ pcb->pcb_ebp = tf->tf_ebp;
+ pcb->pcb_ebx = tf->tf_ebx;
+ pcb->pcb_eip = tf->tf_eip;
+ pcb->pcb_esp = (ISPL(tf->tf_cs)) ? tf->tf_esp : (int)(tf + 1) - 8;
+}
+
int
ptrace_set_pc(struct thread *td, u_long addr)
{
==== //depot/projects/gdb/sys/pc98/pc98/sio.c#16 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/pc98/pc98/sio.c,v 1.223 2004/07/01 09:32:32 nyan Exp $
+ * $FreeBSD: src/sys/pc98/pc98/sio.c,v 1.224 2004/07/10 22:29:41 marcel Exp $
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* from: i386/isa sio.c,v 1.234
*/
==== //depot/projects/gdb/sys/sparc64/include/frame.h#3 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/sparc64/include/frame.h,v 1.14 2002/10/22 18:03:15 jake Exp $
+ * $FreeBSD: src/sys/sparc64/include/frame.h,v 1.15 2004/07/10 23:05:38 marcel Exp $
*/
#ifndef _MACHINE_FRAME_H_
==== //depot/projects/gdb/sys/sparc64/pci/psycho.c#8 (text+ko) ====
@@ -28,7 +28,7 @@
*
* from: NetBSD: psycho.c,v 1.39 2001/10/07 20:30:41 eeh Exp
*
- * $FreeBSD: src/sys/sparc64/pci/psycho.c,v 1.50 2004/07/03 20:56:16 imp Exp $
+ * $FreeBSD: src/sys/sparc64/pci/psycho.c,v 1.51 2004/07/10 23:06:41 marcel Exp $
*/
/*
==== //depot/projects/gdb/sys/sparc64/sparc64/machdep.c#9 (text+ko) ====
@@ -33,7 +33,7 @@
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
* from: FreeBSD: src/sys/i386/i386/machdep.c,v 1.477 2001/08/27
- * $FreeBSD: src/sys/sparc64/sparc64/machdep.c,v 1.108 2004/07/10 19:55:59 marcel Exp $
+ * $FreeBSD: src/sys/sparc64/sparc64/machdep.c,v 1.109 2004/07/10 23:10:07 marcel Exp $
*/
#include "opt_compat.h"
==== //depot/projects/gdb/sys/sparc64/sparc64/mp_machdep.c#3 (text+ko) ====
@@ -52,7 +52,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/sparc64/sparc64/mp_machdep.c,v 1.25 2003/12/03 14:57:25 jhb Exp $
+ * $FreeBSD: src/sys/sparc64/sparc64/mp_machdep.c,v 1.26 2004/07/10 23:10:07 marcel Exp $
*/
#include <sys/param.h>
==== //depot/projects/gdb/sys/sparc64/sparc64/trap.c#8 (text+ko) ====
@@ -37,7 +37,7 @@
*
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
* from: FreeBSD: src/sys/i386/i386/trap.c,v 1.197 2001/07/19
- * $FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.69 2003/11/11 06:41:54 jake Exp $
+ * $FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.70 2004/07/10 23:10:07 marcel Exp $
*/
#include "opt_ddb.h"
==== //depot/projects/gdb/sys/vm/vm_page.c#12 (text+ko) ====
@@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.286 2004/06/19 04:19:47 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.287 2004/07/10 22:12:49 alc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -784,11 +784,11 @@
*/
vm_page_lock_queues();
if ((m = vm_page_select_cache(color)) == NULL) {
- vm_page_unlock_queues();
#if defined(DIAGNOSTIC)
if (cnt.v_cache_count > 0)
printf("vm_page_alloc(NORMAL): missing pages on cache queue: %d\n", cnt.v_cache_count);
#endif
+ vm_page_unlock_queues();
atomic_add_int(&vm_pageout_deficit, 1);
pagedaemon_wakeup();
return (NULL);
More information about the p4-projects
mailing list