From owner-freebsd-smp Tue Jun 20 16: 7: 9 2000 Delivered-To: freebsd-smp@freebsd.org Received: from apollo.backplane.com (apollo.backplane.com [216.240.41.2]) by hub.freebsd.org (Postfix) with ESMTP id 8E72E37B811 for ; Tue, 20 Jun 2000 16:07:00 -0700 (PDT) (envelope-from dillon@apollo.backplane.com) Received: (from dillon@localhost) by apollo.backplane.com (8.9.3/8.9.1) id QAA89331; Tue, 20 Jun 2000 16:05:25 -0700 (PDT) (envelope-from dillon) Date: Tue, 20 Jun 2000 16:05:25 -0700 (PDT) From: Matthew Dillon Message-Id: <200006202305.QAA89331@apollo.backplane.com> To: Brian Somers Cc: Warner Losh , Jason Evans , freebsd-smp@FreeBSD.ORG, brian@hak.lan.Awfulhak.org Subject: Re: HEADS UP: Destabilization due to SMP development References: <200006202015.VAA66308@hak.lan.Awfulhak.org> Sender: owner-freebsd-smp@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org (note: redirected to freebsd-smp) : :What about doing the changes on a branch with the understanding that :the branch will *replace* HEAD when it stabilises ? : :This sounds odd at first glance, but it means that others are forced :to MFC into the smp branch - if they don't they lose. : :Anybody that's not confident to be able to merge into the smp branch :will simply be in the same position - merge or hold off. They'd also :be just as likely to break the smp work with their commits as if the :smp work was done in HEAD. Won't work. Too many files are being messed with. Just to give people an idea of the number of files being modified, these are the Index: lines from my diff set so far: Index: conf/Makefile.i386 Index: conf/files Index: conf/files.i386 Index: dev/kbd/atkbd.c Index: dev/pcic/i82365.c Index: dev/syscons/scmouse.c Index: dev/syscons/scterm-sc.c Index: dev/syscons/syscons.c Index: dev/usb/usb.c Index: dev/usb/usb_port.h Index: i386/i386/exception.s Index: i386/i386/genassym.c Index: i386/i386/globals.s Index: i386/i386/identcpu.c Index: i386/i386/locore.s Index: i386/i386/machdep.c Index: i386/i386/mem.c Index: i386/i386/mp_machdep.c Index: i386/i386/mpboot.s Index: i386/i386/mplock.s Index: i386/i386/swtch.s Index: i386/i386/trap.c Index: i386/i386/vm86bios.s Index: i386/i386/vm_machdep.c Index: i386/ibcs2/ibcs2_signal.c Index: i386/include/asnames.h Index: i386/include/atomic.h Index: i386/include/globaldata.h Index: i386/include/globals.h Index: i386/include/ipl.h Index: i386/include/lock.h Index: i386/include/pcb.h Index: i386/isa/apic_ipl.s Index: i386/isa/cx.c Index: i386/isa/icu_ipl.s Index: i386/isa/icu_vector.s Index: i386/isa/intr_machdep.h Index: i386/isa/ipl.s Index: i386/isa/ipl_funcs.c Index: isa/sio.c Index: kern/imgact_aout.c Index: kern/imgact_elf.c Index: kern/init_main.c Index: kern/kern_clock.c Index: kern/kern_descrip.c Index: kern/kern_event.c Index: kern/kern_exec.c Index: kern/kern_exit.c Index: kern/kern_fork.c Index: kern/kern_intr.c Index: kern/kern_kthread.c Index: kern/kern_lock.c Index: kern/kern_proc.c Index: kern/kern_random.c Index: kern/kern_shutdown.c Index: kern/kern_sig.c Index: kern/kern_subr.c Index: kern/kern_switch.c Index: kern/kern_synch.c Index: kern/kern_threads.c Index: kern/kern_time.c Index: kern/kern_timeout.c Index: kern/subr_log.c Index: kern/subr_prf.c Index: kern/subr_rman.c Index: kern/subr_taskqueue.c Index: kern/sys_generic.c Index: kern/sys_pipe.c Index: kern/sys_process.c Index: kern/tty.c Index: kern/tty_pty.c Index: kern/uipc_socket.c Index: kern/uipc_socket2.c Index: kern/uipc_syscalls.c Index: kern/vfs_aio.c Index: kern/vfs_bio.c Index: kern/vfs_subr.c Index: miscfs/procfs/procfs_mem.c Index: msdosfs/msdosfs_vnops.c Index: net/bpf.c Index: netgraph/ng_ksocket.c Index: netinet6/ip6_input.c Index: netkey/key.c Index: pci/pccbb.c Index: svr4/svr4_signal.c Index: sys/buf.h Index: sys/kernel.h Index: sys/kthread.h Index: sys/proc.h Index: sys/signalvar.h Index: sys/systm.h Index: sys/unistd.h Index: vm/vm_fault.c Index: vm/vm_glue.c Index: vm/vm_pageout.c apollo:/FreeBSD/FreeBSD-current/src/sys# wc /tmp/x.diff 7522 26191 196377 /tmp/x The changes to i386/ are substantial. The changes to kern are mid-sized. The changes to most other places are minor. This is with the legacy spl code still left intact in most places. Every file in the entire sys tree is going to change when we start ripping spl's out for real. At the moment I only have to rip them out of the sysconsole path and in i386. -Matt To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-smp" in the body of the message