From owner-p4-projects@FreeBSD.ORG Fri Feb 27 10:03:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6130016A4F1; Fri, 27 Feb 2004 10:03:10 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1AFFC16A4EF for ; Fri, 27 Feb 2004 10:03:10 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1206343D1F for ; Fri, 27 Feb 2004 10:03:10 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1RI3AGe018615 for ; Fri, 27 Feb 2004 10:03:10 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1RI393j018612 for perforce@freebsd.org; Fri, 27 Feb 2004 10:03:09 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Fri, 27 Feb 2004 10:03:09 -0800 (PST) Message-Id: <200402271803.i1RI393j018612@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 47745 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Feb 2004 18:03:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=47745 Change 47745 by jhb@jhb_slimer on 2004/02/27 10:02:20 IFC @47739. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#21 integrate .. //depot/projects/smpng/sys/amd64/amd64/mpboot.S#2 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#21 integrate .. //depot/projects/smpng/sys/boot/i386/loader/Makefile#16 integrate .. //depot/projects/smpng/sys/conf/NOTES#62 integrate .. //depot/projects/smpng/sys/conf/files#103 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#30 integrate .. //depot/projects/smpng/sys/conf/options#70 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pflog.c#1 branch .. //depot/projects/smpng/sys/contrib/pf/net/if_pflog.h#1 branch .. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.c#1 branch .. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.h#1 branch .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#1 branch .. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#1 branch .. //depot/projects/smpng/sys/contrib/pf/net/pf_norm.c#1 branch .. //depot/projects/smpng/sys/contrib/pf/net/pf_osfp.c#1 branch .. //depot/projects/smpng/sys/contrib/pf/net/pf_table.c#1 branch .. //depot/projects/smpng/sys/contrib/pf/net/pfvar.h#1 branch .. //depot/projects/smpng/sys/contrib/pf/netinet/in4_cksum.c#1 branch .. //depot/projects/smpng/sys/ddb/db_sym.c#4 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#37 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#30 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#19 integrate .. //depot/projects/smpng/sys/dev/patm/genrtab/Makefile#3 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.h#2 integrate .. //depot/projects/smpng/sys/isa/fd.c#29 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#59 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#73 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#38 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#33 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#59 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#23 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#35 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#31 integrate .. //depot/projects/smpng/sys/kern/subr_turnstile.c#7 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#43 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#68 integrate .. //depot/projects/smpng/sys/modules/pf/Makefile#1 branch .. //depot/projects/smpng/sys/modules/pflog/Makefile#1 branch .. //depot/projects/smpng/sys/modules/pfsync/Makefile#1 branch .. //depot/projects/smpng/sys/net/bpf.h#10 integrate .. //depot/projects/smpng/sys/net/bridge.c#24 integrate .. //depot/projects/smpng/sys/net/if.c#44 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#42 integrate .. //depot/projects/smpng/sys/net/if_types.h#3 integrate .. //depot/projects/smpng/sys/net/if_var.h#21 integrate .. //depot/projects/smpng/sys/netgraph/ng_gif.c#7 integrate .. //depot/projects/smpng/sys/netinet/icmp_var.h#5 integrate .. //depot/projects/smpng/sys/netinet/in.c#19 integrate .. //depot/projects/smpng/sys/netinet/in_proto.c#13 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#31 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.h#1 branch .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#28 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.h#13 integrate .. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#5 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#18 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#30 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.c#25 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.h#6 integrate .. //depot/projects/smpng/sys/netinet/ip_id.c#4 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#49 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#52 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#20 integrate .. //depot/projects/smpng/sys/netinet/tcp_debug.c#5 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#50 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#45 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#22 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#40 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#19 integrate .. //depot/projects/smpng/sys/netinet6/in6_ifattach.c#10 integrate .. //depot/projects/smpng/sys/netncp/ncp_conn.c#10 integrate .. //depot/projects/smpng/sys/netsmb/smb_conn.c#10 integrate .. //depot/projects/smpng/sys/pc98/pc98/fd.c#28 integrate .. //depot/projects/smpng/sys/security/mac/mac_inet.c#1 branch .. //depot/projects/smpng/sys/security/mac/mac_internal.h#7 integrate .. //depot/projects/smpng/sys/security/mac/mac_net.c#9 integrate .. //depot/projects/smpng/sys/security/mac/mac_socket.c#1 branch .. //depot/projects/smpng/sys/sys/limits.h#5 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#22 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#35 integrate .. //depot/projects/smpng/sys/sys/param.h#57 integrate .. //depot/projects/smpng/sys/sys/proc.h#111 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#25 integrate .. //depot/projects/smpng/sys/sys/turnstile.h#2 integrate .. //depot/projects/smpng/sys/vm/vm_extern.h#20 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#38 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#40 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#21 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.603 2004/01/29 00:07:29 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.604 2004/02/25 23:12:39 peter Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1104,9 +1104,11 @@ #error "have you forgotten the isa device?"; #endif +#if 0 /* Not till we test the features bit */ /* Turn on PTE NX (no execute) bit */ msr = rdmsr(MSR_EFER) | EFER_NXE; wrmsr(MSR_EFER, msr); +#endif proc0.p_uarea = (struct user *)(physfree + KERNBASE); bzero(proc0.p_uarea, UAREA_PAGES * PAGE_SIZE); ==== //depot/projects/smpng/sys/amd64/amd64/mpboot.S#2 (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/amd64/amd64/mpboot.S,v 1.24 2003/11/17 08:58:12 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/mpboot.S,v 1.25 2004/02/25 23:12:39 peter Exp $ */ #include /* miscellaneous asm macros */ @@ -102,7 +102,11 @@ */ movl $MSR_EFER, %ecx rdmsr +#if 0 /* not till we test the NX cpuid bits */ orl $EFER_LME | EFER_SCE | EFER_NXE, %eax +#else + orl $EFER_LME | EFER_SCE, %eax +#endif wrmsr /* ==== //depot/projects/smpng/sys/boot/forth/loader.conf#21 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.73 2004/01/27 15:59:38 des Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.74 2004/02/26 03:53:52 mlaier Exp $ ############################################################## ### Basic configuration options ############################ @@ -171,6 +171,9 @@ if_tun_load="NO" # Tunnel driver (user process ppp) if_vlan_load="NO" # IEEE 802.1Q VLAN network interface ipfw_load="NO" # Firewall +pfsync_load="NO" # pfsync pseudo interface +pflog_load="NO" # pflog pseudo interface +pf_load="NO" # packet filter ############################################################## ==== //depot/projects/smpng/sys/boot/i386/loader/Makefile#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.75 2004/02/12 21:43:50 ru Exp $ +# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.76 2004/02/27 14:10:09 ru Exp $ PROG= loader.sym INTERNALPROG= @@ -82,8 +82,11 @@ FILES+= ${.CURDIR}/loader.rc .endif -DPADD= ${BTXCRT} ${LIBFICL} ${LIBI386} ${LIBSTAND} -LDADD= ${BTXCRT} ${LIBFICL} ${LIBI386} -lstand +# XXX crt0.o needs to be first for pxeboot(8) to work +OBJS= ${BTXCRT} + +DPADD= ${LIBFICL} ${LIBI386} ${LIBSTAND} +LDADD= ${LIBFICL} ${LIBI386} -lstand .include ==== //depot/projects/smpng/sys/conf/NOTES#62 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1197 2004/01/26 16:38:33 ale Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1199 2004/02/25 08:57:33 bde Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -242,6 +242,12 @@ #!options DDB_NOKLDSYM # +# Print the numerical value of symbols in addition to the symbolic +# representation. +# +options DDB_NUMSYM + +# # Print a stack trace of the current thread out on the console for a panic. # options DDB_TRACE ==== //depot/projects/smpng/sys/conf/files#103 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.863 2004/02/11 04:26:01 bms Exp $ +# $FreeBSD: src/sys/conf/files,v 1.865 2004/02/26 03:53:52 mlaier Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -206,6 +206,14 @@ contrib/ipfilter/netinet/ip_proxy.c optional ipfilter inet contrib/ipfilter/netinet/ip_state.c optional ipfilter inet contrib/ipfilter/netinet/mlfk_ipl.c optional ipfilter inet +contrib/pf/net/if_pflog.c optional pflog +contrib/pf/net/if_pfsync.c optional pfsync +contrib/pf/net/pf.c optional pf nowerror +contrib/pf/net/pf_ioctl.c optional pf +contrib/pf/net/pf_norm.c optional pf +contrib/pf/net/pf_table.c optional pf +contrib/pf/net/pf_osfp.c optional pf +contrib/pf/netinet/in4_cksum.c optional pf inet crypto/blowfish/bf_ecb.c optional ipsec ipsec_esp crypto/blowfish/bf_skey.c optional ipsec ipsec_esp crypto/cast128/cast128.c optional ipsec ipsec_esp @@ -1618,10 +1626,12 @@ posix4/p1003_1b.c standard posix4/posix4_mib.c standard kern/uipc_sem.c optional p1003_1b_semaphores +security/mac/mac_inet.c optional mac inet security/mac/mac_label.c optional mac security/mac/mac_net.c optional mac security/mac/mac_pipe.c optional mac security/mac/mac_process.c optional mac +security/mac/mac_socket.c optional mac security/mac/mac_system.c optional mac security/mac/mac_vfs.c optional mac security/mac_biba/mac_biba.c optional mac_biba ==== //depot/projects/smpng/sys/conf/kern.pre.mk#30 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.41 2004/02/13 10:40:54 ru Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.42 2004/02/26 03:53:52 mlaier Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -32,6 +32,9 @@ # ... and the same for ipfilter INCLUDES+= -I$S/contrib/ipfilter +# ... and the same for pf +INCLUDES+= -I$S/contrib/pf + # ... and the same for Atheros HAL INCLUDES+= -I$S/contrib/dev/ath -I$S/contrib/dev/ath/freebsd ==== //depot/projects/smpng/sys/conf/options#70 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.429 2004/02/11 04:26:01 bms Exp $ +# $FreeBSD: src/sys/conf/options,v 1.432 2004/02/26 03:53:52 mlaier Exp $ # # On the handling of kernel options # @@ -83,8 +83,10 @@ CY_PCI_FASTINTR DDB DDB_NOKLDSYM opt_ddb.h +DDB_NUMSYM opt_ddb.h DDB_TRACE DDB_UNATTENDED +DIRECTIO opt_directio.h GDB_REMOTE_CHAT opt_ddb.h GDBSPEED opt_ddb.h GEOM_AES opt_geom.h @@ -99,8 +101,8 @@ GEOM_SUNLABEL opt_geom.h GEOM_VOL opt_geom.h HW_WDOG +KSTACK_MAX_PAGES KSTACK_PAGES -KSTACK_MAX_PAGES KTRACE KTRACE_REQUEST_POOL opt_ktrace.h LIBICONV @@ -151,15 +153,15 @@ SYSVMSG opt_sysvipc.h SYSVSEM opt_sysvipc.h SYSVSHM opt_sysvipc.h +TTYHOG opt_tty.h VFS_AIO +WATCHDOG opt_watchdog.h WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h -TTYHOG opt_tty.h -DIRECTIO opt_directio.h # POSIX kernel options +P1003_1B_SEMAPHORES opt_posix.h _KPOSIX_PRIORITY_SCHEDULING opt_posix.h -P1003_1B_SEMAPHORES opt_posix.h # Do we want the config file compiled into the kernel? INCLUDE_CONFIG_FILE opt_config.h @@ -305,11 +307,11 @@ ATA_STATIC_ID opt_ata.h ATA_NOPCI opt_ata.h DEV_ATADISK opt_ata.h -DEV_ATARAID opt_ata.h -DEV_ATAPICD opt_ata.h +DEV_ATAPICD opt_ata.h DEV_ATAPIST opt_ata.h DEV_ATAPIFD opt_ata.h DEV_ATAPICAM opt_ata.h +DEV_ATARAID opt_ata.h # Net stuff. ACCEPT_FILTER_DATA @@ -320,6 +322,9 @@ BOOTP_NFSV3 opt_bootp.h BOOTP_WIRED_TO opt_bootp.h BRIDGE opt_bdg.h +DEV_PF opt_pf.h +DEV_PFLOG opt_pf.h +DEV_PFSYNC opt_pf.h ETHER_II opt_ef.h ETHER_8023 opt_ef.h ETHER_8022 opt_ef.h @@ -352,6 +357,7 @@ IPXIP opt_ipx.h LIBMBPOOL LIBMCHAIN +MBUF_STRESS_TEST opt_mbuf_stress_test.h NCP NETATALK opt_atalk.h PPP_BSDCOMP opt_ppp.h @@ -363,7 +369,6 @@ TCP_SIGNATURE opt_inet.h TCP_DROP_SYNFIN opt_tcp_input.h XBONEHACK -MBUF_STRESS_TEST opt_mbuf_stress_test.h # Netgraph(4). Use option NETGRAPH to enable the base netgraph code. # Each netgraph node type can be either be compiled into the kernel @@ -445,13 +450,9 @@ LPT_DEBUG opt_lpt.h PLIP_DEBUG opt_plip.h LOCKF_DEBUG opt_debug_lockf.h -MUTEX_DEBUG opt_global.h -MUTEX_NOINLINE opt_global.h -MUTEX_PROFILING opt_global.h NPX_DEBUG opt_debug_npx.h NETATALKDEBUG opt_atalk.h SI_DEBUG opt_debug_si.h -WATCHDOG opt_watchdog.h # Fb options FB_DEBUG opt_fb.h @@ -475,6 +476,9 @@ INVARIANTS opt_global.h LOOKUP_SHARED opt_global.h MCLSHIFT opt_global.h +MUTEX_DEBUG opt_global.h +MUTEX_NOINLINE opt_global.h +MUTEX_PROFILING opt_global.h MSIZE opt_global.h REGRESSION opt_global.h RESTARTABLE_PANICS opt_global.h @@ -588,9 +592,9 @@ NDEVFSOVERFLOW opt_devfs.h # various 'device presence' options. +DEV_BPF opt_bpf.h DEV_ISA opt_isa.h DEV_MCA opt_mca.h -DEV_BPF opt_bpf.h DEV_SPLASH opt_splash.h EISA_SLOTS opt_eisa.h @@ -636,13 +640,13 @@ SC_NO_CUTPASTE opt_syscons.h SC_NO_FONT_LOADING opt_syscons.h SC_NO_HISTORY opt_syscons.h +SC_NO_SUSPEND_VTYSWITCH opt_syscons.h SC_NO_SYSMOUSE opt_syscons.h SC_NORM_ATTR opt_syscons.h SC_NORM_REV_ATTR opt_syscons.h SC_PIXEL_MODE opt_syscons.h SC_RENDER_DEBUG opt_syscons.h SC_TWOBUTTON_MOUSE opt_syscons.h -SC_NO_SUSPEND_VTYSWITCH opt_syscons.h # kbd options KBD_DISABLE_KEYMAP_LOAD opt_kbd.h ==== //depot/projects/smpng/sys/ddb/db_sym.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_sym.c,v 1.34 2003/06/10 22:09:23 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_sym.c,v 1.35 2004/02/24 22:51:42 phk Exp $"); #include #include @@ -37,6 +37,8 @@ #include #include +#include + /* * Multiple symbol tables */ @@ -308,7 +310,11 @@ db_printf("%#lr", (unsigned long)off); return; } +#ifdef DDB_NUMSYM + db_printf("%#lr = %s", (unsigned long)off, name); +#else db_printf("%s", name); +#endif if (d) db_printf("+%+#lr", (long)d); if (strategy == DB_STGY_PROC) { ==== //depot/projects/smpng/sys/dev/aac/aac.c#37 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.88 2004/02/21 21:10:39 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.89 2004/02/25 05:41:44 scottl Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -1292,7 +1292,6 @@ /* put the FIB on the outbound queue */ if (aac_enqueue_fib(sc, cm->cm_queue, cm) == EBUSY) { - aac_remove_busy(cm); aac_unmap_command(cm); aac_requeue_ready(cm); } ==== //depot/projects/smpng/sys/dev/ata/ata-chipset.c#30 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.61 2004/02/02 14:05:56 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.62 2004/02/25 09:55:49 sos Exp $"); #include "opt_ata.h" #include @@ -1587,8 +1587,10 @@ struct ata_chip_id *idx; static struct ata_chip_id ids[] = {{ ATA_SII3114, 0x00, SIIMEMIO, SII4CH, ATA_SA150, "SiI 3114" }, + { ATA_SII3512, 0x02, SIIMEMIO, 0, ATA_SA150, "SiI 3512" }, { ATA_SII3112, 0x02, SIIMEMIO, 0, ATA_SA150, "SiI 3112" }, { ATA_SII3112_1, 0x02, SIIMEMIO, 0, ATA_SA150, "SiI 3112" }, + { ATA_SII3512, 0x00, SIIMEMIO, SIIBUG, ATA_SA150, "SiI 3512" }, { ATA_SII3112, 0x00, SIIMEMIO, SIIBUG, ATA_SA150, "SiI 3112" }, { ATA_SII3112_1, 0x00, SIIMEMIO, SIIBUG, ATA_SA150, "SiI 3112" }, { ATA_SII0680, 0x00, SIIMEMIO, SIISETCLK, ATA_UDMA6, "SiI 0680" }, ==== //depot/projects/smpng/sys/dev/ata/ata-pci.h#19 (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/dev/ata/ata-pci.h,v 1.24 2004/02/02 14:05:57 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.25 2004/02/25 09:55:49 sos Exp $ */ /* structure holding chipset config info */ @@ -160,6 +160,7 @@ #define ATA_SILICON_IMAGE_ID 0x1095 #define ATA_SII3114 0x31141095 +#define ATA_SII3512 0x35121095 #define ATA_SII3112 0x31121095 #define ATA_SII3112_1 0x02401095 #define ATA_SII0680 0x06801095 ==== //depot/projects/smpng/sys/dev/patm/genrtab/Makefile#3 (text+ko) ==== @@ -1,15 +1,13 @@ -# $FreeBSD: src/sys/dev/patm/genrtab/Makefile,v 1.2 2004/02/05 22:01:28 ru Exp $ +# $FreeBSD: src/sys/dev/patm/genrtab/Makefile,v 1.4 2004/02/25 13:12:51 johan Exp $ # # This program is used to generate the if_patm_rtables.c file # for the idt77252 driver. It is not installed. # -PROG=genrtab -WARNS=5 -NOMAN=true -DPADD=${LIBM} -LDADD=-lm - -install: +PROG= genrtab +INTERNALPROG= +WARNS?= 5 +NOMAN= true +DPADD= ${LIBM} +LDADD= -lm .include - ==== //depot/projects/smpng/sys/geom/concat/g_concat.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/concat/g_concat.c,v 1.1 2004/02/19 15:19:49 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/concat/g_concat.c,v 1.2 2004/02/27 15:34:21 pjd Exp $"); #include #include @@ -537,7 +537,8 @@ gp = g_new_geomf(mp, "concat:taste"); gp->start = g_concat_start; - gp->access= g_concat_access; + gp->access = g_concat_access; + gp->orphan = g_concat_orphan; cp = g_new_consumer(gp); g_attach(cp, pp); ==== //depot/projects/smpng/sys/geom/concat/g_concat.h#2 (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/geom/concat/g_concat.h,v 1.1 2004/02/19 15:19:49 pjd Exp $ + * $FreeBSD: src/sys/geom/concat/g_concat.h,v 1.2 2004/02/27 15:32:49 pjd Exp $ */ #ifndef _G_CONCAT_H_ @@ -69,7 +69,6 @@ }; struct g_concat_softc { - int sc_flags; /* flags */ u_int sc_type; /* provider type */ struct g_provider *sc_provider; char sc_name[16]; /* concat name */ ==== //depot/projects/smpng/sys/isa/fd.c#29 (text+ko) ==== @@ -53,7 +53,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/isa/fd.c,v 1.265 2004/02/21 21:10:52 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/isa/fd.c,v 1.266 2004/02/25 13:44:58 phk Exp $"); #include "opt_fdc.h" #include "card.h" @@ -176,9 +176,7 @@ typedef struct fdc_data *fdc_p; typedef enum fdc_type fdc_t; -#define FDUNIT(s) (((s) >> 6) & 3) #define FDNUMTOUNIT(n) (((n) & 3) << 6) -#define FDTYPE(s) ((s) & 0x3f) /* * fdc maintains a set (1!) of ivars per child of each controller. @@ -227,13 +225,6 @@ /* * Number of subdevices that can be used for different density types. - * By now, the lower 6 bit of the minor number are reserved for this, - * allowing for up to 64 subdevices, but we only use 16 out of this. - * Density #0 is used for automatic format detection, the other - * densities are available as programmable densities (for assignment - * by fdcontrol(8)). - * The upper 2 bits of the minor number are reserved for the subunit - * (drive #) per controller. */ #define NUMDENS 16 @@ -317,10 +308,6 @@ struct callout_handle tohandle; struct devstat *device_stats; dev_t masterdev; -#ifdef GONE_IN_5 - eventhandler_tag clonetag; - dev_t clonedevs[NUMDENS - 1]; -#endif device_t dev; fdu_t fdu; }; @@ -388,9 +375,6 @@ static void fdc_add_child(device_t, const char *, int); static int fdc_attach(device_t); static int fdc_print_child(device_t, device_t); -#ifdef GONE_IN_5 -static void fd_clone (void *, char *, int, dev_t *); -#endif static int fd_probe(device_t); static int fd_attach(device_t); static int fd_detach(device_t); @@ -1154,63 +1138,7 @@ #endif /* NCARD > 0 */ -#ifdef GONE_IN_5 -/* - * Create a clone device upon request by devfs. - */ -static void -fd_clone(void *arg, char *name, int namelen, dev_t *dev) -{ - struct fd_data *fd; - int i, u; - char *n; - size_t l; - fd = (struct fd_data *)arg; - if (*dev != NODEV) - return; - if (dev_stdclone(name, &n, "fd", &u) != 2) - return; - if (u != fd->fdu) - /* unit # mismatch */ - return; - l = strlen(n); - if (l == 1 && *n >= 'a' && *n <= 'h') { - /* - * Trailing letters a through h denote - * pseudo-partitions. We don't support true - * (UFS-style) partitions, so we just implement them - * as symlinks if someone asks us nicely. - */ - *dev = make_dev_alias(fd->masterdev, name); - return; - } - if (l >= 2 && l <= 5 && *n == '.') { - /* - * Trailing numbers, preceded by a dot, denote - * subdevices for different densities. Historically, - * they have been named by density (like fd0.1440), - * but we allow arbitrary numbers between 1 and 4 - * digits, so fd0.1 through fd0.15 are possible as - * well. - */ - for (i = 1; i < l; i++) - if (n[i] < '0' || n[i] > '9') - return; - for (i = 0; i < NUMDENS - 1; i++) - if (fd->clonedevs[i] == NODEV) { - *dev = make_dev(&fd_cdevsw, - FDNUMTOUNIT(u) + i + 1, - UID_ROOT, GID_OPERATOR, 0640, - name); - fd->clonedevs[i] = *dev; - fd->clonedevs[i]->si_drv1 = fd; - return; - } - } -} -#endif - /* * Configuration/initialization, per drive. */ @@ -1365,19 +1293,9 @@ struct fd_data *fd; fd = device_get_softc(dev); -#ifdef GONE_IN_5 - fd->clonetag = EVENTHANDLER_REGISTER(dev_clone, fd_clone, fd, 1000); -#endif - fd->masterdev = make_dev(&fd_cdevsw, fd->fdu << 6, + fd->masterdev = make_dev(&fd_cdevsw, fd->fdu, UID_ROOT, GID_OPERATOR, 0640, "fd%d", fd->fdu); fd->masterdev->si_drv1 = fd; -#ifdef GONE_IN_5 - { - int i; - for (i = 0; i < NUMDENS - 1; i++) - fd->clonedevs[i] = NODEV; - } -#endif fd->device_stats = devstat_new_entry(device_get_name(dev), device_get_unit(dev), 0, DEVSTAT_NO_ORDERED_TAGS, DEVSTAT_TYPE_FLOPPY | DEVSTAT_TYPE_IF_OTHER, @@ -1394,15 +1312,6 @@ untimeout(fd_turnoff, fd, fd->toffhandle); devstat_remove_entry(fd->device_stats); destroy_dev(fd->masterdev); -#ifdef GONE_IN_5 - { - int i; - for (i = 0; i < NUMDENS - 1; i++) - if (fd->clonedevs[i] != NODEV) - destroy_dev(fd->clonedevs[i]); - EVENTHANDLER_DEREGISTER(dev_clone, fd->clonetag); - } -#endif return (0); } @@ -1597,7 +1506,6 @@ static int fdopen(dev_t dev, int flags, int mode, struct thread *td) { - int type = FDTYPE(minor(dev)); fd_p fd; fdc_p fdc; int rv, unitattn, dflags; @@ -1608,8 +1516,6 @@ fdc = fd->fdc; if ((fdc == NULL) || (fd->type == FDT_NONE)) return (ENXIO); - if (type > NUMDENS) - return (ENXIO); dflags = device_get_flags(fd->dev); /* * This is a bit bogus. It's still possible that e. g. a @@ -1622,62 +1528,58 @@ if (fd->flags & FD_OPEN) return (EBUSY); - if (type == 0) { - if (flags & FNONBLOCK) { - /* - * Unfortunately, physio(9) discards its ioflag - * argument, thus preventing us from seeing the - * IO_NDELAY bit. So we need to keep track - * ourselves. - */ - fd->flags |= FD_NONBLOCK; - fd->ft = 0; + if (flags & FNONBLOCK) { + /* + * Unfortunately, physio(9) discards its ioflag + * argument, thus preventing us from seeing the + * IO_NDELAY bit. So we need to keep track + * ourselves. + */ + fd->flags |= FD_NONBLOCK; + fd->ft = 0; + } else { + /* + * Figure out a unit attention condition. + * + * If UA has been forced, proceed. + * + * If the drive has no changeline support, + * or if the drive parameters have been lost + * due to previous non-blocking access, + * assume a forced UA condition. + * + * If motor is off, turn it on for a moment + * and select our drive, in order to read the + * UA hardware signal. + * + * If motor is on, and our drive is currently + * selected, just read the hardware bit. + * + * If motor is on, but active for another + * drive on that controller, we are lost. We + * cannot risk to deselect the other drive, so + * we just assume a forced UA condition to be + * on the safe side. + */ + unitattn = 0; + if ((dflags & FD_NO_CHLINE) != 0 || + (fd->flags & FD_UA) != 0 || + fd->ft == 0) { + unitattn = 1; + fd->flags &= ~FD_UA; + } else if (fdc->fdout & (FDO_MOEN0 | FDO_MOEN1 | + FDO_MOEN2 | FDO_MOEN3)) { + if ((fdc->fdout & FDO_FDSEL) == fd->fdsu) + unitattn = fdin_rd(fdc) & FDI_DCHG; + else + unitattn = 1; } else { - /* - * Figure out a unit attention condition. - * - * If UA has been forced, proceed. - * - * If the drive has no changeline support, - * or if the drive parameters have been lost - * due to previous non-blocking access, - * assume a forced UA condition. - * - * If motor is off, turn it on for a moment - * and select our drive, in order to read the - * UA hardware signal. - * - * If motor is on, and our drive is currently - * selected, just read the hardware bit. - * - * If motor is on, but active for another - * drive on that controller, we are lost. We - * cannot risk to deselect the other drive, so - * we just assume a forced UA condition to be - * on the safe side. - */ - unitattn = 0; - if ((dflags & FD_NO_CHLINE) != 0 || - (fd->flags & FD_UA) != 0 || - fd->ft == 0) { - unitattn = 1; - fd->flags &= ~FD_UA; - } else if (fdc->fdout & (FDO_MOEN0 | FDO_MOEN1 | - FDO_MOEN2 | FDO_MOEN3)) { - if ((fdc->fdout & FDO_FDSEL) == fd->fdsu) - unitattn = fdin_rd(fdc) & FDI_DCHG; - else - unitattn = 1; - } else { - set_motor(fdc, fd->fdsu, TURNON); - unitattn = fdin_rd(fdc) & FDI_DCHG; - set_motor(fdc, fd->fdsu, TURNOFF); - } - if (unitattn && (rv = fdautoselect(dev)) != 0) - return (rv); + set_motor(fdc, fd->fdsu, TURNON); + unitattn = fdin_rd(fdc) & FDI_DCHG; + set_motor(fdc, fd->fdsu, TURNOFF); } - } else { - fd->ft = fd->fts + type; + if (unitattn && (rv = fdautoselect(dev)) != 0) + return (rv); } fd->flags |= FD_OPEN; /* @@ -1718,11 +1620,8 @@ fd_p fd; size_t fdblk; - fdu = FDUNIT(minor(bp->bio_dev)); fd = bp->bio_dev->si_drv1; - if (fd == NULL) - panic("fdstrategy: buf for nonexistent device (%#lx, %#lx)", - (u_long)major(bp->bio_dev), (u_long)minor(bp->bio_dev)); + fdu = fd->fdu; fdc = fd->fdc; bp->bio_resid = bp->bio_bcount; if (fd->type == FDT_NONE || fd->ft == 0) { @@ -1906,13 +1805,11 @@ static int fdautoselect(dev_t dev) { - fdu_t fdu; fd_p fd; struct fd_type *fdtp; struct fdc_readid id; int i, n, oopts, rv; - fdu = FDUNIT(minor(dev)); fd = dev->si_drv1; switch (fd->type) { @@ -2039,8 +1936,8 @@ TRACE1("[fdc%d IDLE]", fdc->fdcu); return (0); } - fdu = FDUNIT(minor(bp->bio_dev)); fd = bp->bio_dev->si_drv1; + fdu = fd->fdu; fdblk = 128 << fd->ft->secsize; if (fdc->fd && (fd != fdc->fd)) device_printf(fd->dev, "confused fd pointers\n"); @@ -2542,8 +2439,8 @@ bp = fdc->bp; /* XXX shouldn't this be cached somewhere? */ - fdu = FDUNIT(minor(bp->bio_dev)); fd = bp->bio_dev->si_drv1; + fdu = fd->fdu; if (fd->options & FDOPT_NORETRY) goto fail; @@ -2613,8 +2510,8 @@ size_t fdblk; int error; - fdu = FDUNIT(minor(dev)); fd = dev->si_drv1; + fdu = fd->fdu; fdblk = 128 << fd->ft->secsize; finfo = (struct fd_formb *)data; idfield = (struct fdc_readid *)data; @@ -2660,11 +2557,10 @@ fd_p fd; struct fdc_status *fsp; struct fdc_readid *rid; - int error, type; + int error; - fdu = FDUNIT(minor(dev)); - type = FDTYPE(minor(dev)); fd = dev->si_drv1; + fdu = fd->fdu; /* * First, handle everything that could be done with @@ -2712,30 +2608,13 @@ return (0); case FD_STYPE: /* set drive type */ - if (type == 0) { - /* - * Allow setting drive type temporarily iff - * currently unset. Used for fdformat so any - * user can set it, and then start formatting. - */ - if (fd->ft) - return (EINVAL); /* already set */ - fd->ft = fd->fts; - *fd->ft = *(struct fd_type *)addr; - fd->flags |= FD_UA; - } else { - /* - * Set density definition permanently. Only - * allow for superuser. - */ - if (suser(td) != 0) - return (EPERM); - fd->fts[type] = *(struct fd_type *)addr; - } + if (suser(td) != 0) + return (EPERM); + fd->fts[0] = *(struct fd_type *)addr; return (0); case FD_GOPTS: /* get drive options */ - *(int *)addr = fd->options + (type == 0? FDOPT_AUTOSEL: 0); + *(int *)addr = fd->options + FDOPT_AUTOSEL; return (0); case FD_SOPTS: /* set drive options */ ==== //depot/projects/smpng/sys/kern/kern_descrip.c#59 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.227 2004/02/21 21:10:52 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.228 2004/02/26 00:27:02 truckman Exp $"); #include "opt_compat.h" @@ -2327,7 +2327,9 @@ * it is of a similar order of magnitude to the leakage from * global system statistics such as kern.openfiles. */ - sysctl_wire_old_buffer(req, 0); + error = sysctl_wire_old_buffer(req, 0); + if (error != 0) + return (error); if (req->oldptr == NULL) { n = 16; /* A slight overestimate. */ sx_slock(&filelist_lock); ==== //depot/projects/smpng/sys/kern/kern_fork.c#73 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.214 2004/02/05 21:01:37 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.215 2004/02/26 00:27:02 truckman Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -168,7 +168,9 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<