Date: Wed, 11 Sep 2002 13:22:55 -0700 (PDT) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 17388 for review Message-ID: <200209112022.g8BKMt41035497@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17388 Change 17388 by jhb@jhb_laptop on 2002/09/11 13:22:48 IFC @17385. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#47 integrate .. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#15 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_machdep.c#9 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/i386_module.c#6 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#19 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#17 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#27 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#9 integrate .. //depot/projects/smpng/sys/compat/linux/linux_sysctl.c#4 integrate .. //depot/projects/smpng/sys/compat/linux/linux_uid16.c#13 integrate .. //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#14 integrate .. //depot/projects/smpng/sys/conf/NOTES#23 integrate .. //depot/projects/smpng/sys/conf/files#49 integrate .. //depot/projects/smpng/sys/conf/files.i386#30 integrate .. //depot/projects/smpng/sys/conf/options#35 integrate .. //depot/projects/smpng/sys/conf/options.i386#17 integrate .. //depot/projects/smpng/sys/conf/options.pc98#19 integrate .. //depot/projects/smpng/sys/conf/options.x86_64#2 integrate .. //depot/projects/smpng/sys/ddb/db_ps.c#11 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#32 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#11 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#19 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#15 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#9 integrate .. //depot/projects/smpng/sys/dev/en/midway.c#3 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#23 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#18 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#17 integrate .. //depot/projects/smpng/sys/dev/isp/ispvar.h#16 integrate .. //depot/projects/smpng/sys/dev/mii/brgphy.c#9 integrate .. //depot/projects/smpng/sys/dev/mii/miidevs#7 integrate .. //depot/projects/smpng/sys/dev/mii/miidevs.h#7 integrate .. //depot/projects/smpng/sys/dev/pccard/card_if.m#7 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard.c#12 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#16 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#16 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#18 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#16 integrate .. //depot/projects/smpng/sys/dev/pci/pci_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/pci/pci_private.h#4 integrate .. //depot/projects/smpng/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/smpng/sys/dev/puc/puc.c#7 integrate .. //depot/projects/smpng/sys/dev/puc/pucvar.h#4 integrate .. //depot/projects/smpng/sys/dev/sab/sab.c#2 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro3.c#11 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_ctl.c#14 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_ioctl.c#9 integrate .. //depot/projects/smpng/sys/geom/geom.h#10 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#11 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#9 integrate .. //depot/projects/smpng/sys/geom/geom_dump.c#6 integrate .. //depot/projects/smpng/sys/geom/geom_mbr.c#9 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#9 integrate .. //depot/projects/smpng/sys/geom/geom_sunlabel.c#9 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#11 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#27 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#41 integrate .. //depot/projects/smpng/sys/i386/i386/bios.c#12 integrate .. //depot/projects/smpng/sys/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#11 integrate .. //depot/projects/smpng/sys/i386/i386/initcpu.c#10 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#44 integrate .. //depot/projects/smpng/sys/i386/i386/nexus.c#5 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#26 integrate .. //depot/projects/smpng/sys/i386/ibcs2/imgact_coff.c#11 integrate .. //depot/projects/smpng/sys/i386/include/pci_cfgreg.h#3 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#25 integrate .. //depot/projects/smpng/sys/i386/linux/linux_genassym.c#3 integrate .. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#16 integrate .. //depot/projects/smpng/sys/i386/linux/linux_ptrace.c#3 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#21 integrate .. //depot/projects/smpng/sys/i386/pci/pci_bus.c#8 integrate .. //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#12 integrate .. //depot/projects/smpng/sys/i386/svr4/svr4_genassym.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/i4b_hdlc.c#1 branch .. //depot/projects/smpng/sys/i4b/layer1/i4b_hdlc.h#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_hdlc.h#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_pci.c#5 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#20 integrate .. //depot/projects/smpng/sys/ia64/conf/SKI#6 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#42 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#17 integrate .. //depot/projects/smpng/sys/kern/bus_if.m#5 integrate .. //depot/projects/smpng/sys/kern/imgact_aout.c#16 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#19 integrate .. //depot/projects/smpng/sys/kern/init_main.c#23 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#19 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#12 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#43 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#46 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#44 integrate .. //depot/projects/smpng/sys/kern/kern_idle.c#10 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#21 integrate .. //depot/projects/smpng/sys/kern/kern_kthread.c#8 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#2 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#48 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#35 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#46 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#20 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#31 integrate .. //depot/projects/smpng/sys/kern/kern_tc.c#15 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#6 integrate .. //depot/projects/smpng/sys/kern/kern_timeout.c#9 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#11 integrate .. //depot/projects/smpng/sys/kern/subr_rman.c#9 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#14 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#59 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#20 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#23 integrate .. //depot/projects/smpng/sys/kern/tty.c#27 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#31 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#44 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#9 integrate .. //depot/projects/smpng/sys/libkern/strlcat.c#2 integrate .. //depot/projects/smpng/sys/libkern/strlcpy.c#2 integrate .. //depot/projects/smpng/sys/modules/Makefile#32 integrate .. //depot/projects/smpng/sys/modules/aout/Makefile#1 branch .. //depot/projects/smpng/sys/modules/if_gre/Makefile#1 branch .. //depot/projects/smpng/sys/modules/linux/Makefile#9 integrate .. //depot/projects/smpng/sys/modules/pccbb/Makefile#2 delete .. //depot/projects/smpng/sys/modules/pecoff/Makefile#2 integrate .. //depot/projects/smpng/sys/net/ethernet.h#6 integrate .. //depot/projects/smpng/sys/net/if_gif.c#11 integrate .. //depot/projects/smpng/sys/net/if_gif.h#6 integrate .. //depot/projects/smpng/sys/net/if_gre.c#1 branch .. //depot/projects/smpng/sys/net/if_gre.h#1 branch .. //depot/projects/smpng/sys/netatalk/at.h#2 integrate .. //depot/projects/smpng/sys/netgraph/ng_ksocket.c#15 integrate .. //depot/projects/smpng/sys/netinet/in.h#15 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#14 integrate .. //depot/projects/smpng/sys/netinet/in_proto.c#4 integrate .. //depot/projects/smpng/sys/netinet/ip_gre.c#1 branch .. //depot/projects/smpng/sys/netinet/ip_gre.h#1 branch .. //depot/projects/smpng/sys/netinet/ip_mroute.c#16 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#8 integrate .. //depot/projects/smpng/sys/netns/ns.h#4 integrate .. //depot/projects/smpng/sys/netns/ns_if.h#3 integrate .. //depot/projects/smpng/sys/nfs/nfsnode.h#4 delete .. //depot/projects/smpng/sys/nfsclient/nfs.h#10 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#13 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#16 integrate .. //depot/projects/smpng/sys/nfsclient/nfsmount.h#4 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#39 integrate .. //depot/projects/smpng/sys/pccard/pccard.c#15 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#19 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#15 integrate .. //depot/projects/smpng/sys/pci/if_rlreg.h#7 integrate .. //depot/projects/smpng/sys/pci/if_sf.c#9 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#9 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#12 integrate .. //depot/projects/smpng/sys/posix4/ksched.c#8 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#9 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#17 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#33 integrate .. //depot/projects/smpng/sys/sys/bio.h#9 integrate .. //depot/projects/smpng/sys/sys/dirent.h#3 integrate .. //depot/projects/smpng/sys/sys/disklabel.h#19 integrate .. //depot/projects/smpng/sys/sys/extattr.h#5 integrate .. //depot/projects/smpng/sys/sys/imgact_aout.h#6 integrate .. //depot/projects/smpng/sys/sys/linker_set.h#3 integrate .. //depot/projects/smpng/sys/sys/nlist_aout.h#2 integrate .. //depot/projects/smpng/sys/sys/proc.h#57 integrate .. //depot/projects/smpng/sys/sys/snoop.h#5 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/smpng/sys/sys/systm.h#35 integrate .. //depot/projects/smpng/sys/sys/timetc.h#9 integrate .. //depot/projects/smpng/sys/sys/ucontext.h#3 integrate .. //depot/projects/smpng/sys/sys/vnode.h#24 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#9 integrate .. //depot/projects/smpng/sys/ufs/ufs/inode.h#5 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#18 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#20 integrate .. //depot/projects/smpng/sys/vm/swap_pager.h#4 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#17 integrate .. //depot/projects/smpng/sys/vm/vm_meter.c#9 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#15 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#47 (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/alpha/alpha/machdep.c,v 1.183 2002/08/31 03:33:30 peter Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.184 2002/09/07 19:12:27 jmallett Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -1387,6 +1387,8 @@ sf.sf_si.si_signo = sig; sf.sf_si.si_code = code; sf.sf_si.si_addr = (void*)frame->tf_regs[FRAME_TRAPARG_A0]; + sf.sf_si.si_pid = p->p_pid; + sf.sf_si.si_uid = p->p_ucred->cr_uid; } else frame->tf_regs[FRAME_A1] = code; ==== //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#15 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.70 2002/08/15 20:55:00 rwatson Exp $ + * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.71 2002/09/07 01:26:33 peter Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -395,29 +395,6 @@ } /* - * Dump the machine specific header information at the start of a core dump. - */ -int -cpu_coredump(td, vp, cred) - struct thread *td; - struct vnode *vp; - struct ucred *cred; -{ - int error; - - /* XXXKSE this is totally bogus! (and insecure) */ - error = vn_rdwr(UIO_WRITE, vp, (caddr_t) td->td_proc->p_uarea, - ctob(UAREA_PAGES), (off_t)0, - UIO_SYSSPACE, IO_UNIT, cred, NOCRED, (int *)NULL, td); - if (error) - return error; - error = vn_rdwr(UIO_WRITE, vp, (caddr_t) td->td_kstack, - ctob(KSTACK_PAGES), (off_t)ctob(UAREA_PAGES), - UIO_SYSSPACE, IO_UNIT, cred, NOCRED, (int *)NULL, td); - return error; -} - -/* * Map an IO request into kernel virtual address space. * * All requests are (re)mapped into kernel VA space. ==== //depot/projects/smpng/sys/alpha/linux/linux_machdep.c#9 (text+ko) ==== @@ -25,7 +25,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/alpha/linux/linux_machdep.c,v 1.22 2002/06/29 17:26:12 julian Exp $ + * $FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.23 2002/09/11 08:13:52 julian Exp $ */ #include <sys/param.h> @@ -180,6 +180,7 @@ * Make this runnable after we are finished with it. */ mtx_lock_spin(&sched_lock); + TD_SET_CAN_RUN(td2); setrunqueue(FIRST_THREAD_IN_PROC(p2)); mtx_unlock_spin(&sched_lock); ==== //depot/projects/smpng/sys/boot/i386/libi386/i386_module.c#6 (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/boot/i386/libi386/i386_module.c,v 1.8 2002/08/30 11:11:02 iwasaki Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/i386_module.c,v 1.9 2002/09/05 11:16:23 iwasaki Exp $ */ /* @@ -44,16 +44,24 @@ i386_autoload(void) { int error; + int disabled; + char *rv; /* XXX use PnP to locate stuff here */ /* autoload ACPI support */ /* XXX should be in 4th keyed off acpi_load */ - if ((getenv("acpi_load") && !getenv("hint.acpi.0.disabled"))) { + disabled = 0; + rv = getenv("hint.acpi.0.disabled"); + if (rv != NULL && strncmp(rv, "0", 1) != 0) { + disabled = 1; + } + + if (getenv("acpi_load") && (!disabled)) { error = mod_load("acpi", NULL, 0, NULL); if (error != 0) printf("ACPI autoload failed - %s\n", strerror(error)); } - + return(0); } ==== //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#19 (text+ko) ==== @@ -38,7 +38,7 @@ * * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 * - * $FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.53 2002/06/29 17:26:13 julian Exp $ + * $FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.54 2002/09/11 08:13:52 julian Exp $ */ #include <sys/param.h> @@ -566,18 +566,13 @@ break; } switch(td2->td_state) { - case TDS_SLP: - case TDS_MTX: + case TDS_INHIBITED: state = "S (sleeping)"; break; case TDS_RUNQ: case TDS_RUNNING: state = "R (running)"; break; - case TDS_NEW: - case TDS_UNQUEUED: - case TDS_IWAIT: - case TDS_SURPLUS: default: state = "? (unknown)"; break; ==== //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#17 (text+ko) ==== @@ -25,7 +25,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/compat/linux/linux_ioctl.c,v 1.88 2002/08/18 07:04:58 sobomax Exp $ + * $FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.89 2002/09/05 02:51:25 marcel Exp $ */ #include <sys/param.h> @@ -700,7 +700,10 @@ error = (ioctl(td, (struct ioctl_args *)args)); break; - /* LINUX_TIOCSCTTY */ + case LINUX_TIOCSCTTY: + args->cmd = TIOCSCTTY; + error = (ioctl(td, (struct ioctl_args *)args)); + break; case LINUX_TIOCGPGRP: args->cmd = TIOCGPGRP; ==== //depot/projects/smpng/sys/compat/linux/linux_misc.c#27 (text+ko) ==== @@ -25,27 +25,25 @@ * (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/compat/linux/linux_misc.c,v 1.126 2002/09/01 22:30:24 iedowse Exp $ + * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.128 2002/09/05 12:30:54 bde Exp $ */ -#include "opt_compat.h" #include "opt_mac.h" #include <sys/param.h> -#include <sys/systm.h> +#include <sys/blist.h> #include <sys/fcntl.h> #include <sys/imgact_aout.h> #include <sys/jail.h> #include <sys/kernel.h> #include <sys/lock.h> #include <sys/mac.h> +#include <sys/malloc.h> #include <sys/mman.h> #include <sys/mount.h> #include <sys/mutex.h> #include <sys/namei.h> -#include <sys/poll.h> #include <sys/proc.h> -#include <sys/blist.h> #include <sys/reboot.h> #include <sys/resourcevar.h> #include <sys/signalvar.h> @@ -53,8 +51,8 @@ #include <sys/syscallsubr.h> #include <sys/sysctl.h> #include <sys/sysproto.h> +#include <sys/systm.h> #include <sys/time.h> -#include <sys/unistd.h> #include <sys/vmmeter.h> #include <sys/vnode.h> #include <sys/wait.h> @@ -73,6 +71,7 @@ #include <machine/../linux/linux.h> #include <machine/../linux/linux_proto.h> + #include <compat/linux/linux_mib.h> #include <compat/linux/linux_util.h> @@ -601,7 +600,7 @@ error = munmap(td, &bsd_args); } - td->td_retval[0] = error ? 0 : (u_long)args->addr; + td->td_retval[0] = error ? 0 : (uintptr_t)args->addr; return error; } ==== //depot/projects/smpng/sys/compat/linux/linux_stats.c#9 (text+ko) ==== @@ -25,7 +25,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/compat/linux/linux_stats.c,v 1.45 2002/09/01 22:30:24 iedowse Exp $ + * $FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.46 2002/09/05 08:13:20 bde Exp $ */ #include "opt_mac.h" @@ -37,15 +37,16 @@ #include <sys/filedesc.h> #include <sys/proc.h> #include <sys/mac.h> +#include <sys/malloc.h> #include <sys/mount.h> #include <sys/namei.h> #include <sys/stat.h> -#include <sys/sysctl.h> #include <sys/systm.h> #include <sys/vnode.h> #include <machine/../linux/linux.h> #include <machine/../linux/linux_proto.h> + #include <compat/linux/linux_util.h> static int ==== //depot/projects/smpng/sys/compat/linux/linux_sysctl.c#4 (text+ko) ==== @@ -25,19 +25,15 @@ * (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/compat/linux/linux_sysctl.c,v 1.3 2002/09/01 22:30:24 iedowse Exp $ + * $FreeBSD: src/sys/compat/linux/linux_sysctl.c,v 1.4 2002/09/05 08:13:20 bde Exp $ */ -#include "opt_compat.h" - #include <sys/param.h> +#include <sys/malloc.h> #include <sys/systm.h> -#include <sys/proc.h> -#include <sys/sysproto.h> #include <machine/../linux/linux.h> #include <machine/../linux/linux_proto.h> -#include <compat/linux/linux_util.h> #define LINUX_CTL_KERN 1 #define LINUX_CTL_VM 2 ==== //depot/projects/smpng/sys/compat/linux/linux_uid16.c#13 (text+ko) ==== @@ -23,21 +23,21 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_uid16.c,v 1.8 2002/09/01 22:30:24 iedowse Exp $ + * $FreeBSD: src/sys/compat/linux/linux_uid16.c,v 1.9 2002/09/05 08:13:20 bde Exp $ */ -#include "opt_compat.h" - #include <sys/param.h> -#include <sys/systm.h> #include <sys/lock.h> +#include <sys/malloc.h> #include <sys/mutex.h> #include <sys/proc.h> #include <sys/syscallsubr.h> #include <sys/sysproto.h> +#include <sys/systm.h> #include <machine/../linux/linux.h> #include <machine/../linux/linux_proto.h> + #include <compat/linux/linux_util.h> DUMMY(setfsuid16); ==== //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#14 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD$ */ -/* $FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.21 2002/09/01 21:41:22 jake Exp $ */ +/* $FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.25 2002/09/07 22:31:44 peter Exp $ */ /* * Copyright (c) 2000 Masaru OKI @@ -43,7 +43,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include <sys/param.h> #include <sys/systm.h> #include <sys/imgact.h> @@ -173,6 +172,7 @@ register struct ucred *cred = td->td_ucred; struct proc *p = td->td_proc; register struct vmspace *vm = p->p_vmspace; + char *tempuser; int error; #ifdef PECOFF_DEBUG struct vm_map *map; @@ -180,12 +180,21 @@ struct reg regs; #endif - if (ctob((UAREA_PAGES+KSTACK_PAGES) + vm->vm_dsize + vm->vm_ssize) >= limit) + if (ctob((uarea_pages + kstack_pages) + vm->vm_dsize + vm->vm_ssize) >= + limit) return (EFAULT); + tempuser = malloc(ctob(uarea_pages + kstack_pages), M_TEMP, + M_WAITOK | M_ZERO); + if (tempuser == NULL) + return (ENOMEM); PROC_LOCK(p); fill_kinfo_proc(p, &p->p_uarea->u_kproc); PROC_UNLOCK(p); - + bcopy(p->p_uarea, tempuser, sizeof(struct user)); + bcopy(td->td_frame, + tempuser + ctob(uarea_pages) + + ((caddr_t)td->td_frame - (caddr_t)td->td_kstack), + sizeof(struct trapframe)); #if PECOFF_DEBUG fill_regs(td, ®s); printf("EIP%x\n", regs.r_eip); @@ -195,17 +204,21 @@ ent = &map->header; printf("%p %p %p\n", ent, ent->prev, ent->next); #endif - error = cpu_coredump(td, vp, cred); + error = vn_rdwr(UIO_WRITE, vp, (caddr_t)tempuser, + ctob(uarea_pages + kstack_pages), + (off_t)0, UIO_SYSSPACE, IO_UNIT, cred, NOCRED, + (int *)NULL, td); + free(tempuser, M_TEMP); if (error == 0) error = vn_rdwr_inchunks(UIO_WRITE, vp, vm->vm_daddr, (int)ctob(vm->vm_dsize), - (off_t)ctob((UAREA_PAGES+KSTACK_PAGES)), + (off_t)ctob((uarea_pages + kstack_pages)), UIO_USERSPACE, IO_UNIT, cred, NOCRED, (int *)NULL, td); if (error == 0) error = vn_rdwr_inchunks(UIO_WRITE, vp, (caddr_t)trunc_page(USRSTACK - ctob(vm->vm_ssize)), round_page(ctob(vm->vm_ssize)), - (off_t)ctob((UAREA_PAGES+KSTACK_PAGES)) + + (off_t)ctob((uarea_pages + kstack_pages)) + ctob(vm->vm_dsize), UIO_USERSPACE, IO_UNIT, cred, NOCRED, (int *)NULL, td); return (error); ==== //depot/projects/smpng/sys/conf/NOTES#23 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1071 2002/09/03 19:21:39 jhb Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1075 2002/09/11 05:33:09 njl Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -177,7 +177,7 @@ # debug.mutex.prof.collisions - number of hash collisions # debug.mutex.prof.stats - profiling statistics # -options MUTEX_PROFILING +options MUTEX_PROFILING ##################################################################### @@ -427,6 +427,8 @@ # The `gif' device implements IPv6 over IP4 tunneling, # IPv4 over IPv6 tunneling, IPv4 over IPv4 tunneling and # IPv6 over IPv6 tunneling. +# The `gre' device implements two types of IP4 over IP4 tunneling: +# GRE and MOBILE, as specified in the RFC1701 and RFC2004. # The XBONEHACK option allows the same pair of addresses to be configured on # multiple gif interfaces. # The `faith' device captures packets sent to it and diverts them @@ -453,6 +455,7 @@ device tap #Virtual Ethernet driver device tun #Tunnel driver (ppp(8), nos-tun(8)) device sl #Serial Line IP +device gre #IP over IP tunneling device ppp #Point-to-point protocol options PPP_BSDCOMP #PPP BSD-compress support options PPP_DEFLATE #PPP zlib/deflate/gzip support @@ -628,7 +631,7 @@ options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework options SMBFS #SMB/CIFS filesystem -options UDF #Universal Disk Format +options UDF #Universal Disk Format options UMAPFS #UID map filesystem options UNIONFS #Union filesystem # options NODEVFS #disable devices filesystem @@ -748,10 +751,10 @@ ##################################################################### # SECURITY POLICY PARAMETERS -# Support for Mandatory Access Control (MAC) -#options MAC -#options MAC_DEBUG -#options MAC_NONE # Statically link mac_none policy +# Support for Mandatory Access Control (MAC): +options MAC +options MAC_DEBUG +options MAC_NONE # Statically link mac_none policy ##################################################################### @@ -1049,7 +1052,6 @@ device splash # Splash screen and screen saver support # Various screen savers. -device apm_saver # Requires APM device blank_saver device daemon_saver device fade_saver @@ -1228,14 +1230,14 @@ options AHC_TMODE_ENABLE # Compile in aic79xx debugging code. -options AHD_DEBUG +options AHD_DEBUG # Aic79xx driver debugging options. # See the ahd(4) manpage -options AHD_DEBUG_OPTS=0xFFFFFFFF +options AHD_DEBUG_OPTS=0xFFFFFFFF # Print human-readable register definitions when debugging -options AHD_REG_PRETTY_PRINT +options AHD_REG_PRETTY_PRINT # The adw driver will attempt to use memory mapped I/O for all PCI # controllers that have it configured only if this option is set. @@ -1845,12 +1847,6 @@ device joy # PnP aware, hints for nonpnp only hint.joy.0.at="isa" hint.joy.0.port="0x201" -device cy 1 -options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared -hint.cy.0.at="isa" -hint.cy.0.irq="10" -hint.cy.0.maddr="0xd4000" -hint.cy.0.msize="0x2000" device dgb 1 options NDGBPORTS=17 hint.dgb.0.at="isa" ==== //depot/projects/smpng/sys/conf/files#49 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.696 2002/09/02 20:16:22 brooks Exp $ +# $FreeBSD: src/sys/conf/files,v 1.697 2002/09/06 17:12:50 sobomax Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1054,6 +1054,7 @@ net/if_faith.c optional faith net/if_fddisubr.c optional fddi net/if_gif.c optional gif +net/if_gre.c optional gre net/if_iso88025subr.c optional token net/if_loop.c optional loop net/if_media.c standard @@ -1216,6 +1217,7 @@ netinet/igmp.c optional inet netinet/in.c optional inet netinet/in_gif.c optional gif inet +netinet/ip_gre.c optional gre inet netinet/ip_id.c optional inet netinet/in_pcb.c optional inet netinet/in_proto.c optional inet ==== //depot/projects/smpng/sys/conf/files.i386#30 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.415 2002/09/02 00:52:04 brooks Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.418 2002/09/11 12:44:53 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -192,7 +192,7 @@ i386/i386/db_interface.c optional ddb i386/i386/db_trace.c optional ddb i386/i386/dump_machdep.c standard -i386/i386/elan-mmcr.c optional elan-mmcr +i386/i386/elan-mmcr.c optional cpu_elan i386/i386/elf_machdep.c standard i386/i386/exception.s standard i386/i386/i386-gdbstub.c optional ddb @@ -304,6 +304,8 @@ # # isdn4bsd, needed for isic | iwic | ifpi | ifpi2 | ihfc | ifpnp | itjc # +i4b/layer1/i4b_hdlc.c optional itjc +i4b/layer1/i4b_hdlc.c optional ihfc i4b/layer1/i4b_l1dmux.c optional isic i4b/layer1/i4b_l1lib.c optional isic i4b/layer1/i4b_l1dmux.c optional iwic @@ -395,7 +397,7 @@ isa/psm.c optional psm isa/syscons_isa.c optional sc isa/vga_isa.c optional vga -kern/imgact_aout.c standard +kern/imgact_aout.c optional compat_aout kern/imgact_gzip.c optional gzip kern/md4c.c optional netsmb kern/subr_diskmbr.c standard ==== //depot/projects/smpng/sys/conf/options#35 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.346 2002/09/01 07:13:10 scottl Exp $ +# $FreeBSD: src/sys/conf/options,v 1.348 2002/09/07 22:07:10 peter Exp $ # # On the handling of kernel options # @@ -88,6 +88,7 @@ GDBSPEED opt_ddb.h GEOM HW_WDOG +KSTACK_PAGES KTRACE KTRACE_REQUEST_POOL opt_ktrace.h LIBICONV @@ -327,6 +328,7 @@ LIBMCHAIN NCP opt_ncp.h NETATALK opt_atalk.h +NS opt_ns.h PPP_BSDCOMP opt_ppp.h PPP_DEFLATE opt_ppp.h PPP_FILTER opt_ppp.h ==== //depot/projects/smpng/sys/conf/options.i386#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.176 2002/07/15 19:11:21 jhb Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.180 2002/09/07 22:07:11 peter Exp $ # Options specific to the i386 platform kernels MATH_EMULATE opt_math_emulate.h @@ -18,11 +18,11 @@ I586_PMC_GUPROF opt_i586_guprof.h COMPAT_OLDISA BROKEN_KEYBOARD_RESET opt_reset.h -KSTACK_PAGES # Options for emulators. These should only be used at config time, so # they are handled like options for static filesystems # (see src/sys/conf/options), except for broken debugging options. +COMPAT_AOUT opt_dontuse.h IBCS2 opt_dontuse.h COMPAT_LINUX opt_dontuse.h COMPAT_SVR4 opt_dontuse.h @@ -47,6 +47,7 @@ CPU_CYRIX_NO_LOCK opt_cpu.h CPU_DIRECT_MAPPED_CACHE opt_cpu.h CPU_DISABLE_5X86_LSSER opt_cpu.h +CPU_ELAN opt_cpu.h CPU_FASTER_5X86_FPU opt_cpu.h CPU_I486_ON_386 opt_cpu.h CPU_IORT opt_cpu.h @@ -62,6 +63,7 @@ NO_MEMORY_HOLE opt_cpu.h CPU_ENABLE_SSE opt_cpu.h CPU_ATHLON_SSE_HACK opt_cpu.h +CPU_DISABLE_SSE opt_cpu.h # The CPU type affects the endian conversion functions all over the kernel. I386_CPU opt_global.h ==== //depot/projects/smpng/sys/conf/options.pc98#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.151 2002/07/15 19:11:21 jhb Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.153 2002/09/07 22:07:11 peter Exp $ # Options specific to the pc98 platform kernels MATH_EMULATE opt_math_emulate.h @@ -18,7 +18,6 @@ I586_PMC_GUPROF opt_i586_guprof.h COMPAT_OLDISA BROKEN_KEYBOARD_RESET opt_reset.h -KSTACK_PAGES # Options for emulators. These should only be used at config time, so # they are handled like options for static filesystems @@ -62,6 +61,7 @@ NO_MEMORY_HOLE opt_cpu.h CPU_ENABLE_SSE opt_cpu.h CPU_ATHLON_SSE_HACK opt_cpu.h +CPU_DISABLE_SSE opt_cpu.h # The CPU type affects the endian conversion functions all over the kernel. I386_CPU opt_global.h ==== //depot/projects/smpng/sys/conf/options.x86_64#2 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/sys/conf/options.x86_64,v 1.1 2002/06/30 08:05:21 obrien Exp $ +# $FreeBSD: src/sys/conf/options.x86_64,v 1.2 2002/09/07 22:07:11 peter Exp $ # Options specific to the AMD x86-64 platform kernels PANIC_REBOOT_WAIT_TIME opt_panic.h MAXMEM PERFMON opt_perfmon.h -KSTACK_PAGES # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h ==== //depot/projects/smpng/sys/ddb/db_ps.c#11 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ddb/db_ps.c,v 1.31 2002/08/31 04:25:44 bde Exp $ + * $FreeBSD: src/sys/ddb/db_ps.c,v 1.32 2002/09/11 08:13:52 julian Exp $ */ #include <sys/param.h> #include <sys/systm.h> @@ -112,7 +112,7 @@ state = "wait"; break; case PRS_ZOMBIE: - state = "zomp"; + state = "zomb"; break; default: state = "Unkn"; @@ -123,33 +123,56 @@ p->p_ucred != NULL ? p->p_ucred->cr_ruid : 0, pp->p_pid, p->p_pgrp != NULL ? p->p_pgrp->pg_id : 0, p->p_flag, state); - if (p->p_flag & P_KSES) { + if (p->p_flag & P_KSES) db_printf("(threaded) %s\n", p->p_comm); - FOREACH_THREAD_IN_PROC(p, td) { - db_printf( ". . . . . . . " - ". thread %p . . . ", td); - if (td->td_wchan != NULL) { - db_printf("SLP %6s %8p\n", td->td_wmesg, - (void *)td->td_wchan); - } else if (td->td_state == TDS_MTX) { - db_printf("MTX %6s %8p\n", td->td_mtxname, - (void *)td->td_blocked); - } else { - db_printf("--not blocked--\n"); + FOREACH_THREAD_IN_PROC(p, td) { + if (p->p_flag & P_KSES) + db_printf( " thread %p ", td); + if (TD_ON_SLEEPQ(td)) { + if (td->td_flags & TDF_CVWAITQ) + db_printf("[CVQ "); + else + db_printf("[SLPQ "); + db_printf(" %6s %8p]", td->td_wmesg, + (void *)td->td_wchan); + } + switch (td->td_state) { + case TDS_INHIBITED: + if (TD_ON_MUTEX(td)) { + db_printf("[MTX %6s %8p]", + td->td_mtxname, + (void *)td->td_blocked); + } + if (TD_IS_SLEEPING(td)) { + db_printf("[SLP]"); + } + if (TD_IS_SWAPPED(td)) { + db_printf("[SWAP]"); + } + if (TD_IS_SUSPENDED(td)) { + db_printf("[SUSP]"); + } + if (TD_AWAITING_INTR(td)) { + db_printf("[IWAIT]"); } + break; + case TDS_CAN_RUN: + db_printf("[Can run]"); + break; + case TDS_RUNQ: + db_printf("[RUNQ]"); + break; + case TDS_RUNNING: + db_printf("[CPU %d]", td->td_kse->ke_oncpu); + break; + default: + panic("unknown thread state"); } - } else { - td = FIRST_THREAD_IN_PROC(p); - if (td != NULL && td->td_wchan != NULL) { - db_printf(" %-6s %8p", td->td_wmesg, - (void *)td->td_wchan); - } else if (td != NULL && td->td_state == TDS_MTX) { - db_printf(" %6s %8p", td->td_mtxname, - (void *)td->td_blocked); - } else { - db_printf(" "); - } - db_printf(" %s\n", p->p_comm); + if (p->p_flag & P_KSES) + db_printf("\n"); + else + db_printf(" %s\n", p->p_comm); + } /* PROC_UNLOCK(p); */ ==== //depot/projects/smpng/sys/dev/acpica/acpi.c#32 (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/dev/acpica/acpi.c,v 1.72 2002/08/30 11:11:07 iwasaki Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.75 2002/09/06 17:01:06 jhb Exp $ */ #include "opt_acpi.h" @@ -103,8 +103,6 @@ static int acpi_probe(device_t dev); static int acpi_attach(device_t dev); static device_t acpi_add_child(device_t bus, int order, const char *name, int unit); -static int acpi_print_resources(struct resource_list *rl, const char *name, int type, - const char *format); static int acpi_print_child(device_t bus, device_t child); static int acpi_read_ivar(device_t dev, device_t child, int index, uintptr_t *result); static int acpi_write_ivar(device_t dev, device_t child, int index, uintptr_t value); @@ -453,8 +451,6 @@ freeenv(debugpoint); } #endif - if (!acpi_disabled("bus")) - acpi_probe_children(dev); /* * Register our shutdown handlers @@ -504,6 +500,9 @@ /* Register ACPI again to pass the correct argument of pm_func. */ power_pm_register(POWER_PM_TYPE_ACPI, acpi_pm_func, sc); + if (!acpi_disabled("bus")) + acpi_probe_children(dev); + error = 0; out: @@ -532,41 +531,7 @@ return(child); } >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200209112022.g8BKMt41035497>