PERFORCE change 55369 for review
Robert Watson
rwatson at FreeBSD.org
Sun Jun 20 15:01:52 GMT 2004
http://perforce.freebsd.org/chv.cgi?CH=55369
Change 55369 by rwatson at rwatson_paprika on 2004/06/20 15:01:33
Integrate netperf_socket for another batch of merging.
Affected files ...
.. //depot/projects/netperf_socket/sys/alpha/include/cpu.h#4 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#15 integrate
.. //depot/projects/netperf_socket/sys/amd64/include/cpu.h#4 integrate
.. //depot/projects/netperf_socket/sys/arm/arm/pmap.c#2 integrate
.. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0.c#2 integrate
.. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_ost.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/null/null.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#13 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#13 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#13 integrate
.. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_mount.h#4 integrate
.. //depot/projects/netperf_socket/sys/gnu/ext2fs/inode.h#4 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#11 integrate
.. //depot/projects/netperf_socket/sys/i386/include/cpu.h#4 integrate
.. //depot/projects/netperf_socket/sys/i386/include/pmap.h#8 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/npx.c#8 integrate
.. //depot/projects/netperf_socket/sys/ia64/ia64/pmap.c#9 integrate
.. //depot/projects/netperf_socket/sys/ia64/include/cpu.h#4 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_proc.c#10 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_thread.c#14 integrate
.. //depot/projects/netperf_socket/sys/sparc64/include/cpu.h#4 integrate
.. //depot/projects/netperf_socket/sys/sys/_types.h#5 integrate
.. //depot/projects/netperf_socket/sys/sys/proc.h#13 integrate
.. //depot/projects/netperf_socket/sys/sys/types.h#7 integrate
.. //depot/projects/netperf_socket/sys/ufs/ufs/dinode.h#3 integrate
Differences ...
==== //depot/projects/netperf_socket/sys/alpha/include/cpu.h#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.38 2004/06/16 09:46:26 phk Exp $ */
+/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.39 2004/06/20 03:52:48 bde Exp $ */
/* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */
/*
@@ -66,7 +66,7 @@
/*
* CTL_MACHDEP definitions.
*/
-#define CPU_CONSDEV 1 /* struct cdev *: console terminal device */
+#define CPU_CONSDEV 1 /* dev_t: console terminal device */
#define CPU_ROOT_DEVICE 2 /* string: root device name */
#define CPU_UNALIGNED_PRINT 3 /* int: print unaligned accesses */
#define CPU_UNALIGNED_FIX 4 /* int: fix unaligned accesses */
==== //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#15 (text+ko) ====
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.475 2004/06/17 06:16:57 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.477 2004/06/20 06:10:59 alc Exp $");
/*
* Manages physical address maps.
@@ -196,13 +196,11 @@
*/
pt_entry_t *CMAP1 = 0;
caddr_t CADDR1 = 0;
-static pt_entry_t *msgbufmap;
struct msgbuf *msgbufp = 0;
/*
* Crashdump maps.
*/
-static pt_entry_t *pt_crashdumpmap;
static caddr_t crashdumpmap;
static PMAP_INLINE void free_pv_entry(pv_entry_t pv);
@@ -441,7 +439,7 @@
vm_paddr_t *firstaddr;
{
vm_offset_t va;
- pt_entry_t *pte;
+ pt_entry_t *pte, *unused;
avail_start = *firstaddr;
@@ -493,14 +491,12 @@
/*
* Crashdump maps.
*/
- SYSMAP(caddr_t, pt_crashdumpmap, crashdumpmap, MAXDUMPPGS);
+ SYSMAP(caddr_t, unused, crashdumpmap, MAXDUMPPGS)
/*
* msgbufp is used to map the system message buffer.
- * XXX msgbufmap is not used.
*/
- SYSMAP(struct msgbuf *, msgbufmap, msgbufp,
- atop(round_page(MSGBUF_SIZE)))
+ SYSMAP(struct msgbuf *, unused, msgbufp, atop(round_page(MSGBUF_SIZE)))
virtual_avail = va;
@@ -2570,14 +2566,17 @@
{
pd_entry_t *pde;
pt_entry_t *pte;
+ boolean_t rv;
+ rv = FALSE;
+ PMAP_LOCK(pmap);
pde = pmap_pde(pmap, addr);
- if (pde == NULL || (*pde & PG_V) == 0)
- return (FALSE);
- pte = vtopte(addr);
- if (*pte & PG_V)
- return (FALSE);
- return (TRUE);
+ if (pde != NULL && (*pde & PG_V)) {
+ pte = vtopte(addr);
+ rv = (*pte & PG_V) == 0;
+ }
+ PMAP_UNLOCK(pmap);
+ return (rv);
}
/*
==== //depot/projects/netperf_socket/sys/amd64/include/cpu.h#4 (text+ko) ====
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* from: @(#)cpu.h 5.4 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/amd64/include/cpu.h,v 1.72 2004/06/16 09:46:28 phk Exp $
+ * $FreeBSD: src/sys/amd64/include/cpu.h,v 1.73 2004/06/20 03:52:48 bde Exp $
*/
#ifndef _MACHINE_CPU_H_
@@ -65,7 +65,7 @@
/*
* CTL_MACHDEP definitions.
*/
-#define CPU_CONSDEV 1 /* struct cdev *: console terminal device */
+#define CPU_CONSDEV 1 /* dev_t: console terminal device */
#define CPU_ADJKERNTZ 2 /* int: timezone offset (seconds) */
#define CPU_DISRTCSET 3 /* int: disable resettodr() call */
#define CPU_WALLCLOCK 5 /* int: indicates wall CMOS clock */
==== //depot/projects/netperf_socket/sys/arm/arm/pmap.c#2 (text+ko) ====
@@ -144,7 +144,7 @@
*/
/* Include header files */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.1 2004/05/14 11:46:42 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.3 2004/06/19 20:50:50 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -155,7 +155,6 @@
#include <sys/mman.h>
#include <sys/smp.h>
#include <sys/sx.h>
-#include <sys/pool.h>
#include <sys/sched.h>
#include <vm/vm.h>
@@ -4190,7 +4189,7 @@
* the duration of the copy so that no other mappings can
* be created while we have a potentially aliased mapping.
*/
- (void) pmap_clean_page(src_pg->md.pvh_list, TRUE);
+ (void) pmap_clean_page(TAILQ_FIRST(&src_pg->md.pv_list), TRUE);
/*
* Map the pages into the page hook points, copy them, and purge
==== //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0.c#2 (text+ko) ====
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0.c,v 1.1 2004/05/14 11:46:45 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0.c,v 1.2 2004/06/19 17:38:32 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -68,6 +68,7 @@
#include <sys/malloc.h>
#include <sys/bus.h>
#include <sys/interrupt.h>
+#include <sys/module.h>
#include <vm/vm.h>
#include <vm/vm_extern.h>
==== //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_ost.c#2 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.1 2004/05/14 11:46:45 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.2 2004/06/19 17:38:32 cognet Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -47,6 +47,7 @@
#include <sys/time.h>
#include <sys/bus.h>
#include <sys/clock.h>
+#include <sys/module.h>
#include <machine/bus.h>
#include <sys/rman.h>
==== //depot/projects/netperf_socket/sys/dev/null/null.c#4 (text+ko) ====
@@ -1,5 +1,6 @@
/*-
* Copyright (c) 2000 Mark R. V. Murray & Jeroen C. van Gelderen
+ * Copyright (c) 2001-2004 Mark R. V. Murray
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/null/null.c,v 1.25 2004/06/16 09:46:52 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/null/null.c,v 1.26 2004/06/20 13:50:50 markm Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -76,7 +77,8 @@
null_write(struct cdev *dev __unused, struct uio *uio, int flags __unused)
{
uio->uio_resid = 0;
- return 0;
+
+ return (0);
}
/* ARGSUSED */
@@ -105,7 +107,8 @@
c = uio->uio_resid < PAGE_SIZE ? uio->uio_resid : PAGE_SIZE;
error = uiomove(zbuf, c, uio);
}
- return error;
+
+ return (error);
}
/* ARGSUSED */
@@ -121,20 +124,20 @@
GID_WHEEL, 0666, "zero");
null_dev = make_dev(&null_cdevsw, NULL_MINOR, UID_ROOT,
GID_WHEEL, 0666, "null");
- return 0;
+ break;
case MOD_UNLOAD:
destroy_dev(null_dev);
destroy_dev(zero_dev);
free(zbuf, M_TEMP);
- return 0;
+ break;
case MOD_SHUTDOWN:
- return 0;
+ break;
- default:
- return EOPNOTSUPP;
}
+
+ return (0);
}
DEV_MODULE(null, null_modevent, NULL);
==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs#13 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/sys/dev/usb/usbdevs,v 1.181 2004/06/05 21:33:59 sanpei Exp $
+$FreeBSD: src/sys/dev/usb/usbdevs,v 1.182 2004/06/19 22:16:03 sanpei Exp $
/*
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -357,6 +357,7 @@
vendor PNY 0x0d7d PNY
vendor MSI 0x0db0 Micro Star International
vendor HAWKING 0x0e66 Hawking Technologies
+vendor MICROTUNE 0x0f4d Microtune, Inc.
vendor QUALCOMM 0x1004 Qualcomm
vendor MOTOROLA 0x1063 Motorola
vendor PLX 0x10b5 PLX
@@ -982,6 +983,9 @@
/* Micro Star International products */
product MSI BT_DONGLE 0x1967 Bluetooth USB dongle
+/* Microtune, Inc. products */
+product MICROTUNE BT_DONGLE 0x1000 Bluetooth USB dongle
+
/* Mitsumi products */
product MITSUMI CDRRW 0x0000 CD-R/RW Drive
product MITSUMI BT_DONGLE 0x641f Bluetooth USB dongle
==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#13 (text+ko) ====
@@ -1,10 +1,10 @@
-/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.188 2004/06/05 21:36:06 sanpei Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.189 2004/06/19 22:17:34 sanpei Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * FreeBSD: src/sys/dev/usb/usbdevs,v 1.181 2004/06/05 21:33:59 sanpei Exp
+ * FreeBSD: src/sys/dev/usb/usbdevs,v 1.182 2004/06/19 22:16:03 sanpei Exp
*/
/*
@@ -364,6 +364,7 @@
#define USB_VENDOR_PNY 0x0d7d /* PNY */
#define USB_VENDOR_MSI 0x0db0 /* Micro Star International */
#define USB_VENDOR_HAWKING 0x0e66 /* Hawking Technologies */
+#define USB_VENDOR_MICROTUNE 0x0f4d /* Microtune, Inc. */
#define USB_VENDOR_QUALCOMM 0x1004 /* Qualcomm */
#define USB_VENDOR_MOTOROLA 0x1063 /* Motorola */
#define USB_VENDOR_PLX 0x10b5 /* PLX */
@@ -989,6 +990,9 @@
/* Micro Star International products */
#define USB_PRODUCT_MSI_BT_DONGLE 0x1967 /* Bluetooth USB dongle */
+/* Microtune, Inc. products */
+#define USB_PRODUCT_MICROTUNE_BT_DONGLE 0x1000 /* Bluetooth USB dongle */
+
/* Mitsumi products */
#define USB_PRODUCT_MITSUMI_CDRRW 0x0000 /* CD-R/RW Drive */
#define USB_PRODUCT_MITSUMI_BT_DONGLE 0x641f /* Bluetooth USB dongle */
==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#13 (text+ko) ====
@@ -1,10 +1,10 @@
-/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.188 2004/06/05 21:36:06 sanpei Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.189 2004/06/19 22:17:34 sanpei Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * FreeBSD: src/sys/dev/usb/usbdevs,v 1.181 2004/06/05 21:33:59 sanpei Exp
+ * FreeBSD: src/sys/dev/usb/usbdevs,v 1.182 2004/06/19 22:16:03 sanpei Exp
*/
/*
@@ -2248,6 +2248,12 @@
"Bluetooth USB dongle",
},
{
+ USB_VENDOR_MICROTUNE, USB_PRODUCT_MICROTUNE_BT_DONGLE,
+ 0,
+ "Microtune, Inc.",
+ "Bluetooth USB dongle",
+ },
+ {
USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_CDRRW,
0,
"Mitsumi",
@@ -5176,6 +5182,12 @@
NULL,
},
{
+ USB_VENDOR_MICROTUNE, 0,
+ USB_KNOWNDEV_NOPROD,
+ "Microtune, Inc.",
+ NULL,
+ },
+ {
USB_VENDOR_QUALCOMM, 0,
USB_KNOWNDEV_NOPROD,
"Qualcomm",
==== //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_mount.h#4 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)ufsmount.h 8.6 (Berkeley) 3/30/95
- * $FreeBSD: src/sys/gnu/ext2fs/ext2_mount.h,v 1.27 2004/06/16 09:47:06 phk Exp $
+ * $FreeBSD: src/sys/gnu/ext2fs/ext2_mount.h,v 1.28 2004/06/20 03:34:21 bde Exp $
*/
#ifndef _SYS_GNU_EXT2FS_EXT2_MOUNT_H_
@@ -44,7 +44,7 @@
/* This structure describes the ext2fs specific mount structure data. */
struct ext2mount {
struct mount *um_mountp; /* filesystem vfs structure */
- struct cdev *um_dev; /* device mounted */
+ struct cdev *um_dev; /* device mounted */
struct vnode *um_devvp; /* block device mounted vnode */
struct ext2_sb_info *um_e2fs; /* EXT2FS */
==== //depot/projects/netperf_socket/sys/gnu/ext2fs/inode.h#4 (text+ko) ====
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* @(#)inode.h 8.9 (Berkeley) 5/14/95
- * $FreeBSD: src/sys/gnu/ext2fs/inode.h,v 1.40 2004/06/16 09:47:06 phk Exp $
+ * $FreeBSD: src/sys/gnu/ext2fs/inode.h,v 1.41 2004/06/20 03:36:31 bde Exp $
*/
#ifndef _SYS_GNU_EXT2FS_INODE_H_
@@ -65,7 +65,7 @@
struct vnode *i_vnode;/* Vnode associated with this inode. */
struct vnode *i_devvp;/* Vnode for block I/O. */
u_int32_t i_flag; /* flags, see below */
- struct cdev *i_dev; /* Device associated with the inode. */
+ struct cdev *i_dev; /* Device associated with the inode. */
ino_t i_number; /* The identity of the inode. */
struct ext2_sb_info *i_e2fs; /* EXT2FS */
@@ -110,7 +110,7 @@
* The di_db fields may be overlaid with other information for
* file types that do not have associated disk storage. Block
* and character devices overlay the first data block with their
- * struct cdev *value. Short symbolic links place their path in the
+ * dev_t value. Short symbolic links place their path in the
* di_db area.
*/
#define i_shortlink i_db
==== //depot/projects/netperf_socket/sys/i386/i386/pmap.c#11 (text+ko) ====
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.473 2004/06/17 06:16:57 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.475 2004/06/20 06:11:00 alc Exp $");
/*
* Manages physical address maps.
@@ -216,17 +216,15 @@
* All those kernel PT submaps that BSD is so fond of
*/
pt_entry_t *CMAP1 = 0;
-static pt_entry_t *CMAP2, *CMAP3, *ptmmap;
+static pt_entry_t *CMAP2, *CMAP3;
caddr_t CADDR1 = 0, ptvmmap = 0;
static caddr_t CADDR2, CADDR3;
static struct mtx CMAPCADDR12_lock;
-static pt_entry_t *msgbufmap;
struct msgbuf *msgbufp = 0;
/*
* Crashdump maps.
*/
-static pt_entry_t *pt_crashdumpmap;
static caddr_t crashdumpmap;
#ifdef SMP
@@ -308,7 +306,7 @@
vm_paddr_t loadaddr;
{
vm_offset_t va;
- pt_entry_t *pte;
+ pt_entry_t *pte, *unused;
int i;
/*
@@ -368,20 +366,17 @@
/*
* Crashdump maps.
*/
- SYSMAP(caddr_t, pt_crashdumpmap, crashdumpmap, MAXDUMPPGS);
+ SYSMAP(caddr_t, unused, crashdumpmap, MAXDUMPPGS)
/*
* ptvmmap is used for reading arbitrary physical pages via /dev/mem.
- * XXX ptmmap is not used.
*/
- SYSMAP(caddr_t, ptmmap, ptvmmap, 1)
+ SYSMAP(caddr_t, unused, ptvmmap, 1)
/*
* msgbufp is used to map the system message buffer.
- * XXX msgbufmap is not used.
*/
- SYSMAP(struct msgbuf *, msgbufmap, msgbufp,
- atop(round_page(MSGBUF_SIZE)))
+ SYSMAP(struct msgbuf *, unused, msgbufp, atop(round_page(MSGBUF_SIZE)))
/*
* ptemap is used for pmap_pte_quick
@@ -2646,13 +2641,16 @@
pmap_is_prefaultable(pmap_t pmap, vm_offset_t addr)
{
pt_entry_t *pte;
+ boolean_t rv;
- if ((*pmap_pde(pmap, addr)) == 0)
- return (FALSE);
- pte = vtopte(addr);
- if (*pte)
- return (FALSE);
- return (TRUE);
+ rv = FALSE;
+ PMAP_LOCK(pmap);
+ if (*pmap_pde(pmap, addr)) {
+ pte = vtopte(addr);
+ rv = *pte == 0;
+ }
+ PMAP_UNLOCK(pmap);
+ return (rv);
}
/*
==== //depot/projects/netperf_socket/sys/i386/include/cpu.h#4 (text+ko) ====
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* from: @(#)cpu.h 5.4 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/i386/include/cpu.h,v 1.71 2004/06/16 09:47:08 phk Exp $
+ * $FreeBSD: src/sys/i386/include/cpu.h,v 1.72 2004/06/20 03:52:49 bde Exp $
*/
#ifndef _MACHINE_CPU_H_
@@ -65,7 +65,7 @@
/*
* CTL_MACHDEP definitions.
*/
-#define CPU_CONSDEV 1 /* struct cdev *: console terminal device */
+#define CPU_CONSDEV 1 /* dev_t: console terminal device */
#define CPU_ADJKERNTZ 2 /* int: timezone offset (seconds) */
#define CPU_DISRTCSET 3 /* int: disable resettodr() call */
#define CPU_BOOTINFO 4 /* struct: bootinfo */
==== //depot/projects/netperf_socket/sys/i386/include/pmap.h#8 (text+ko) ====
@@ -38,7 +38,7 @@
*
* from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90
* from: @(#)pmap.h 7.4 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/i386/include/pmap.h,v 1.110 2004/06/16 07:03:15 alc Exp $
+ * $FreeBSD: src/sys/i386/include/pmap.h,v 1.111 2004/06/20 00:33:14 bde Exp $
*/
#ifndef _MACHINE_PMAP_H_
@@ -135,9 +135,9 @@
#ifndef LOCORE
+#include <sys/queue.h>
#include <sys/_lock.h>
#include <sys/_mutex.h>
-#include <sys/queue.h>
#ifdef PAE
==== //depot/projects/netperf_socket/sys/i386/isa/npx.c#8 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/isa/npx.c,v 1.151 2004/06/18 02:10:55 bde Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/isa/npx.c,v 1.152 2004/06/19 22:24:16 bde Exp $");
#include "opt_cpu.h"
#include "opt_debug_npx.h"
@@ -944,6 +944,10 @@
s = intr_disable();
if (td == PCPU_GET(fpcurthread)) {
+#ifdef CPU_ENABLE_SSE
+ if (!cpu_fxsr)
+#endif
+ fnclex(); /* As in npxdrop(). */
fpurstor(addr);
intr_restore(s);
} else {
==== //depot/projects/netperf_socket/sys/ia64/ia64/pmap.c#9 (text+ko) ====
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.134 2004/06/11 20:11:41 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.135 2004/06/19 20:31:49 alc Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -221,8 +221,6 @@
static uma_zone_t pvzone;
static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0;
int pmap_pagedaemon_waken;
-static struct pv_entry *pvbootentries;
-static int pvbootnext, pvbootmax;
/*
* Data for allocating PTEs for user processes.
@@ -469,18 +467,6 @@
ia64_set_rr(IA64_RR_BASE(7), (7 << 8) | (IA64_ID_PAGE_SHIFT << 2));
/*
- * Reserve some memory for allocating pvs while bootstrapping
- * the pv allocator. We need to have enough to cover mapping
- * the kmem_alloc region used to allocate the initial_pvs in
- * pmap_init. In general, the size of this region is
- * approximately (# physical pages) * (size of pv entry).
- */
- pvbootmax = ((physmem * sizeof(struct pv_entry)) >> PAGE_SHIFT) + 128;
- pvbootentries = (struct pv_entry *)
- pmap_steal_memory(pvbootmax * sizeof(struct pv_entry));
- pvbootnext = 0;
-
- /*
* Clear out any random TLB entries left over from booting.
*/
pmap_invalidate_all(kernel_pmap);
==== //depot/projects/netperf_socket/sys/ia64/include/cpu.h#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/ia64/include/cpu.h,v 1.42 2004/06/16 09:47:11 phk Exp $ */
+/* $FreeBSD: src/sys/ia64/include/cpu.h,v 1.43 2004/06/20 03:52:49 bde Exp $ */
/* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */
/*
@@ -62,7 +62,7 @@
/*
* CTL_MACHDEP definitions.
*/
-#define CPU_CONSDEV 1 /* struct cdev *: console terminal device */
+#define CPU_CONSDEV 1 /* dev_t: console terminal device */
#define CPU_ADJKERNTZ 2 /* int: timezone offset (seconds) */
#define CPU_DISRTCSET 3 /* int: disable resettodr() call */
#define CPU_WALLCLOCK 4 /* int: indicates wall CMOS clock */
==== //depot/projects/netperf_socket/sys/kern/kern_proc.c#10 (text+ko) ====
@@ -27,11 +27,11 @@
* SUCH DAMAGE.
*
* @(#)kern_proc.c 8.7 (Berkeley) 2/14/95
- * $FreeBSD: src/sys/kern/kern_proc.c,v 1.209 2004/06/19 14:09:40 gad Exp $
+ * $FreeBSD: src/sys/kern/kern_proc.c,v 1.210 2004/06/20 02:03:33 gad Exp $
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.209 2004/06/19 14:09:40 gad Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.210 2004/06/20 02:03:33 gad Exp $");
#include "opt_ktrace.h"
#include "opt_kstack_pages.h"
@@ -694,6 +694,8 @@
kp->ki_start = p->p_stats->p_start;
timevaladd(&kp->ki_start, &boottime);
kp->ki_rusage = p->p_stats->p_ru;
+ calcru(p, &kp->ki_rusage.ru_utime, &kp->ki_rusage.ru_stime,
+ NULL);
kp->ki_childstime = p->p_stats->p_cru.ru_stime;
kp->ki_childutime = p->p_stats->p_cru.ru_utime;
/* Some callers want child-times in a single value */
==== //depot/projects/netperf_socket/sys/kern/kern_thread.c#14 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.182 2004/06/18 06:15:21 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.183 2004/06/19 17:58:32 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -129,7 +129,7 @@
struct tid_bitmap_part {
STAILQ_ENTRY(tid_bitmap_part) bmp_next;
tid_bitmap_word bmp_bitmap[TID_BITMAP_SIZE];
- int bmp_base;
+ lwpid_t bmp_base;
int bmp_free;
};
@@ -176,7 +176,8 @@
{
struct thread *td;
struct tid_bitmap_part *bmp;
- int bit, idx, tid;
+ lwpid_t tid;
+ int bit, idx;
td = (struct thread *)mem;
@@ -537,11 +538,12 @@
/*
* Assign a thread ID.
*/
-int
+lwpid_t
thread_new_tid(void)
{
struct tid_bitmap_part *bmp, *new;
- int bit, idx, tid;
+ lwpid_t tid;
+ int bit, idx;
mtx_lock(&tid_lock);
STAILQ_FOREACH(bmp, &tid_bitmap, bmp_next) {
==== //depot/projects/netperf_socket/sys/sparc64/include/cpu.h#4 (text+ko) ====
@@ -31,7 +31,7 @@
*
* from: @(#)cpu.h 5.4 (Berkeley) 5/9/91
* from: FreeBSD: src/sys/i386/include/cpu.h,v 1.62 2001/06/29
- * $FreeBSD: src/sys/sparc64/include/cpu.h,v 1.13 2004/06/16 09:47:23 phk Exp $
+ * $FreeBSD: src/sys/sparc64/include/cpu.h,v 1.14 2004/06/20 03:52:50 bde Exp $
*/
#ifndef _MACHINE_CPU_H_
@@ -52,7 +52,7 @@
/*
* CTL_MACHDEP definitions.
*/
-#define CPU_CONSDEV 1 /* struct cdev *: console terminal device */
+#define CPU_CONSDEV 1 /* dev_t: console terminal device */
#define CPU_ADJKERNTZ 2 /* int: timezone offset (seconds) */
#define CPU_DISRTCSET 3 /* int: disable resettodr() call */
#define CPU_BOOTINFO 4 /* struct: bootinfo */
==== //depot/projects/netperf_socket/sys/sys/_types.h#5 (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/sys/_types.h,v 1.18 2004/06/17 17:16:52 phk Exp $
+ * $FreeBSD: src/sys/sys/_types.h,v 1.19 2004/06/19 17:58:32 marcel Exp $
*/
#ifndef _SYS__TYPES_H_
@@ -43,6 +43,7 @@
typedef __int64_t __id_t; /* can hold a gid_t, pid_t, or uid_t */
typedef __uint32_t __ino_t; /* inode number */
typedef long __key_t; /* IPC key (for Sys V IPC) */
+typedef __int32_t __lwpid_t; /* Thread ID (a.k.a. LWP) */
typedef __uint16_t __mode_t; /* permissions */
typedef int __nl_item;
typedef __uint16_t __nlink_t; /* link count */
==== //depot/projects/netperf_socket/sys/sys/proc.h#13 (text+ko) ====
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* @(#)proc.h 8.15 (Berkeley) 5/19/95
- * $FreeBSD: src/sys/sys/proc.h,v 1.380 2004/06/19 14:58:34 bde Exp $
+ * $FreeBSD: src/sys/sys/proc.h,v 1.381 2004/06/19 17:58:32 marcel Exp $
*/
#ifndef _SYS_PROC_H_
@@ -264,7 +264,7 @@
TAILQ_HEAD(, selinfo) td_selq; /* (p) List of selinfos. */
struct sleepqueue *td_sleepqueue; /* (k) Associated sleep queue. */
struct turnstile *td_turnstile; /* (k) Associated turnstile. */
- int td_tid; /* (b) Thread ID. */
+ lwpid_t td_tid; /* (b) Thread ID. */
/* Cleared during fork1() or thread_sched_upcall(). */
#define td_startzero td_flags
@@ -903,7 +903,7 @@
int thread_export_context(struct thread *td, int willexit);
void thread_free(struct thread *td);
void thread_link(struct thread *td, struct ksegrp *kg);
-int thread_new_tid(void);
+lwpid_t thread_new_tid(void);
void thread_reap(void);
struct thread *thread_schedule_upcall(struct thread *td, struct kse_upcall *ku);
int thread_single(int how);
==== //depot/projects/netperf_socket/sys/sys/types.h#7 (text+ko) ====
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* @(#)types.h 8.6 (Berkeley) 2/19/95
- * $FreeBSD: src/sys/sys/types.h,v 1.89 2004/06/17 17:16:53 phk Exp $
+ * $FreeBSD: src/sys/sys/types.h,v 1.90 2004/06/19 17:58:32 marcel Exp $
*/
#ifndef _SYS_TYPES_H_
@@ -178,6 +178,11 @@
#define _KEY_T_DECLARED
#endif
+#ifndef _LWPID_T_DECLARED
+typedef __lwpid_t lwpid_t; /* Thread ID (a.k.a. LWP) */
+#define _LWPID_T_DECLARED
+#endif
+
#ifndef _MODE_T_DECLARED
typedef __mode_t mode_t; /* permissions */
#define _MODE_T_DECLARED
==== //depot/projects/netperf_socket/sys/ufs/ufs/dinode.h#3 (text+ko) ====
@@ -41,7 +41,7 @@
* SUCH DAMAGE.
*
* @(#)dinode.h 8.3 (Berkeley) 1/21/94
- * $FreeBSD: src/sys/ufs/ufs/dinode.h,v 1.12 2004/06/16 09:47:25 phk Exp $
+ * $FreeBSD: src/sys/ufs/ufs/dinode.h,v 1.13 2004/06/20 03:11:19 bde Exp $
*/
#ifndef _UFS_UFS_DINODE_H_
@@ -131,7 +131,7 @@
* The di_db fields may be overlaid with other information for
* file types that do not have associated disk storage. Block
* and character devices overlay the first data block with their
- * struct cdev *value. Short symbolic links place their path in the
+ * dev_t value. Short symbolic links place their path in the
* di_db area.
*/
#define di_rdev di_db[0]
More information about the p4-projects
mailing list