PERFORCE change 115353 for review
Matt Jacob
mjacob at FreeBSD.org
Mon Mar 5 18:48:32 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=115353
Change 115353 by mjacob at mjexp on 2007/03/05 18:48:19
IFC
Affected files ...
.. //depot/projects/mjexp/sys/amd64/amd64/io_apic.c#4 integrate
.. //depot/projects/mjexp/sys/conf/files#15 integrate
.. //depot/projects/mjexp/sys/dev/pci/pci.c#12 integrate
.. //depot/projects/mjexp/sys/dev/pci/pcireg.h#7 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/envy24.c#5 integrate
.. //depot/projects/mjexp/sys/geom/eli/g_eli_ctl.c#2 integrate
.. //depot/projects/mjexp/sys/i386/i386/io_apic.c#4 integrate
.. //depot/projects/mjexp/sys/i386/isa/clock.c#7 integrate
.. //depot/projects/mjexp/sys/kern/kern_acl.c#5 delete
.. //depot/projects/mjexp/sys/kern/kern_context.c#3 integrate
.. //depot/projects/mjexp/sys/kern/kern_descrip.c#7 integrate
.. //depot/projects/mjexp/sys/kern/kern_environment.c#4 integrate
.. //depot/projects/mjexp/sys/kern/kern_exec.c#5 integrate
.. //depot/projects/mjexp/sys/kern/kern_exit.c#4 integrate
.. //depot/projects/mjexp/sys/kern/kern_ktrace.c#8 integrate
.. //depot/projects/mjexp/sys/kern/kern_ntptime.c#5 integrate
.. //depot/projects/mjexp/sys/kern/kern_prot.c#6 integrate
.. //depot/projects/mjexp/sys/kern/kern_resource.c#9 integrate
.. //depot/projects/mjexp/sys/kern/kern_sig.c#10 integrate
.. //depot/projects/mjexp/sys/kern/kern_synch.c#9 integrate
.. //depot/projects/mjexp/sys/kern/kern_sysctl.c#5 integrate
.. //depot/projects/mjexp/sys/kern/kern_time.c#6 integrate
.. //depot/projects/mjexp/sys/kern/kern_umtx.c#8 integrate
.. //depot/projects/mjexp/sys/kern/kern_uuid.c#2 integrate
.. //depot/projects/mjexp/sys/kern/kern_xxx.c#4 integrate
.. //depot/projects/mjexp/sys/kern/p1003_1b.c#3 integrate
.. //depot/projects/mjexp/sys/kern/sys_generic.c#5 integrate
.. //depot/projects/mjexp/sys/kern/sys_pipe.c#4 integrate
.. //depot/projects/mjexp/sys/kern/sysv_msg.c#7 integrate
.. //depot/projects/mjexp/sys/kern/sysv_sem.c#4 integrate
.. //depot/projects/mjexp/sys/kern/sysv_shm.c#5 integrate
.. //depot/projects/mjexp/sys/kern/uipc_mqueue.c#3 integrate
.. //depot/projects/mjexp/sys/kern/uipc_sem.c#4 integrate
.. //depot/projects/mjexp/sys/kern/uipc_syscalls.c#6 integrate
.. //depot/projects/mjexp/sys/kern/vfs_acl.c#1 branch
.. //depot/projects/mjexp/sys/kern/vfs_aio.c#4 integrate
.. //depot/projects/mjexp/sys/kern/vfs_cache.c#2 integrate
.. //depot/projects/mjexp/sys/kern/vfs_mount.c#7 integrate
.. //depot/projects/mjexp/sys/kern/vfs_syscalls.c#8 integrate
Differences ...
==== //depot/projects/mjexp/sys/amd64/amd64/io_apic.c#4 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.26 2006/11/17 16:41:03 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.27 2007/03/05 16:22:49 jhb Exp $");
#include "opt_isa.h"
@@ -36,11 +36,15 @@
#include <sys/systm.h>
#include <sys/bus.h>
#include <sys/kernel.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
-#include <sys/lock.h>
+#include <sys/module.h>
#include <sys/mutex.h>
#include <sys/sysctl.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+
#include <vm/vm.h>
#include <vm/pmap.h>
@@ -727,3 +731,46 @@
if (pin->io_irq < NUM_IO_INTS)
intr_register_source(&pin->io_intsrc);
}
+
+/* A simple new-bus driver to consume PCI I/O APIC devices. */
+static int
+ioapic_pci_probe(device_t dev)
+{
+
+ if (pci_get_class(dev) == PCIC_BASEPERIPH &&
+ pci_get_subclass(dev) == PCIS_BASEPERIPH_PIC) {
+ switch (pci_get_progif(dev)) {
+ case PCIP_BASEPERIPH_PIC_IO_APIC:
+ device_set_desc(dev, "IO APIC");
+ break;
+ case PCIP_BASEPERIPH_PIC_IOX_APIC:
+ device_set_desc(dev, "IO(x) APIC");
+ break;
+ default:
+ return (ENXIO);
+ }
+ device_quiet(dev);
+ return (-10000);
+ }
+ return (ENXIO);
+}
+
+static int
+ioapic_pci_attach(device_t dev)
+{
+
+ return (0);
+}
+
+static device_method_t ioapic_pci_methods[] = {
+ /* Device interface */
+ DEVMETHOD(device_probe, ioapic_pci_probe),
+ DEVMETHOD(device_attach, ioapic_pci_attach),
+
+ { 0, 0 }
+};
+
+DEFINE_CLASS_0(ioapic, ioapic_pci_driver, ioapic_pci_methods, 0);
+
+static devclass_t ioapic_devclass;
+DRIVER_MODULE(ioapic, pci, ioapic_pci_driver, ioapic_devclass, 0, 0);
==== //depot/projects/mjexp/sys/conf/files#15 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1180 2007/02/27 04:01:57 mjacob Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1181 2007/03/05 13:24:01 rwatson Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -1325,7 +1325,6 @@
kern/init_sysent.c standard
kern/ksched.c optional _kposix_priority_scheduling
kern/kern_acct.c standard
-kern/kern_acl.c standard
kern/kern_alq.c optional alq
kern/kern_clock.c standard
kern/kern_condvar.c standard
@@ -1455,6 +1454,7 @@
kern/uipc_socket2.c standard
kern/uipc_syscalls.c standard
kern/uipc_usrreq.c standard
+kern/vfs_acl.c standard
kern/vfs_aio.c optional vfs_aio
kern/vfs_bio.c standard
kern/vfs_cache.c standard
==== //depot/projects/mjexp/sys/dev/pci/pci.c#12 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.343 2007/02/17 16:56:39 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.344 2007/03/05 16:21:59 jhb Exp $");
#include "opt_bus.h"
@@ -327,7 +327,7 @@
0, 0,
};
- return maptype[mapreg & 0x0f];
+ return (maptype[mapreg & 0x0f]);
}
/* return log2 of map size decoded for memory or port map */
@@ -624,11 +624,11 @@
KASSERT((reg & 3) == 0, ("VPD register must by 4 byte aligned"));
- WREG(cfg->vpd.vpd_reg + 2, reg, 2);
- while ((REG(cfg->vpd.vpd_reg + 2, 2) & 0x8000) != 0x8000)
+ WREG(cfg->vpd.vpd_reg + PCIR_VPD_ADDR, reg, 2);
+ while ((REG(cfg->vpd.vpd_reg + PCIR_VPD_ADDR, 2) & 0x8000) != 0x8000)
DELAY(1); /* limit looping */
- return REG(cfg->vpd.vpd_reg + 4, 4);
+ return (REG(cfg->vpd.vpd_reg + PCIR_VPD_DATA, 4));
}
#if 0
@@ -637,9 +637,9 @@
{
KASSERT((reg & 3) == 0, ("VPD register must by 4 byte aligned"));
- WREG(cfg->vpd.vpd_reg + 4, data, 4);
- WREG(cfg->vpd.vpd_reg + 2, reg | 0x8000, 2);
- while ((REG(cfg->vpd.vpd_reg + 2, 2) & 0x8000) == 0x8000)
+ WREG(cfg->vpd.vpd_reg + PCIR_VPD_DATA, data, 4);
+ WREG(cfg->vpd.vpd_reg + PCIR_VPD_ADDR, reg | 0x8000, 2);
+ while ((REG(cfg->vpd.vpd_reg + PCIR_VPD_ADDR, 2) & 0x8000) == 0x8000)
DELAY(1); /* limit looping */
return;
@@ -673,7 +673,7 @@
}
vrs->cksum += byte;
- return byte;
+ return (byte);
}
static void
@@ -918,9 +918,9 @@
*identptr = cfg->vpd.vpd_ident;
if (*identptr == NULL)
- return ENXIO;
+ return (ENXIO);
- return 0;
+ return (0);
}
int
@@ -938,10 +938,10 @@
}
if (i != cfg->vpd.vpd_rocnt)
- return 0;
+ return (0);
*vptr = NULL;
- return ENXIO;
+ return (ENXIO);
}
/*
@@ -3070,7 +3070,7 @@
if ((flags & RF_ACTIVE) &&
bus_generic_activate_resource(dev, child, type,
*rid, rle->res) != 0)
- return NULL;
+ return (NULL);
return (rle->res);
}
}
==== //depot/projects/mjexp/sys/dev/pci/pcireg.h#7 (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/dev/pci/pcireg.h,v 1.58 2007/02/02 19:48:25 jhb Exp $
+ * $FreeBSD: src/sys/dev/pci/pcireg.h,v 1.59 2007/03/05 16:18:31 jhb Exp $
*
*/
@@ -252,7 +252,13 @@
#define PCIC_SIMPLECOMM 0x07
#define PCIS_SIMPLECOMM_UART 0x00
+#define PCIP_SIMPLECOMM_UART_8250 0x00
+#define PCIP_SIMPLECOMM_UART_16450A 0x01
#define PCIP_SIMPLECOMM_UART_16550A 0x02
+#define PCIP_SIMPLECOMM_UART_16650A 0x03
+#define PCIP_SIMPLECOMM_UART_16750A 0x04
+#define PCIP_SIMPLECOMM_UART_16850A 0x05
+#define PCIP_SIMPLECOMM_UART_16950A 0x06
#define PCIS_SIMPLECOMM_PAR 0x01
#define PCIS_SIMPLECOMM_MULSER 0x02
#define PCIS_SIMPLECOMM_MODEM 0x03
@@ -260,6 +266,11 @@
#define PCIC_BASEPERIPH 0x08
#define PCIS_BASEPERIPH_PIC 0x00
+#define PCIP_BASEPERIPH_PIC_8259A 0x00
+#define PCIP_BASEPERIPH_PIC_ISA 0x01
+#define PCIP_BASEPERIPH_PIC_EISA 0x02
+#define PCIP_BASEPERIPH_PIC_IO_APIC 0x10
+#define PCIP_BASEPERIPH_PIC_IOX_APIC 0x20
#define PCIS_BASEPERIPH_DMA 0x01
#define PCIS_BASEPERIPH_TIMER 0x02
#define PCIS_BASEPERIPH_RTC 0x03
@@ -339,7 +350,6 @@
#define PCIB_BCR_DISCARD_TIMER_SERREN 0x0800
/* PCI power manangement */
-
#define PCIR_POWER_CAP 0x2
#define PCIM_PCAP_SPEC 0x0007
#define PCIM_PCAP_PMEREQCLK 0x0008
@@ -386,6 +396,10 @@
#define PCIR_POWER_DATA 0x7
+/* VPD capability registers */
+#define PCIR_VPD_ADDR 0x2
+#define PCIR_VPD_DATA 0x4
+
/* PCI Message Signalled Interrupts (MSI) */
#define PCIR_MSI_CTRL 0x2
#define PCIM_MSICTRL_VECTOR 0x0100
==== //depot/projects/mjexp/sys/dev/sound/pci/envy24.c#5 (text+ko) ====
@@ -35,7 +35,7 @@
#include "mixer_if.h"
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.8 2007/02/23 19:41:16 ariff Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.9 2007/03/05 07:45:38 ariff Exp $");
MALLOC_DEFINE(M_ENVY24, "envy24", "envy24 audio");
@@ -2413,15 +2413,16 @@
mixer_init(dev, &envy24mixer_class, sc);
/* set channel information */
- err = pcm_register(dev, sc, 5, 2 + sc->adcn);
+ err = pcm_register(dev, sc, sc->dacn, sc->adcn);
if (err)
goto bad;
- sc->chnum = 0;
- for (i = 0; i < 5; i++) {
+ sc->chnum = ENVY24_CHAN_PLAY_DAC1;
+ for (i = 0; i < sc->dacn; i++) {
pcm_addchan(dev, PCMDIR_PLAY, &envy24chan_class, sc);
sc->chnum++;
}
- for (i = 0; i < 2 + sc->adcn; i++) {
+ sc->chnum = ENVY24_CHAN_REC_ADC1;
+ for (i = 0; i < sc->adcn; i++) {
pcm_addchan(dev, PCMDIR_REC, &envy24chan_class, sc);
sc->chnum++;
}
==== //depot/projects/mjexp/sys/geom/eli/g_eli_ctl.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/geom/eli/g_eli_ctl.c,v 1.11 2006/09/30 08:16:49 pjd Exp $");
+__FBSDID("$FreeBSD: src/sys/geom/eli/g_eli_ctl.c,v 1.12 2007/03/05 12:41:44 pjd Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -355,6 +355,10 @@
gctl_error(req, "Invalid sector size.");
return;
}
+ if (*sectorsize > PAGE_SIZE) {
+ gctl_error(req, "warning: Using sectorsize bigger than "
+ "the page size!");
+ }
md.md_sectorsize = *sectorsize;
}
==== //depot/projects/mjexp/sys/i386/i386/io_apic.c#4 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/io_apic.c,v 1.30 2006/11/17 16:41:03 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/io_apic.c,v 1.31 2007/03/05 16:22:49 jhb Exp $");
#include "opt_isa.h"
@@ -36,11 +36,15 @@
#include <sys/systm.h>
#include <sys/bus.h>
#include <sys/kernel.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
-#include <sys/lock.h>
+#include <sys/module.h>
#include <sys/mutex.h>
#include <sys/sysctl.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+
#include <vm/vm.h>
#include <vm/pmap.h>
@@ -727,3 +731,46 @@
if (pin->io_irq < NUM_IO_INTS)
intr_register_source(&pin->io_intsrc);
}
+
+/* A simple new-bus driver to consume PCI I/O APIC devices. */
+static int
+ioapic_pci_probe(device_t dev)
+{
+
+ if (pci_get_class(dev) == PCIC_BASEPERIPH &&
+ pci_get_subclass(dev) == PCIS_BASEPERIPH_PIC) {
+ switch (pci_get_progif(dev)) {
+ case PCIP_BASEPERIPH_PIC_IO_APIC:
+ device_set_desc(dev, "IO APIC");
+ break;
+ case PCIP_BASEPERIPH_PIC_IOX_APIC:
+ device_set_desc(dev, "IO(x) APIC");
+ break;
+ default:
+ return (ENXIO);
+ }
+ device_quiet(dev);
+ return (-10000);
+ }
+ return (ENXIO);
+}
+
+static int
+ioapic_pci_attach(device_t dev)
+{
+
+ return (0);
+}
+
+static device_method_t ioapic_pci_methods[] = {
+ /* Device interface */
+ DEVMETHOD(device_probe, ioapic_pci_probe),
+ DEVMETHOD(device_attach, ioapic_pci_attach),
+
+ { 0, 0 }
+};
+
+DEFINE_CLASS_0(ioapic, ioapic_pci_driver, ioapic_pci_methods, 0);
+
+static devclass_t ioapic_devclass;
+DRIVER_MODULE(ioapic, pci, ioapic_pci_driver, ioapic_devclass, 0, 0);
==== //depot/projects/mjexp/sys/i386/isa/clock.c#7 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.234 2007/03/04 04:55:19 nyan Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.235 2007/03/05 09:10:17 bde Exp $");
/*
* Routines to handle clock hardware.
@@ -579,6 +579,7 @@
/* Restore all of the RTC's "status" (actually, control) registers. */
/* XXX locking is needed for RTC access. */
+ rtc_reg = -1;
writertc(RTC_STATUSB, RTCSB_24HR);
writertc(RTC_STATUSA, rtc_statusa);
writertc(RTC_STATUSB, rtc_statusb);
==== //depot/projects/mjexp/sys/kern/kern_context.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_context.c,v 1.8 2007/03/04 22:36:45 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_context.c,v 1.9 2007/03/05 13:10:57 rwatson Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -39,9 +39,9 @@
#include <sys/ucontext.h>
/*
- * The first two fields of a ucontext_t are the signal mask and
- * the machine context. The next field is uc_link; we want to
- * avoid destroying the link when copying out contexts.
+ * The first two fields of a ucontext_t are the signal mask and the machine
+ * context. The next field is uc_link; we want to avoid destroying the link
+ * when copying out contexts.
*/
#define UC_COPY_SIZE offsetof(ucontext_t, uc_link)
==== //depot/projects/mjexp/sys/kern/kern_descrip.c#7 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.304 2007/03/04 22:36:45 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.305 2007/03/05 13:10:57 rwatson Exp $");
#include "opt_compat.h"
#include "opt_ddb.h"
@@ -263,7 +263,7 @@
/*
* Duplicate a file descriptor to a particular value.
*
- * note: keep in mind that a potential race condition exists when closing
+ * Note: keep in mind that a potential race condition exists when closing
* descriptors from a shared descriptor table (via rfork).
*/
#ifndef _SYS_SYSPROTO_H_
@@ -2187,8 +2187,8 @@
/*
* Apply an advisory lock on a file descriptor.
*
- * Just attempt to get a record lock of the requested type on
- * the entire file (l_whence = SEEK_SET, l_start = 0, l_len = 0).
+ * Just attempt to get a record lock of the requested type on the entire file
+ * (l_whence = SEEK_SET, l_start = 0, l_len = 0).
*/
#ifndef _SYS_SYSPROTO_H_
struct flock_args {
==== //depot/projects/mjexp/sys/kern/kern_environment.c#4 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_environment.c,v 1.46 2006/11/06 13:42:00 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_environment.c,v 1.47 2007/03/05 13:10:57 rwatson Exp $");
#include "opt_mac.h"
@@ -69,8 +69,7 @@
struct mtx kenv_lock;
/*
- * No need to protect this with a mutex
- * since SYSINITS are single threaded.
+ * No need to protect this with a mutex since SYSINITS are single threaded.
*/
int dynamic_kenv = 0;
==== //depot/projects/mjexp/sys/kern/kern_exec.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.300 2007/03/04 22:36:45 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.301 2007/03/05 13:10:57 rwatson Exp $");
#include "opt_hwpmc_hooks.h"
#include "opt_ktrace.h"
@@ -221,11 +221,11 @@
}
/*
- * XXX: kern_execve has the astonishing property of not always
- * returning to the caller. If sufficiently bad things happen during
- * the call to do_execve(), it can end up calling exit1(); as a result,
- * callers must avoid doing anything which they might need to undo
- * (e.g., allocating memory).
+ * XXX: kern_execve has the astonishing property of not always returning to
+ * the caller. If sufficiently bad things happen during the call to
+ * do_execve(), it can end up calling exit1(); as a result, callers must
+ * avoid doing anything which they might need to undo (e.g., allocating
+ * memory).
*/
int
kern_execve(td, args, mac_p)
@@ -950,8 +950,8 @@
}
/*
- * Copy out argument and environment strings from the old process
- * address space into the temporary string buffer.
+ * Copy out argument and environment strings from the old process address
+ * space into the temporary string buffer.
*/
int
exec_copyin_args(struct image_args *args, char *fname,
@@ -1053,9 +1053,9 @@
}
/*
- * Copy strings out to the new process address space, constructing
- * new arg and env vector tables. Return a pointer to the base
- * so that it can be used as the initial stack pointer.
+ * Copy strings out to the new process address space, constructing new arg
+ * and env vector tables. Return a pointer to the base so that it can be used
+ * as the initial stack pointer.
*/
register_t *
exec_copyout_strings(imgp)
==== //depot/projects/mjexp/sys/kern/kern_exit.c#4 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.295 2007/03/04 22:36:46 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.296 2007/03/05 13:10:57 rwatson Exp $");
#include "opt_compat.h"
#include "opt_ktrace.h"
@@ -89,8 +89,7 @@
void (*nlminfo_release_p)(struct proc *p);
/*
- * exit --
- * Death of process.
+ * exit -- death of process.
*/
void
sys_exit(struct thread *td, struct sys_exit_args *uap)
@@ -101,9 +100,9 @@
}
/*
- * Exit: deallocate address space and other resources, change proc state
- * to zombie, and unlink proc from allproc and parent's lists. Save exit
- * status and rusage for wait(). Check for child processes and orphan them.
+ * Exit: deallocate address space and other resources, change proc state to
+ * zombie, and unlink proc from allproc and parent's lists. Save exit status
+ * and rusage for wait(). Check for child processes and orphan them.
*/
void
exit1(struct thread *td, int rv)
==== //depot/projects/mjexp/sys/kern/kern_ktrace.c#8 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_ktrace.c,v 1.116 2007/03/04 22:36:46 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_ktrace.c,v 1.117 2007/03/05 13:10:57 rwatson Exp $");
#include "opt_ktrace.h"
#include "opt_mac.h"
@@ -556,9 +556,6 @@
/* Interface and common routines */
-/*
- * ktrace system call
- */
#ifndef _SYS_SYSPROTO_H_
struct ktrace_args {
char *fname;
@@ -729,9 +726,6 @@
#endif /* KTRACE */
}
-/*
- * utrace system call
- */
/* ARGSUSED */
int
utrace(td, uap)
==== //depot/projects/mjexp/sys/kern/kern_ntptime.c#5 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_ntptime.c,v 1.62 2007/03/04 22:36:46 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_ntptime.c,v 1.63 2007/03/05 13:10:57 rwatson Exp $");
#include "opt_ntp.h"
@@ -249,9 +249,8 @@
/*
* ntp_gettime() - NTP user application interface
*
- * See the timex.h header file for synopsis and API description. Note
- * that the TAI offset is returned in the ntvtimeval.tai structure
- * member.
+ * See the timex.h header file for synopsis and API description. Note that
+ * the TAI offset is returned in the ntvtimeval.tai structure member.
*/
#ifndef _SYS_SYSPROTO_H_
struct ntp_gettime_args {
@@ -294,12 +293,13 @@
SYSCTL_OPAQUE(_kern_ntp_pll, OID_AUTO, pps_freq, CTLFLAG_RD, &pps_freq, sizeof(pps_freq), "I", "");
SYSCTL_OPAQUE(_kern_ntp_pll, OID_AUTO, time_freq, CTLFLAG_RD, &time_freq, sizeof(time_freq), "I", "");
#endif
+
/*
* ntp_adjtime() - NTP daemon application interface
*
- * See the timex.h header file for synopsis and API description. Note
- * that the timex.constant structure member has a dual purpose to set
- * the time constant and to set the TAI offset.
+ * See the timex.h header file for synopsis and API description. Note that
+ * the timex.constant structure member has a dual purpose to set the time
+ * constant and to set the TAI offset.
*/
#ifndef _SYS_SYSPROTO_H_
struct ntp_adjtime_args {
==== //depot/projects/mjexp/sys/kern/kern_prot.c#6 (text+ko) ====
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_prot.c,v 1.208 2007/03/04 22:36:46 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_prot.c,v 1.209 2007/03/05 13:10:57 rwatson Exp $");
#include "opt_compat.h"
#include "opt_mac.h"
@@ -983,10 +983,9 @@
}
/*
- * setresuid(ruid, euid, suid) is like setreuid except control over the
- * saved uid is explicit.
+ * setresuid(ruid, euid, suid) is like setreuid except control over the saved
+ * uid is explicit.
*/
-
#ifndef _SYS_SYSPROTO_H_
struct setresuid_args {
uid_t ruid;
@@ -1065,10 +1064,9 @@
}
/*
- * setresgid(rgid, egid, sgid) is like setregid except control over the
- * saved gid is explicit.
+ * setresgid(rgid, egid, sgid) is like setregid except control over the saved
+ * gid is explicit.
*/
-
#ifndef _SYS_SYSPROTO_H_
struct setresgid_args {
gid_t rgid;
==== //depot/projects/mjexp/sys/kern/kern_resource.c#9 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_resource.c,v 1.168 2007/03/04 22:36:46 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_resource.c,v 1.169 2007/03/05 13:10:57 rwatson Exp $");
#include "opt_compat.h"
@@ -78,7 +78,6 @@
/*
* Resource controls and accounting.
*/
-
#ifndef _SYS_SYSPROTO_H_
struct getpriority_args {
int which;
@@ -280,7 +279,6 @@
struct rtprio *rtp;
};
#endif
-
int
rtprio_thread(struct thread *td, struct rtprio_thread_args *uap)
{
@@ -373,7 +371,6 @@
struct rtprio *rtp;
};
#endif
-
int
rtprio(td, uap)
struct thread *td; /* curthread */
==== //depot/projects/mjexp/sys/kern/kern_sig.c#10 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.340 2007/03/04 22:36:46 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.341 2007/03/05 13:10:57 rwatson Exp $");
#include "opt_compat.h"
#include "opt_ktrace.h"
@@ -546,8 +546,6 @@
* Determine signal that should be delivered to process p, the current
* process, 0 if none. If there is a pending stop signal with default
* action, the process stops in issignal().
- *
- * MP SAFE.
*/
int
cursig(struct thread *td)
@@ -1023,10 +1021,6 @@
return (error);
}
-/*
- * sigprocmask() - MP SAFE
- */
-
#ifndef _SYS_SYSPROTO_H_
struct sigprocmask_args {
int how;
@@ -1058,9 +1052,6 @@
}
#ifdef COMPAT_43 /* XXX - COMPAT_FBSD3 */
-/*
- * osigprocmask() - MP SAFE
- */
#ifndef _SYS_SYSPROTO_H_
struct osigprocmask_args {
int how;
@@ -1433,8 +1424,8 @@
#endif /* COMPAT_43 */
/*
- * Suspend calling thread until signal, providing mask to be set
- * in the meantime.
+ * Suspend calling thread until signal, providing mask to be set in the
+ * meantime.
*/
#ifndef _SYS_SYSPROTO_H_
struct sigsuspend_args {
@@ -1754,7 +1745,6 @@
/* union sigval */ void *value;
};
#endif
-
int
sigqueue(struct thread *td, struct sigqueue_args *uap)
{
==== //depot/projects/mjexp/sys/kern/kern_synch.c#9 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.289 2007/02/27 18:46:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.290 2007/03/05 13:10:57 rwatson Exp $");
#include "opt_ktrace.h"
@@ -565,7 +565,7 @@
}
/*
- * General purpose yield system call
+ * General purpose yield system call.
*/
int
yield(struct thread *td, struct yield_args *uap)
==== //depot/projects/mjexp/sys/kern/kern_sysctl.c#5 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_sysctl.c,v 1.173 2007/03/04 22:36:46 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_sysctl.c,v 1.174 2007/03/05 13:10:57 rwatson Exp $");
#include "opt_compat.h"
#include "opt_mac.h"
@@ -1294,7 +1294,6 @@
size_t newlen;
};
#endif
-
int
__sysctl(struct thread *td, struct sysctl_args *uap)
{
@@ -1446,6 +1445,7 @@
/* the actual string data is appended here */
} bsdi_si;
+
/*
* this data is appended to the end of the bsdi_si structure during copyout.
* The "char *" offsets are relative to the base of the bsdi_si struct.
@@ -1462,7 +1462,6 @@
int arg;
};
#endif
-
int
ogetkerninfo(struct thread *td, struct getkerninfo_args *uap)
{
==== //depot/projects/mjexp/sys/kern/kern_time.c#6 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_time.c,v 1.138 2007/03/04 22:36:46 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_time.c,v 1.139 2007/03/05 13:10:57 rwatson Exp $");
#include "opt_mac.h"
@@ -186,7 +186,6 @@
struct timespec *tp;
};
#endif
-
/* ARGSUSED */
int
clock_gettime(struct thread *td, struct clock_gettime_args *uap)
@@ -255,7 +254,6 @@
const struct timespec *tp;
};
#endif
-
/* ARGSUSED */
int
clock_settime(struct thread *td, struct clock_settime_args *uap)
@@ -297,7 +295,6 @@
struct timespec *tp;
};
#endif
-
int
clock_getres(struct thread *td, struct clock_getres_args *uap)
{
@@ -395,7 +392,6 @@
struct timespec *rmtp;
};
#endif
-
/* ARGSUSED */
int
nanosleep(struct thread *td, struct nanosleep_args *uap)
@@ -505,25 +501,25 @@
}
/*
- * Get value of an interval timer. The process virtual and
- * profiling virtual time timers are kept in the p_stats area, since
- * they can be swapped out. These are kept internally in the
- * way they are specified externally: in time until they expire.
+ * Get value of an interval timer. The process virtual and profiling virtual
+ * time timers are kept in the p_stats area, since they can be swapped out.
+ * These are kept internally in the way they are specified externally: in
+ * time until they expire.
*
- * The real time interval timer is kept in the process table slot
- * for the process, and its value (it_value) is kept as an
- * absolute time rather than as a delta, so that it is easy to keep
- * periodic real-time signals from drifting.
+ * The real time interval timer is kept in the process table slot for the
+ * process, and its value (it_value) is kept as an absolute time rather than
+ * as a delta, so that it is easy to keep periodic real-time signals from
+ * drifting.
*
* Virtual time timers are processed in the hardclock() routine of
- * kern_clock.c. The real time timer is processed by a timeout
- * routine, called from the softclock() routine. Since a callout
- * may be delayed in real time due to interrupt processing in the system,
- * it is possible for the real time timeout routine (realitexpire, given below),
- * to be delayed in real time past when it is supposed to occur. It
- * does not suffice, therefore, to reload the real timer .it_value from the
- * real time timers .it_interval. Rather, we compute the next time in
- * absolute time the timer should go off.
+ * kern_clock.c. The real time timer is processed by a timeout routine,
+ * called from the softclock() routine. Since a callout may be delayed in
+ * real time due to interrupt processing in the system, it is possible for
+ * the real time timeout routine (realitexpire, given below), to be delayed
+ * in real time past when it is supposed to occur. It does not suffice,
+ * therefore, to reload the real timer .it_value from the real time timers
+ * .it_interval. Rather, we compute the next time in absolute time the timer
+ * should go off.
*/
#ifndef _SYS_SYSPROTO_H_
struct getitimer_args {
@@ -583,7 +579,6 @@
struct itimerval *itv, *oitv;
};
#endif
-
int
setitimer(struct thread *td, struct setitimer_args *uap)
{
@@ -932,7 +927,6 @@
int * timerid;
};
#endif
-
int
ktimer_create(struct thread *td, struct ktimer_create_args *uap)
{
@@ -1072,7 +1066,6 @@
int timerid;
};
#endif
-
int
ktimer_delete(struct thread *td, struct ktimer_delete_args *uap)
{
@@ -1137,7 +1130,6 @@
struct itimerspec * ovalue;
};
#endif
-
int
ktimer_settime(struct thread *td, struct ktimer_settime_args *uap)
{
@@ -1179,7 +1171,6 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list