PERFORCE change 41587 for review
Peter Wemm
peter at FreeBSD.org
Thu Nov 6 08:39:44 PST 2003
http://perforce.freebsd.org/chv.cgi?CH=41587
Change 41587 by peter at peter_daintree on 2003/11/06 08:38:57
IFC @41584 (pinning! :-)
Affected files ...
.. //depot/projects/hammer/lib/libc/gen/fnmatch.3#4 integrate
.. //depot/projects/hammer/release/i386/dokern.sh#13 integrate
.. //depot/projects/hammer/sys/dev/firewire/if_fwe.c#12 integrate
.. //depot/projects/hammer/sys/dev/twe/twereg.h#4 integrate
.. //depot/projects/hammer/sys/dev/xe/if_xe.c#10 integrate
.. //depot/projects/hammer/sys/i386/acpica/madt.c#3 integrate
.. //depot/projects/hammer/sys/ia64/ia64/unaligned.c#6 integrate
.. //depot/projects/hammer/sys/kern/kern_mac.c#21 integrate
.. //depot/projects/hammer/sys/kern/sched_ule.c#17 integrate
.. //depot/projects/hammer/sys/kern/sys_pipe.c#14 integrate
.. //depot/projects/hammer/sys/modules/Makefile#29 integrate
.. //depot/projects/hammer/sys/pci/if_xl.c#24 integrate
.. //depot/projects/hammer/sys/security/mac/mac_internal.h#2 integrate
.. //depot/projects/hammer/sys/security/mac/mac_net.c#2 integrate
.. //depot/projects/hammer/sys/security/mac/mac_pipe.c#2 integrate
.. //depot/projects/hammer/sys/security/mac/mac_process.c#2 integrate
.. //depot/projects/hammer/sys/security/mac/mac_vfs.c#2 integrate
.. //depot/projects/hammer/sys/sys/proc.h#35 integrate
.. //depot/projects/hammer/sys/sys/sched.h#6 integrate
Differences ...
==== //depot/projects/hammer/lib/libc/gen/fnmatch.3#4 (text+ko) ====
@@ -32,14 +32,14 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)fnmatch.3 8.3 (Berkeley) 4/28/95
-.\" $FreeBSD: src/lib/libc/gen/fnmatch.3,v 1.15 2003/09/10 19:24:32 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/fnmatch.3,v 1.16 2003/11/06 00:52:37 kientzle Exp $
.\"
.Dd April 28, 1995
.Dt FNMATCH 3
.Os
.Sh NAME
.Nm fnmatch
-.Nd match filename or pathname
+.Nd test whether a filename or pathname matches a shell-style pattern
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
==== //depot/projects/hammer/release/i386/dokern.sh#13 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/release/i386/dokern.sh,v 1.80 2003/05/18 03:52:22 scottl Exp $
+# $FreeBSD: src/release/i386/dokern.sh,v 1.81 2003/11/06 07:58:37 kuriyama Exp $
#
sed \
@@ -21,6 +21,7 @@
-e '/UFS_DIRHASH/d' \
-e '/WITNESS/d' \
-e '/_KPOSIX_PRIORITY_SCHEDULING/d' \
+ -e '/ acpi/d' \
-e '/ atapist /d' \
-e '/ faith /d' \
-e '/ gif /d' \
==== //depot/projects/hammer/sys/dev/firewire/if_fwe.c#12 (text+ko) ====
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.22 2003/11/03 13:01:23 simokawa Exp $
+ * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.23 2003/11/06 04:19:15 simokawa Exp $
*/
#include "opt_inet.h"
@@ -58,7 +58,7 @@
#include <dev/firewire/firewirereg.h>
#include <dev/firewire/if_fwevar.h>
-#define FWEDEBUG if (fwedebug) printf
+#define FWEDEBUG if (fwedebug) if_printf
#define TX_MAX_QUEUE (FWMAXQUEUE - 1)
#define RX_MAX_QUEUE FWMAXQUEUE
@@ -210,7 +210,7 @@
#endif
- FWEDEBUG("interface %s created.\n", ifp->if_xname);
+ FWEDEBUG(ifp, "interface created\n");
return 0;
}
@@ -286,7 +286,7 @@
struct mbuf *m;
int i;
- FWEDEBUG("initializing %s\n", ifp->if_xname);
+ FWEDEBUG(ifp, "initializing\n");
/* XXX keep promiscoud mode */
ifp->if_flags |= IFF_PROMISC;
@@ -441,7 +441,7 @@
fwe = (struct fwe_softc *)xfer->sc;
ifp = &fwe->fwe_if;
/* XXX error check */
- FWEDEBUG("resp = %d\n", xfer->resp);
+ FWEDEBUG(ifp, "resp = %d\n", xfer->resp);
if (xfer->resp != 0)
ifp->if_oerrors ++;
@@ -463,12 +463,12 @@
struct fwe_softc *fwe = ((struct fwe_eth_softc *)ifp->if_softc)->fwe;
int s;
- FWEDEBUG("%s starting\n", ifp->if_xname);
+ FWEDEBUG(ifp, "starting\n");
if (fwe->dma_ch < 0) {
struct mbuf *m = NULL;
- FWEDEBUG("%s not ready.\n", ifp->if_xname);
+ FWEDEBUG(ifp, "not ready\n");
s = splimp();
do {
@@ -602,7 +602,7 @@
fp->mode.stream.len - ETHER_ALIGN;
m->m_pkthdr.rcvif = ifp;
#if 0
- FWEDEBUG("%02x %02x %02x %02x %02x %02x\n"
+ FWEDEBUG(ifp, "%02x %02x %02x %02x %02x %02x\n"
"%02x %02x %02x %02x %02x %02x\n"
"%02x %02x %02x %02x\n"
"%02x %02x %02x %02x\n"
==== //depot/projects/hammer/sys/dev/twe/twereg.h#4 (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/dev/twe/twereg.h,v 1.8 2003/08/05 19:55:21 ps Exp $
+ * $FreeBSD: src/sys/dev/twe/twereg.h,v 1.9 2003/11/06 08:09:29 ps Exp $
*/
/*
@@ -160,7 +160,7 @@
{
u_int32_t address;
u_int32_t length;
-} TWE_SG_Entry __packed;
+} __packed TWE_SG_Entry;
typedef struct {
u_int8_t opcode:5; /* TWE_OP_INITCONNECTION */
@@ -173,7 +173,7 @@
u_int8_t flags;
u_int16_t message_credits;
u_int32_t response_queue_pointer;
-} TWE_Command_INITCONNECTION __packed;
+} __packed TWE_Command_INITCONNECTION;
typedef struct
{
@@ -188,7 +188,7 @@
u_int16_t block_count;
u_int32_t lba;
TWE_SG_Entry sgl[TWE_MAX_SGL_LENGTH];
-} TWE_Command_IO __packed;
+} __packed TWE_Command_IO;
typedef struct
{
@@ -205,7 +205,7 @@
#define TWE_OP_HOTSWAP_ADD_CBOD 0x01 /* add CBOD to empty port */
#define TWE_OP_HOTSWAP_ADD_SPARE 0x02 /* add spare to empty port */
u_int8_t aport;
-} TWE_Command_HOTSWAP __packed;
+} __packed TWE_Command_HOTSWAP;
typedef struct
{
@@ -223,7 +223,7 @@
u_int8_t feature_mode;
u_int16_t all_units;
u_int16_t persistence;
-} TWE_Command_SETATAFEATURE __packed;
+} __packed TWE_Command_SETATAFEATURE;
typedef struct
{
@@ -236,7 +236,7 @@
u_int8_t status;
u_int8_t flags;
u_int16_t target_status; /* set low byte to target request's ID */
-} TWE_Command_CHECKSTATUS __packed;
+} __packed TWE_Command_CHECKSTATUS;
typedef struct
{
@@ -250,7 +250,7 @@
u_int8_t flags;
u_int16_t param_count;
TWE_SG_Entry sgl[TWE_MAX_SGL_LENGTH];
-} TWE_Command_PARAM __packed;
+} __packed TWE_Command_PARAM;
typedef struct
{
@@ -269,7 +269,7 @@
#define TWE_OP_REBUILDUNIT_STARTUNIT 5 /* rebuild src_unit (not supported) */
u_int8_t cs:1; /* request state change on src_unit */
u_int8_t logical_subunit; /* for RAID10 rebuild of logical subunit */
-} TWE_Command_REBUILDUNIT __packed;
+} __packed TWE_Command_REBUILDUNIT;
typedef struct
{
@@ -289,7 +289,7 @@
u_int8_t drive_head;
u_int8_t command;
TWE_SG_Entry sgl[TWE_MAX_ATA_SGL_LENGTH];
-} TWE_Command_ATA __packed;
+} __packed TWE_Command_ATA;
typedef struct
{
@@ -307,7 +307,7 @@
#define TWE_FLAGS_FATAL 0x03
#define TWE_FLAGS_PERCENTAGE (1<<8) /* bits 0-6 indicate completion percentage */
u_int16_t count; /* block count, parameter count, message credits */
-} TWE_Command_Generic __packed;
+} __packed TWE_Command_Generic;
/* command packet - must be TWE_ALIGNMENT aligned */
typedef union
@@ -451,7 +451,7 @@
u_int8_t log_drv_num; /* must be zero for configuration == 0x0f */
u_int32_t start_lba;
u_int32_t block_count; /* actual drive size if configuration == 0x0f, otherwise less DCB size */
-} TWE_Unit_Descriptor __packed;
+} __packed TWE_Unit_Descriptor;
typedef struct
{
@@ -459,7 +459,7 @@
u_int8_t res1;
u_int8_t mirunit_status[4]; /* bitmap of functional subunits in each mirror */
u_int8_t res2[6];
-} TWE_Mirror_Descriptor __packed;
+} __packed TWE_Mirror_Descriptor;
typedef struct
{
@@ -480,7 +480,7 @@
u_int32_t start_lba;
u_int32_t block_count; /* actual drive size if configuration == 0x0f, otherwise less DCB size */
TWE_Unit_Descriptor subunit[0]; /* subunit descriptors, in RAID10 mode is [mirunit][subunit] */
-} TWE_Array_Descriptor __packed;
+} __packed TWE_Array_Descriptor;
typedef struct
{
@@ -488,5 +488,5 @@
u_int8_t parameter_id;
u_int8_t parameter_size_bytes;
u_int8_t data[0];
-} TWE_Param __packed;
+} __packed TWE_Param;
==== //depot/projects/hammer/sys/dev/xe/if_xe.c#10 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/xe/if_xe.c,v 1.43 2003/11/05 08:27:13 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/xe/if_xe.c,v 1.44 2003/11/06 08:54:43 rsm Exp $");
/*
* Portions of this software were derived from Werner Koch's xirc2ps driver
@@ -184,7 +184,9 @@
* Debugging functions
*/
static void xe_mii_dump (struct xe_softc *scp);
-void xe_reg_dump (struct xe_softc *scp);
+#if 0
+static void xe_reg_dump (struct xe_softc *scp);
+#endif
/*
* Debug logging levels - set with hw.xe.debug sysctl
@@ -206,13 +208,17 @@
#define DEVPRINTF(level, arg) if (xe_debug >= (level)) device_printf arg
#define DPRINTF(level, arg) if (xe_debug >= (level)) printf arg
#define XE_MII_DUMP(scp) if (xe_debug >= 3) xe_mii_dump(scp)
+#if 0
#define XE_REG_DUMP(scp) if (xe_debug >= 3) xe_reg_dump(scp)
+#endif
#else
#define DEVPRINTF(level, arg)
#define DPRINTF(level, arg)
#define XE_MII_DUMP(scp)
+#if 0
#define XE_REG_DUMP(scp)
#endif
+#endif
/*
@@ -1828,6 +1834,7 @@
(void)splx(s);
}
+#if 0
void
xe_reg_dump(struct xe_softc *scp) {
int page, i, s;
@@ -1865,6 +1872,7 @@
(void)splx(s);
}
+#endif
int
xe_activate(device_t dev)
==== //depot/projects/hammer/sys/i386/acpica/madt.c#3 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/acpica/madt.c,v 1.3 2003/11/05 23:15:51 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/acpica/madt.c,v 1.4 2003/11/06 14:47:53 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -541,7 +541,8 @@
&old_pin) != 0)
printf("MADT: Could not find APIC for source IRQ %d\n",
intr->Source);
- else
+ else if (ioapic_get_vector(old_ioapic, old_pin) ==
+ intr->Source)
ioapic_disable_pin(old_ioapic, old_pin);
}
ioapic_set_triggermode(new_ioapic, new_pin,
==== //depot/projects/hammer/sys/ia64/ia64/unaligned.c#6 (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/unaligned.c,v 1.7 2003/11/03 08:04:04 marcel Exp $
+ * $FreeBSD: src/sys/ia64/ia64/unaligned.c,v 1.8 2003/11/06 04:26:40 marcel Exp $
*/
#include <sys/param.h>
@@ -74,12 +74,16 @@
greg_ptr(mcontext_t *mc, int gr)
{
uint64_t *p;
+ int bias, nslots;
if (gr <= 0 || gr >= 32 + (mc->mc_special.cfm & 0x7f))
return (NULL);
if (gr >= 32) {
p = (void*)mc->mc_special.bspstore;
- p += gr - 32;
+ nslots = (mc->mc_special.cfm & 0x7f) - gr + 32;
+ bias = (0x1f8 - (mc->mc_special.bspstore & 0x1f8)) >> 3;
+ nslots += (nslots + bias) / 63;
+ p -= nslots;
gr = 0;
} else if (gr >= 14) {
p = &mc->mc_scratch.gr14;
@@ -134,6 +138,13 @@
uint64_t postinc;
switch (i->i_op) {
+ case ASM_OP_LD2:
+ copyin((void*)va, (void*)&buf.i, 2);
+ reg = greg_ptr(mc, (int)i->i_oper[1].o_value);
+ if (reg == NULL)
+ return (EINVAL);
+ wrreg(reg, buf.i & 0xffffU);
+ break;
case ASM_OP_LD4:
copyin((void*)va, (void*)&buf.i, 4);
reg = greg_ptr(mc, (int)i->i_oper[1].o_value);
@@ -155,6 +166,27 @@
return (EINVAL);
spillfd((void*)&buf.d, reg);
break;
+ case ASM_OP_ST2:
+ reg = greg_ptr(mc, (int)i->i_oper[2].o_value);
+ if (reg == NULL)
+ return (EINVAL);
+ buf.i = rdreg(reg);
+ copyout((void*)&buf.i, (void*)va, 2);
+ break;
+ case ASM_OP_ST4:
+ reg = greg_ptr(mc, (int)i->i_oper[2].o_value);
+ if (reg == NULL)
+ return (EINVAL);
+ buf.i = rdreg(reg);
+ copyout((void*)&buf.i, (void*)va, 4);
+ break;
+ case ASM_OP_ST8:
+ reg = greg_ptr(mc, (int)i->i_oper[2].o_value);
+ if (reg == NULL)
+ return (EINVAL);
+ buf.i = rdreg(reg);
+ copyout((void*)&buf.i, (void*)va, 8);
+ break;
default:
return (ENOENT);
}
==== //depot/projects/hammer/sys/kern/kern_mac.c#21 (text+ko) ====
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.102 2003/10/22 20:59:31 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.103 2003/11/06 03:42:42 rwatson Exp $");
#include "opt_mac.h"
#include "opt_devfs.h"
@@ -560,7 +560,7 @@
buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
error = mac_externalize_cred_label(&tcred->cr_label, elements,
- buffer, mac.m_buflen, M_WAITOK);
+ buffer, mac.m_buflen);
if (error == 0)
error = copyout(buffer, mac.m_string, strlen(buffer)+1);
@@ -597,7 +597,7 @@
buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
error = mac_externalize_cred_label(&td->td_ucred->cr_label,
- elements, buffer, mac.m_buflen, M_WAITOK);
+ elements, buffer, mac.m_buflen);
if (error == 0)
error = copyout(buffer, mac.m_string, strlen(buffer)+1);
@@ -751,12 +751,12 @@
case DTYPE_VNODE:
if (error == 0)
error = mac_externalize_vnode_label(&intlabel,
- elements, buffer, mac.m_buflen, M_WAITOK);
+ elements, buffer, mac.m_buflen);
mac_destroy_vnode_label(&intlabel);
break;
case DTYPE_PIPE:
error = mac_externalize_pipe_label(&intlabel, elements,
- buffer, mac.m_buflen, M_WAITOK);
+ buffer, mac.m_buflen);
mac_destroy_pipe_label(&intlabel);
break;
default:
@@ -812,7 +812,7 @@
mac_init_vnode_label(&intlabel);
mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
error = mac_externalize_vnode_label(&intlabel, elements, buffer,
- mac.m_buflen, M_WAITOK);
+ mac.m_buflen);
NDFREE(&nd, 0);
mac_destroy_vnode_label(&intlabel);
@@ -867,7 +867,7 @@
mac_init_vnode_label(&intlabel);
mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel);
error = mac_externalize_vnode_label(&intlabel, elements, buffer,
- mac.m_buflen, M_WAITOK);
+ mac.m_buflen);
NDFREE(&nd, 0);
mac_destroy_vnode_label(&intlabel);
==== //depot/projects/hammer/sys/kern/sched_ule.c#17 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.78 2003/11/05 05:30:12 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.80 2003/11/06 07:56:01 jeff Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -106,8 +106,7 @@
#define ke_assign ke_procq.tqe_next
#define KEF_ASSIGNED KEF_SCHED0 /* KSE is being migrated. */
-#define KEF_PINNED KEF_SCHED1 /* KSE is temporarily bound. */
-#define KEF_BOUND KEF_SCHED2 /* KSE can not migrate. */
+#define KEF_BOUND KEF_SCHED1 /* KSE can not migrate. */
struct kg_sched {
int skg_slptime; /* Number of ticks we vol. slept */
@@ -267,7 +266,8 @@
static void kseq_assign(struct kseq *);
static struct kse *kseq_steal(struct kseq *kseq);
#define KSE_CAN_MIGRATE(ke, class) \
- ((class) != PRI_ITHD && ((ke)->ke_flags & (KEF_BOUND|KEF_PINNED)) == 0)
+ ((class) != PRI_ITHD && (ke)->ke_thread->td_pinned == 0 && \
+ ((ke)->ke_flags & KEF_BOUND) == 0)
#endif
void
@@ -1468,20 +1468,6 @@
}
void
-sched_pin(struct thread *td)
-{
- mtx_assert(&sched_lock, MA_OWNED);
- td->td_kse->ke_flags |= KEF_PINNED;
-}
-
-void
-sched_unpin(struct thread *td)
-{
- mtx_assert(&sched_lock, MA_OWNED);
- td->td_kse->ke_flags &= ~KEF_PINNED;
-}
-
-void
sched_bind(struct thread *td, int cpu)
{
struct kse *ke;
==== //depot/projects/hammer/sys/kern/sys_pipe.c#14 (text+ko) ====
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/sys_pipe.c,v 1.155 2003/11/03 17:58:23 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sys_pipe.c,v 1.157 2003/11/06 05:58:26 alc Exp $");
#include "opt_mac.h"
@@ -222,13 +222,10 @@
struct mtx *pmtx;
int fd, error;
- pmtx = malloc(sizeof(*pmtx), M_TEMP, M_WAITOK | M_ZERO);
-
rpipe = wpipe = NULL;
if (pipe_create(&rpipe) || pipe_create(&wpipe)) {
pipeclose(rpipe);
pipeclose(wpipe);
- free(pmtx, M_TEMP);
return (ENFILE);
}
@@ -239,7 +236,6 @@
if (error) {
pipeclose(rpipe);
pipeclose(wpipe);
- free(pmtx, M_TEMP);
return (error);
}
/* An extra reference on `rf' has been held for us by falloc(). */
@@ -269,7 +265,6 @@
fdrop(rf, td);
/* rpipe has been closed by fdrop(). */
pipeclose(wpipe);
- free(pmtx, M_TEMP);
return (error);
}
/* An extra reference on `wf' has been held for us by falloc(). */
@@ -293,6 +288,7 @@
mac_init_pipe(rpipe);
mac_create_pipe(td->td_ucred, rpipe);
#endif
+ pmtx = malloc(sizeof(*pmtx), M_TEMP, M_WAITOK | M_ZERO);
mtx_init(pmtx, "pipe mutex", NULL, MTX_DEF | MTX_RECURSE);
rpipe->pipe_mtxp = wpipe->pipe_mtxp = pmtx;
fdrop(rf, td);
@@ -311,9 +307,8 @@
struct pipe *cpipe;
int size;
{
- struct vm_object *object;
caddr_t buffer;
- int npages, error;
+ int error;
static int curfail = 0;
static struct timeval lastfail;
@@ -321,26 +316,19 @@
("pipespace: pipe mutex locked"));
size = round_page(size);
- npages = size / PAGE_SIZE;
/*
- * Create an object, I don't like the idea of paging to/from
- * kernel_object.
* XXX -- minor change needed here for NetBSD/OpenBSD VM systems.
*/
- object = vm_object_allocate(OBJT_DEFAULT, npages);
buffer = (caddr_t) vm_map_min(pipe_map);
/*
- * Insert the object into the kernel map, and allocate kva for it.
* The map entry is, by default, pageable.
* XXX -- minor change needed here for NetBSD/OpenBSD VM systems.
*/
- error = vm_map_find(pipe_map, object, 0,
+ error = vm_map_find(pipe_map, NULL, 0,
(vm_offset_t *) &buffer, size, 1,
VM_PROT_ALL, VM_PROT_ALL, 0);
-
if (error != KERN_SUCCESS) {
- vm_object_deallocate(object);
if (ppsratecheck(&lastfail, &curfail, 1))
printf("kern.maxpipekva exceeded, please see tuning(7).\n");
return (ENOMEM);
==== //depot/projects/hammer/sys/modules/Makefile#29 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/Makefile,v 1.353 2003/11/03 22:44:09 jhb Exp $
+# $FreeBSD: src/sys/modules/Makefile,v 1.354 2003/11/06 08:46:52 imp Exp $
.if !defined(NOCRYPT) || defined(ALL_MODULES)
.if exists(${.CURDIR}/../opencrypto)
@@ -324,6 +324,10 @@
SUBDIR=${MODULES_OVERRIDE}
.endif
+# pcic -- currently broken and being worked on out of tree.
+# oldcard -- specialized use for debugging only.
+# owi -- totally unsupported for debugging only.
+
# Calling kldxref(8) for each module is expensive.
.if !defined(NO_XREF)
.MAKEFLAGS+= -DNO_XREF
==== //depot/projects/hammer/sys/pci/if_xl.c#24 (text+ko) ====
@@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/pci/if_xl.c,v 1.157 2003/11/05 20:48:36 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/pci/if_xl.c,v 1.158 2003/11/06 03:59:03 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -135,7 +135,7 @@
MODULE_DEPEND(xl, ether, 1, 1, 1);
MODULE_DEPEND(xl, miibus, 1, 1, 1);
-/* "driver miibus" required. See GENERIC if you get errors here. */
+/* "device miibus" required. See GENERIC if you get errors here. */
#include "miibus_if.h"
#include <pci/if_xlreg.h>
==== //depot/projects/hammer/sys/security/mac/mac_internal.h#2 (text+ko) ====
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/security/mac/mac_internal.h,v 1.103 2003/10/25 15:28:20 rwatson Exp $
+ * $FreeBSD: src/sys/security/mac/mac_internal.h,v 1.104 2003/11/06 03:42:43 rwatson Exp $
*/
/*
@@ -101,7 +101,7 @@
int mac_check_cred_relabel(struct ucred *cred, struct label *newlabel);
void mac_destroy_cred_label(struct label *label);
int mac_externalize_cred_label(struct label *label, char *elements,
- char *outbuf, size_t outbuflen, int flags);
+ char *outbuf, size_t outbuflen);
void mac_init_cred_label(struct label *label);
int mac_internalize_cred_label(struct label *label, char *string);
void mac_relabel_cred(struct ucred *cred, struct label *newlabel);
@@ -109,12 +109,12 @@
void mac_copy_pipe_label(struct label *src, struct label *dest);
void mac_destroy_pipe_label(struct label *label);
int mac_externalize_pipe_label(struct label *label, char *elements,
- char *outbuf, size_t outbuflen, int flags);
+ char *outbuf, size_t outbuflen);
void mac_init_pipe_label(struct label *label);
int mac_internalize_pipe_label(struct label *label, char *string);
int mac_externalize_vnode_label(struct label *label, char *elements,
- char *outbuf, size_t outbuflen, int flags);
+ char *outbuf, size_t outbuflen);
int mac_internalize_vnode_label(struct label *label, char *string);
void mac_check_vnode_mmap_downgrade(struct ucred *cred, struct vnode *vp,
int *prot);
==== //depot/projects/hammer/sys/security/mac/mac_net.c#2 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/security/mac/mac_net.c,v 1.102 2003/10/25 15:28:20 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_net.c,v 1.103 2003/11/06 03:42:43 rwatson Exp $");
#include "opt_mac.h"
@@ -333,7 +333,7 @@
static int
mac_externalize_ifnet_label(struct label *label, char *elements,
- char *outbuf, size_t outbuflen, int flags)
+ char *outbuf, size_t outbuflen)
{
int error;
@@ -344,7 +344,7 @@
static int
mac_externalize_socket_label(struct label *label, char *elements,
- char *outbuf, size_t outbuflen, int flags)
+ char *outbuf, size_t outbuflen)
{
int error;
@@ -355,7 +355,7 @@
static int
mac_externalize_socket_peer_label(struct label *label, char *elements,
- char *outbuf, size_t outbuflen, int flags)
+ char *outbuf, size_t outbuflen)
{
int error;
@@ -768,7 +768,7 @@
buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
error = mac_externalize_ifnet_label(&ifnet->if_label, elements,
- buffer, mac.m_buflen, M_WAITOK);
+ buffer, mac.m_buflen);
if (error == 0)
error = copyout(buffer, mac.m_string, strlen(buffer)+1);
@@ -893,7 +893,7 @@
buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
error = mac_externalize_socket_label(&so->so_label, elements,
- buffer, mac->m_buflen, M_WAITOK);
+ buffer, mac->m_buflen);
if (error == 0)
error = copyout(buffer, mac->m_string, strlen(buffer)+1);
@@ -923,7 +923,7 @@
buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO);
error = mac_externalize_socket_peer_label(&so->so_peerlabel,
- elements, buffer, mac->m_buflen, M_WAITOK);
+ elements, buffer, mac->m_buflen);
if (error == 0)
error = copyout(buffer, mac->m_string, strlen(buffer)+1);
==== //depot/projects/hammer/sys/security/mac/mac_pipe.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/security/mac/mac_pipe.c,v 1.102 2003/10/25 15:28:20 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_pipe.c,v 1.103 2003/11/06 03:42:43 rwatson Exp $");
#include "opt_mac.h"
@@ -109,7 +109,7 @@
int
mac_externalize_pipe_label(struct label *label, char *elements,
- char *outbuf, size_t outbuflen, int flags)
+ char *outbuf, size_t outbuflen)
{
int error;
==== //depot/projects/hammer/sys/security/mac/mac_process.c#2 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/security/mac/mac_process.c,v 1.102 2003/10/25 15:28:20 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_process.c,v 1.103 2003/11/06 03:42:43 rwatson Exp $");
#include "opt_mac.h"
@@ -148,7 +148,7 @@
int
mac_externalize_cred_label(struct label *label, char *elements,
- char *outbuf, size_t outbuflen, int flags)
+ char *outbuf, size_t outbuflen)
{
int error;
==== //depot/projects/hammer/sys/security/mac/mac_vfs.c#2 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/security/mac/mac_vfs.c,v 1.102 2003/10/25 15:28:20 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/security/mac/mac_vfs.c,v 1.103 2003/11/06 03:42:43 rwatson Exp $");
#include "opt_mac.h"
#include "opt_devfs.h"
@@ -181,7 +181,7 @@
int
mac_externalize_vnode_label(struct label *label, char *elements,
- char *outbuf, size_t outbuflen, int flags)
+ char *outbuf, size_t outbuflen)
{
int error;
==== //depot/projects/hammer/sys/sys/proc.h#35 (text+ko) ====
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)proc.h 8.15 (Berkeley) 5/19/95
- * $FreeBSD: src/sys/sys/proc.h,v 1.353 2003/10/31 11:02:16 jeff Exp $
+ * $FreeBSD: src/sys/sys/proc.h,v 1.356 2003/11/06 09:31:01 bde Exp $
*/
#ifndef _SYS_PROC_H_
@@ -51,7 +51,7 @@
#include <sys/_mutex.h>
#include <sys/queue.h>
#include <sys/priority.h>
-#include <sys/rtprio.h> /* XXX */
+#include <sys/rtprio.h> /* XXX. */
#include <sys/runq.h>
#include <sys/sigio.h>
#include <sys/signal.h>
@@ -81,7 +81,7 @@
pid_t s_sid; /* (c) Session ID. */
/* (m) Setlogin() name: */
char s_login[roundup(MAXLOGNAME, sizeof(long))];
- struct mtx s_mtx; /* Mutex to protect members */
+ struct mtx s_mtx; /* Mutex to protect members. */
};
/*
@@ -255,54 +255,55 @@
struct thread {
struct proc *td_proc; /* (*) Associated process. */
struct ksegrp *td_ksegrp; /* (*) Associated KSEG. */
- TAILQ_ENTRY(thread) td_plist; /* (*) All threads in this proc */
- TAILQ_ENTRY(thread) td_kglist; /* (*) All threads in this ksegrp */
+ TAILQ_ENTRY(thread) td_plist; /* (*) All threads in this proc. */
+ TAILQ_ENTRY(thread) td_kglist; /* (*) All threads in this ksegrp. */
- /* The two queues below should someday be merged */
+ /* The two queues below should someday be merged. */
TAILQ_ENTRY(thread) td_slpq; /* (j) Sleep queue. XXXKSE */
TAILQ_ENTRY(thread) td_lockq; /* (j) Lock queue. XXXKSE */
TAILQ_ENTRY(thread) td_runq; /* (j/z) Run queue(s). XXXKSE */
TAILQ_HEAD(, selinfo) td_selq; /* (p) List of selinfos. */
-/* Cleared during fork1() or thread_sched_upcall() */
+/* Cleared during fork1() or thread_sched_upcall(). */
#define td_startzero td_flags
int td_flags; /* (j) TDF_* flags. */
- int td_inhibitors; /* (j) Why can not run */
+ int td_inhibitors; /* (j) Why can not run. */
int td_pflags; /* (k) Private thread (TDP_*) flags. */
- struct kse *td_last_kse; /* (j) Previous value of td_kse */
+ struct kse *td_last_kse; /* (j) Previous value of td_kse. */
struct kse *td_kse; /* (j) Current KSE if running. */
int td_dupfd; /* (k) Ret value from fdopen. XXX */
void *td_wchan; /* (j) Sleep address. */
const char *td_wmesg; /* (j) Reason for sleep. */
u_char td_lastcpu; /* (j) Last cpu we were on. */
u_char td_oncpu; /* (j) Which cpu we are on. */
- short td_locks; /* (k) DEBUG: lockmgr count of locks */
+ short td_locks; /* (k) DEBUG: lockmgr count of locks. */
struct mtx *td_blocked; /* (j) Mutex process is blocked on. */
struct ithd *td_ithd; /* (b) For interrupt threads only. */
const char *td_lockname; /* (j) Name of lock blocked on. */
LIST_HEAD(, mtx) td_contested; /* (j) Contested locks. */
struct lock_list_entry *td_sleeplocks; /* (k) Held sleep locks. */
int td_intr_nesting_level; /* (k) Interrupt recursion. */
- struct kse_thr_mailbox *td_mailbox; /* (*) Userland mailbox address */
+ int td_pinned; /* (k) Temporary cpu pin count. */
+ struct kse_thr_mailbox *td_mailbox; /* (*) Userland mailbox address. */
struct ucred *td_ucred; /* (k) Reference to credentials. */
- struct thread *td_standin; /* (*) Use this for an upcall */
+ struct thread *td_standin; /* (*) Use this for an upcall. */
u_int td_prticks; /* (*) Profclock hits in sys for user */
struct kse_upcall *td_upcall; /* (*) Upcall structure. */
u_int64_t td_sticks; /* (j) Statclock hits in system mode. */
- u_int td_uuticks; /* (*) Statclock in user, for UTS */
- u_int td_usticks; /* (*) Statclock in kernel, for UTS */
- int td_intrval; /* (*) Return value of TDF_INTERRUPT */
+ u_int td_uuticks; /* (*) Statclock in user, for UTS. */
+ u_int td_usticks; /* (*) Statclock in kernel, for UTS. */
+ int td_intrval; /* (*) Return value of TDF_INTERRUPT. */
sigset_t td_oldsigmask; /* (k) Saved mask from pre sigpause. */
sigset_t td_sigmask; /* (c) Current signal mask. */
sigset_t td_siglist; /* (c) Sigs arrived, not delivered. */
- sigset_t *td_waitset; /* (c) Wait set for sigwait */
+ sigset_t *td_waitset; /* (c) Wait set for sigwait. */
TAILQ_ENTRY(thread) td_umtx; /* (c?) Link for when we're blocked. */
volatile u_int td_generation; /* (k) Enable detection of preemption */
#define td_endzero td_base_pri
-/* Copied during fork1() or thread_sched_upcall() */
+/* Copied during fork1() or thread_sched_upcall(). */
#define td_startcopy td_endzero
u_char td_base_pri; /* (j) Thread base kernel priority. */
u_char td_priority; /* (j) Thread active priority. */
@@ -325,20 +326,20 @@
struct trapframe *td_frame; /* (k) */
struct vm_object *td_kstack_obj;/* (a) Kstack object. */
vm_offset_t td_kstack; /* (a) Kernel VA of kstack. */
- int td_kstack_pages; /* (a) Size of the kstack */
+ int td_kstack_pages; /* (a) Size of the kstack. */
struct vm_object *td_altkstack_obj;/* (a) Alternate kstack object. */
vm_offset_t td_altkstack; /* (a) Kernel VA of alternate kstack. */
int td_altkstack_pages; /* (a) Size of the alternate kstack */
u_int td_critnest; /* (k) Critical section nest level. */
struct mdthread td_md; /* (k) Any machine-dependent fields. */
- struct td_sched *td_sched; /* (*) Scheduler specific data */
+ struct td_sched *td_sched; /* (*) Scheduler-specific data. */
};
/* flags kept in td_flags */
#define TDF_INPANIC 0x000002 /* Caused a panic, let it drive crashdump. */
#define TDF_CAN_UNBIND 0x000004 /* Only temporarily bound. */
#define TDF_SINTR 0x000008 /* Sleep is interruptible. */
#define TDF_TIMEOUT 0x000010 /* Timing out during sleep. */
-#define TDF_IDLETD 0x000020 /* This is one of the per-CPU idle threads */
+#define TDF_IDLETD 0x000020 /* This is one of the per-CPU idle threads. */
#define TDF_SELECT 0x000040 /* Selecting; wakeup/waiting danger. */
#define TDF_CVWAITQ 0x000080 /* Thread is on a cv_waitq (not slpq). */
#define TDF_ONSLEEPQ 0x000200 /* On the sleep queue. */
@@ -349,7 +350,7 @@
#define TDF_OWEUPC 0x008000 /* Owe thread an addupc() call at next AST. */
#define TDF_NEEDRESCHED 0x010000 /* Thread needs to yield. */
#define TDF_NEEDSIGCHK 0x020000 /* Thread may need signal delivery. */
-#define TDF_SA 0x040000 /* A scheduler activation based thread */
+#define TDF_SA 0x040000 /* A scheduler activation based thread. */
#define TDF_UMTXWAKEUP 0x080000 /* Libthr thread must not sleep on a umtx. */
#define TDF_DEADLKTREAT 0x800000 /* Lock aquisition - deadlock treatment. */
@@ -443,14 +444,14 @@
} ke_state; /* (j) KSE status. */
#define ke_endzero ke_dummy
u_char ke_dummy;
- struct ke_sched *ke_sched; /* (*) Scheduler specific data */
+ struct ke_sched *ke_sched; /* (*) Scheduler-specific data. */
};
/* flags kept in ke_flags */
-#define KEF_SCHED0 0x00001 /* For scheduler specific use. */
-#define KEF_SCHED1 0x00002 /* For scheduler specific use. */
-#define KEF_SCHED2 0X00004 /* For scheduler specific use. */
-#define KEF_SCHED3 0x00008 /* For scheduler specific use. */
+#define KEF_SCHED0 0x00001 /* For scheduler-specific use. */
+#define KEF_SCHED1 0x00002 /* For scheduler-specific use. */
+#define KEF_SCHED2 0X00004 /* For scheduler-specific use. */
+#define KEF_SCHED3 0x00008 /* For scheduler-specific use. */
#define KEF_DIDRUN 0x02000 /* KSE actually ran. */
#define KEF_EXIT 0x04000 /* KSE is being killed. */
@@ -470,8 +471,8 @@
unsigned int ku_mflags; /* cached upcall mailbox flags */
};
-#define KUF_DOUPCALL 0x00001 /* Do upcall now, don't wait */
-#define KUF_EXITING 0x00002 /* Upcall structure is exiting */
+#define KUF_DOUPCALL 0x00001 /* Do upcall now, don't wait. */
+#define KUF_EXITING 0x00002 /* Upcall structure is exiting. */
/*
* Kernel-scheduled entity group (KSEG). The scheduler considers each KSEG to
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list