PERFORCE change 56040 for review
John Baldwin
jhb at FreeBSD.org
Mon Jun 28 19:54:57 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=56040
Change 56040 by jhb at jhb_slimer on 2004/06/29 02:54:29
IFC @56038.
Affected files ...
.. //depot/projects/smpng/sys/arm/arm/sys_machdep.c#2 integrate
.. //depot/projects/smpng/sys/boot/forth/loader.conf#25 integrate
.. //depot/projects/smpng/sys/compat/svr4/imgact_svr4.c#11 integrate
.. //depot/projects/smpng/sys/conf/NOTES#70 integrate
.. //depot/projects/smpng/sys/conf/files#111 integrate
.. //depot/projects/smpng/sys/conf/kern.post.mk#37 integrate
.. //depot/projects/smpng/sys/conf/kern.pre.mk#36 integrate
.. //depot/projects/smpng/sys/conf/kmod.mk#31 integrate
.. //depot/projects/smpng/sys/conf/options#78 integrate
.. //depot/projects/smpng/sys/conf/options.powerpc#9 integrate
.. //depot/projects/smpng/sys/conf/options.sparc64#11 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi.c#66 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#26 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#29 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pci.c#11 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_quirks#1 branch
.. //depot/projects/smpng/sys/dev/ar/if_ar.c#14 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-raid.c#29 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-raid.h#16 integrate
.. //depot/projects/smpng/sys/dev/bktr/bktr_tuner.c#4 integrate
.. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#20 integrate
.. //depot/projects/smpng/sys/dev/cp/if_cp.c#3 integrate
.. //depot/projects/smpng/sys/dev/ctau/if_ct.c#5 integrate
.. //depot/projects/smpng/sys/dev/cx/if_cx.c#8 integrate
.. //depot/projects/smpng/sys/dev/cy/cy.c#4 integrate
.. //depot/projects/smpng/sys/dev/digi/digi.c#22 integrate
.. //depot/projects/smpng/sys/dev/ex/if_ex.c#12 integrate
.. //depot/projects/smpng/sys/dev/ex/if_ex_isa.c#5 integrate
.. //depot/projects/smpng/sys/dev/ex/if_ex_pccard.c#7 integrate
.. //depot/projects/smpng/sys/dev/ex/if_exvar.h#3 integrate
.. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#28 integrate
.. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#52 integrate
.. //depot/projects/smpng/sys/dev/ichsmb/ichsmb_pci.c#9 integrate
.. //depot/projects/smpng/sys/dev/lge/if_lge.c#22 integrate
.. //depot/projects/smpng/sys/dev/nge/if_nge.c#33 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_console.c#17 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_disk.c#11 integrate
.. //depot/projects/smpng/sys/dev/rc/rc.c#11 integrate
.. //depot/projects/smpng/sys/dev/re/if_re.c#11 integrate
.. //depot/projects/smpng/sys/dev/sab/sab.c#18 integrate
.. //depot/projects/smpng/sys/dev/si/si.c#14 integrate
.. //depot/projects/smpng/sys/dev/si/si.h#2 integrate
.. //depot/projects/smpng/sys/dev/sio/sio.c#45 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#16 integrate
.. //depot/projects/smpng/sys/dev/sr/if_sr.c#15 integrate
.. //depot/projects/smpng/sys/dev/sx/sx.c#3 integrate
.. //depot/projects/smpng/sys/dev/sx/sx.h#2 integrate
.. //depot/projects/smpng/sys/dev/twa/twa_freebsd.c#3 integrate
.. //depot/projects/smpng/sys/dev/txp/if_txp.c#21 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_bus.h#4 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_dev_i8251.c#2 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_dev_ns8250.c#4 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_dev_sab82532.c#4 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_dev_z8530.c#4 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_tty.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/Makefile.usbdevs#2 delete
.. //depot/projects/smpng/sys/dev/usb/devlist2h.awk#4 delete
.. //depot/projects/smpng/sys/dev/usb/ehci.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/ehcireg.h#4 integrate
.. //depot/projects/smpng/sys/dev/usb/if_aue.c#33 integrate
.. //depot/projects/smpng/sys/dev/usb/if_axe.c#12 integrate
.. //depot/projects/smpng/sys/dev/usb/if_cue.c#24 integrate
.. //depot/projects/smpng/sys/dev/usb/if_kue.c#21 integrate
.. //depot/projects/smpng/sys/dev/usb/if_rue.c#11 integrate
.. //depot/projects/smpng/sys/dev/usb/if_udav.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/ohci.c#30 integrate
.. //depot/projects/smpng/sys/dev/usb/ubsa.c#11 integrate
.. //depot/projects/smpng/sys/dev/usb/ubser.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/ucom.c#18 integrate
.. //depot/projects/smpng/sys/dev/usb/ucomvar.h#4 integrate
.. //depot/projects/smpng/sys/dev/usb/udbp.c#12 integrate
.. //depot/projects/smpng/sys/dev/usb/ufm.c#12 integrate
.. //depot/projects/smpng/sys/dev/usb/uftdi.c#13 integrate
.. //depot/projects/smpng/sys/dev/usb/ugen.c#23 integrate
.. //depot/projects/smpng/sys/dev/usb/uhid.c#21 integrate
.. //depot/projects/smpng/sys/dev/usb/ukbd.c#15 integrate
.. //depot/projects/smpng/sys/dev/usb/ulpt.c#18 integrate
.. //depot/projects/smpng/sys/dev/usb/umass.c#38 integrate
.. //depot/projects/smpng/sys/dev/usb/umct.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/umodem.c#19 integrate
.. //depot/projects/smpng/sys/dev/usb/ums.c#17 integrate
.. //depot/projects/smpng/sys/dev/usb/uplcom.c#11 integrate
.. //depot/projects/smpng/sys/dev/usb/urio.c#18 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_quirks.c#9 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_subr.c#22 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#53 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs.h#53 delete
.. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#53 delete
.. //depot/projects/smpng/sys/dev/usb/usbdi_util.h#6 integrate
.. //depot/projects/smpng/sys/dev/usb/uscanner.c#24 integrate
.. //depot/projects/smpng/sys/dev/usb/uvisor.c#13 integrate
.. //depot/projects/smpng/sys/dev/usb/uvscom.c#14 integrate
.. //depot/projects/smpng/sys/dev/xe/if_xe_pccard.c#14 integrate
.. //depot/projects/smpng/sys/dev/zs/zs.c#15 integrate
.. //depot/projects/smpng/sys/dev/zs/zs_macio.c#4 integrate
.. //depot/projects/smpng/sys/fs/portalfs/portal_vnops.c#18 integrate
.. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#19 integrate
.. //depot/projects/smpng/sys/geom/gate/g_gate.c#3 integrate
.. //depot/projects/smpng/sys/geom/geom_disk.c#37 integrate
.. //depot/projects/smpng/sys/geom/geom_io.c#30 integrate
.. //depot/projects/smpng/sys/geom/geom_slice.c#26 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum.c#2 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_plex.c#2 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_raid5.c#2 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_raid5.h#2 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_share.c#2 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_subr.c#2 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#16 integrate
.. //depot/projects/smpng/sys/i386/i386/mem.c#21 integrate
.. //depot/projects/smpng/sys/i386/i386/pmap.c#61 integrate
.. //depot/projects/smpng/sys/i386/include/float.h#6 integrate
.. //depot/projects/smpng/sys/i386/include/proc.h#13 integrate
.. //depot/projects/smpng/sys/i386/linux/imgact_linux.c#15 integrate
.. //depot/projects/smpng/sys/kern/imgact_elf.c#36 integrate
.. //depot/projects/smpng/sys/kern/kern_condvar.c#36 integrate
.. //depot/projects/smpng/sys/kern/kern_fork.c#77 integrate
.. //depot/projects/smpng/sys/kern/kern_idle.c#20 integrate
.. //depot/projects/smpng/sys/kern/kern_jail.c#34 integrate
.. //depot/projects/smpng/sys/kern/kern_kse.c#2 integrate
.. //depot/projects/smpng/sys/kern/kern_synch.c#70 integrate
.. //depot/projects/smpng/sys/kern/kern_thr.c#15 integrate
.. //depot/projects/smpng/sys/kern/kern_thread.c#58 integrate
.. //depot/projects/smpng/sys/kern/subr_bus.c#35 integrate
.. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#8 integrate
.. //depot/projects/smpng/sys/kern/subr_taskqueue.c#19 integrate
.. //depot/projects/smpng/sys/kern/subr_turnstile.c#11 integrate
.. //depot/projects/smpng/sys/kern/tty.c#44 integrate
.. //depot/projects/smpng/sys/kern/tty_pty.c#31 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket.c#51 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket2.c#35 integrate
.. //depot/projects/smpng/sys/kern/uipc_syscalls.c#54 integrate
.. //depot/projects/smpng/sys/kern/uipc_usrreq.c#36 integrate
.. //depot/projects/smpng/sys/kern/vfs_syscalls.c#75 integrate
.. //depot/projects/smpng/sys/modules/ar/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/aue/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/axe/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/cue/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/ep/Makefile#5 integrate
.. //depot/projects/smpng/sys/modules/kue/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/netgraph/bluetooth/ubt/Makefile#5 integrate
.. //depot/projects/smpng/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/rue/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/sr/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/ubsa/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/ubser/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/ucom/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/udav/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/udbp/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/ufm/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/uftdi/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/ugen/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/uhid/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/ukbd/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/ulpt/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/umass/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/umct/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/umodem/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/ums/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/uplcom/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/urio/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/usb/Makefile#5 integrate
.. //depot/projects/smpng/sys/modules/uscanner/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/uvisor/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/uvscom/Makefile#4 integrate
.. //depot/projects/smpng/sys/net/if_ethersubr.c#49 integrate
.. //depot/projects/smpng/sys/net/if_fwsubr.c#2 integrate
.. //depot/projects/smpng/sys/net/if_loop.c#30 integrate
.. //depot/projects/smpng/sys/net/if_sl.c#21 integrate
.. //depot/projects/smpng/sys/net/if_spppsubr.c#19 integrate
.. //depot/projects/smpng/sys/net/if_vlan.c#27 integrate
.. //depot/projects/smpng/sys/net/ppp_tty.c#13 integrate
.. //depot/projects/smpng/sys/netgraph/atm/uni/ng_uni_cust.h#2 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#7 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#12 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#5 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket.c#7 integrate
.. //depot/projects/smpng/sys/netgraph/netgraph.h#9 integrate
.. //depot/projects/smpng/sys/netgraph/ng_UI.c#5 integrate
.. //depot/projects/smpng/sys/netgraph/ng_base.c#22 integrate
.. //depot/projects/smpng/sys/netgraph/ng_bridge.c#13 integrate
.. //depot/projects/smpng/sys/netgraph/ng_eiface.c#11 integrate
.. //depot/projects/smpng/sys/netgraph/ng_etf.c#6 integrate
.. //depot/projects/smpng/sys/netgraph/ng_ether.c#16 integrate
.. //depot/projects/smpng/sys/netgraph/ng_gif.c#9 integrate
.. //depot/projects/smpng/sys/netgraph/ng_hub.c#2 integrate
.. //depot/projects/smpng/sys/netgraph/ng_iface.c#13 integrate
.. //depot/projects/smpng/sys/netgraph/ng_ksocket.c#22 integrate
.. //depot/projects/smpng/sys/netgraph/ng_ksocket.h#6 integrate
.. //depot/projects/smpng/sys/netgraph/ng_l2tp.c#7 integrate
.. //depot/projects/smpng/sys/netgraph/ng_lmi.c#5 integrate
.. //depot/projects/smpng/sys/netgraph/ng_one2many.c#9 integrate
.. //depot/projects/smpng/sys/netgraph/ng_parse.c#12 integrate
.. //depot/projects/smpng/sys/netgraph/ng_ppp.c#13 integrate
.. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#18 integrate
.. //depot/projects/smpng/sys/netgraph/ng_rfc1490.c#7 integrate
.. //depot/projects/smpng/sys/netgraph/ng_sample.c#4 integrate
.. //depot/projects/smpng/sys/netgraph/ng_sppp.c#3 integrate
.. //depot/projects/smpng/sys/netgraph/ng_tee.c#11 integrate
.. //depot/projects/smpng/sys/netgraph/ng_tty.c#10 integrate
.. //depot/projects/smpng/sys/netinet/in_pcb.h#29 integrate
.. //depot/projects/smpng/sys/netinet/ip_divert.c#34 integrate
.. //depot/projects/smpng/sys/netinet/ip_dummynet.c#30 integrate
.. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#7 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw2.c#33 integrate
.. //depot/projects/smpng/sys/netinet/ip_mroute.c#32 integrate
.. //depot/projects/smpng/sys/netinet/ip_output.c#59 integrate
.. //depot/projects/smpng/sys/netinet/raw_ip.c#40 integrate
.. //depot/projects/smpng/sys/netinet/tcp.h#7 integrate
.. //depot/projects/smpng/sys/netinet/tcp_input.c#55 integrate
.. //depot/projects/smpng/sys/netinet/tcp_output.c#26 integrate
.. //depot/projects/smpng/sys/netinet/tcp_sack.c#1 branch
.. //depot/projects/smpng/sys/netinet/tcp_seq.h#7 integrate
.. //depot/projects/smpng/sys/netinet/tcp_subr.c#50 integrate
.. //depot/projects/smpng/sys/netinet/tcp_syncache.c#31 integrate
.. //depot/projects/smpng/sys/netinet/tcp_timer.c#17 integrate
.. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#29 integrate
.. //depot/projects/smpng/sys/netinet/tcp_var.h#26 integrate
.. //depot/projects/smpng/sys/netinet/udp_usrreq.c#44 integrate
.. //depot/projects/smpng/sys/netipx/spx_usrreq.c#13 integrate
.. //depot/projects/smpng/sys/netnatm/natm.c#19 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#25 integrate
.. //depot/projects/smpng/sys/pc98/pc98/sio.c#43 integrate
.. //depot/projects/smpng/sys/pci/if_dc.c#56 integrate
.. //depot/projects/smpng/sys/pci/if_pcn.c#26 integrate
.. //depot/projects/smpng/sys/pci/if_rl.c#49 integrate
.. //depot/projects/smpng/sys/pci/if_rlreg.h#17 integrate
.. //depot/projects/smpng/sys/pci/if_sf.c#28 integrate
.. //depot/projects/smpng/sys/pci/if_sis.c#42 integrate
.. //depot/projects/smpng/sys/pci/if_sk.c#34 integrate
.. //depot/projects/smpng/sys/pci/if_ste.c#31 integrate
.. //depot/projects/smpng/sys/pci/if_vr.c#27 integrate
.. //depot/projects/smpng/sys/pci/if_wb.c#25 integrate
.. //depot/projects/smpng/sys/pci/if_xl.c#45 integrate
.. //depot/projects/smpng/sys/powerpc/ofw/ofw_pcib_pci.c#3 integrate
.. //depot/projects/smpng/sys/powerpc/ofw/ofw_syscons.c#2 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/grackle.c#4 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/hrowpic.c#5 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/macio.c#7 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/openpic_macio.c#5 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/uninorth.c#4 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/nexus.c#8 integrate
.. //depot/projects/smpng/sys/powerpc/psim/iobus.c#4 integrate
.. //depot/projects/smpng/sys/powerpc/psim/openpic_iobus.c#3 integrate
.. //depot/projects/smpng/sys/security/mac/mac_net.c#12 integrate
.. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#27 integrate
.. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#22 integrate
.. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#26 integrate
.. //depot/projects/smpng/sys/security/mac_stub/mac_stub.c#8 integrate
.. //depot/projects/smpng/sys/security/mac_test/mac_test.c#23 integrate
.. //depot/projects/smpng/sys/sparc64/conf/NOTES#6 integrate
.. //depot/projects/smpng/sys/sparc64/include/bus.h#21 integrate
.. //depot/projects/smpng/sys/sparc64/include/bus_private.h#6 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/bus_machdep.c#25 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/iommu.c#24 integrate
.. //depot/projects/smpng/sys/sys/interrupt.h#12 integrate
.. //depot/projects/smpng/sys/sys/linedisc.h#2 integrate
.. //depot/projects/smpng/sys/sys/mac_policy.h#25 integrate
.. //depot/projects/smpng/sys/sys/proc.h#116 integrate
.. //depot/projects/smpng/sys/sys/procfs.h#3 integrate
.. //depot/projects/smpng/sys/sys/serial.h#1 branch
.. //depot/projects/smpng/sys/sys/sleepqueue.h#3 integrate
.. //depot/projects/smpng/sys/sys/socketvar.h#38 integrate
.. //depot/projects/smpng/sys/sys/tty.h#13 integrate
.. //depot/projects/smpng/sys/sys/ttycom.h#6 integrate
.. //depot/projects/smpng/sys/tools/acpi_quirks2h.awk#1 branch
.. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#28 integrate
.. //depot/projects/smpng/sys/vm/uma_core.c#44 integrate
.. //depot/projects/smpng/sys/vm/vm_glue.c#44 integrate
.. //depot/projects/smpng/sys/vm/vm_map.c#62 integrate
.. //depot/projects/smpng/sys/vm/vm_map.h#28 integrate
.. //depot/projects/smpng/sys/vm/vm_object.c#54 integrate
.. //depot/projects/smpng/sys/vm/vm_pageout.c#47 integrate
Differences ...
==== //depot/projects/smpng/sys/arm/arm/sys_machdep.c#2 (text+ko) ====
@@ -34,21 +34,12 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/sys_machdep.c,v 1.1 2004/05/14 11:46:42 cognet Exp $");
-
-#include "opt_kstack_pages.h"
-#include "opt_mac.h"
+__FBSDID("$FreeBSD: src/sys/arm/arm/sys_machdep.c,v 1.2 2004/06/28 11:35:05 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/lock.h>
-#include <sys/mac.h>
-#include <sys/malloc.h>
-#include <sys/mutex.h>
#include <sys/proc.h>
-#include <sys/smp.h>
#include <sys/sysproto.h>
-#include <sys/user.h>
#include <sys/syscall.h>
#include <sys/sysent.h>
==== //depot/projects/smpng/sys/boot/forth/loader.conf#25 (text+ko) ====
@@ -6,7 +6,7 @@
#
# All arguments must be in double quotes.
#
-# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.79 2004/06/22 22:57:13 brueffer Exp $
+# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.80 2004/06/24 17:49:18 josef Exp $
##############################################################
### Basic configuration options ############################
@@ -278,7 +278,6 @@
snd_via8233_load="NO" # via8233
snd_via82c686_load="NO" # via82c686
snd_driver_load="NO" # All sound drivers
-#pcm0.line="0" # Default value for a mixer channel
##############################################################
### USB modules ############################################
==== //depot/projects/smpng/sys/compat/svr4/imgact_svr4.c#11 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.22 2004/02/04 21:52:53 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.23 2004/06/24 02:21:17 obrien Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,7 +90,7 @@
}
bss_size = round_page(a_out->a_bss);
#ifdef DEBUG
- printf("imgact: text: %08lx, data: %08lx, bss: %08lx\n", a_out->a_text, a_out->a_data, bss_size);
+ printf("imgact: text: %08lx, data: %08lx, bss: %08lx\n", (u_long)a_out->a_text, (u_long)a_out->a_data, bss_size);
#endif
/*
@@ -193,7 +193,7 @@
#ifdef DEBUG
printf("imgact: startaddr=%08lx, length=%08lx\n", (u_long)vmaddr,
- a_out->a_text + a_out->a_data);
+ (u_long)a_out->a_text + a_out->a_data);
#endif
/*
* allow read/write of data
==== //depot/projects/smpng/sys/conf/NOTES#70 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1233 2004/06/22 22:02:57 bms Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1237 2004/06/29 02:30:11 jhb Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -95,7 +95,7 @@
#
# BLKDEV_IOSIZE sets the default block size used in user block
-# device I/O. Note that this value will be overriden by the label
+# device I/O. Note that this value will be overridden by the label
# when specifying a block device from a label with a non-0
# partition blocksize. The default is PAGE_SIZE.
#
@@ -181,10 +181,14 @@
# SMP Debugging Options:
#
# MUTEX_DEBUG enables various extra assertions in the mutex code.
+# SLEEPQUEUE_PROFILING enables rudimentary profiling of the hash table
+# used to hold active sleep queues.
+# TURNSTILE_PROFILING enables rudimentary profiling of the hash table
+# used to hold active lock queues.
# WITNESS enables the witness code which detects deadlocks and cycles
# during locking operations.
# WITNESS_DDB causes the witness code to drop into the kernel debugger if
-# a lock heirarchy violation occurs or if locks are held when going to
+# a lock hierarchy violation occurs or if locks are held when going to
# sleep.
# WITNESS_SKIPSPIN disables the witness checks on spin mutexes.
options MUTEX_DEBUG
@@ -196,6 +200,10 @@
# MUTEX_PROFILING(9) for details.
options MUTEX_PROFILING
+# Profiling for internal hash tables.
+options SLEEPQUEUE_PROFILING
+options TURNSTILE_PROFILING
+
#####################################################################
# COMPATIBILITY OPTIONS
@@ -328,7 +336,7 @@
#
# REGRESSION causes optional kernel interfaces necessary only for regression
-# testing to be enabled. These interfaces may consitute security risks
+# testing to be enabled. These interfaces may constitute security risks
# when enabled, as they permit processes to easily modify aspects of the
# run-time environment to reproduce unlikely or unusual (possibly normally
# impossible) scenarios.
@@ -408,7 +416,7 @@
options ALTQ_RIO # RED In/Out
options ALTQ_HFSC # Hierarchical Packet Scheduler
options ALTQ_CDNR # Traffic conditioner
-options ALTQ_PRIQ # Prioirity Queueing
+options ALTQ_PRIQ # Priority Queueing
options ALTQ_NOPCC # Required for SMP build
options ALTQ_DEBUG
@@ -434,7 +442,9 @@
options NETGRAPH_BRIDGE
options NETGRAPH_CISCO
options NETGRAPH_ECHO
+options NETGRAPH_EIFACE
options NETGRAPH_ETHER
+options NETGRAPH_FEC
options NETGRAPH_FRAME_RELAY
options NETGRAPH_GIF
options NETGRAPH_GIF_DEMUX
@@ -589,7 +599,7 @@
# packets without touching the ttl). This can be useful to hide firewalls
# from traceroute and similar tools.
#
-# PFIL_HOOKS enables an abtraction layer which is meant to be used in
+# PFIL_HOOKS enables an abstraction layer which is meant to be used in
# network code where filtering is required. See pfil(9). This option is
# required by the IPFILTER option and the PF device.
#
@@ -657,7 +667,7 @@
options BRIDGE
# Zero copy sockets support. This enables "zero copy" for sending and
-# receving data via a socket. The send side works for any type of NIC,
+# receiving data via a socket. The send side works for any type of NIC,
# the receive side only works for NICs that support MTUs greater than the
# page size of your architecture and that support header splitting. See
# zero_copy(9) for more details.
@@ -932,8 +942,8 @@
#
# The cd driver drives SCSI Read Only Direct Access ("cd") devices.
#
-# The ses driver drives SCSI Envinronment Services ("ses") and
-# SAF-TE ("SCSI Accessable Fault-Tolerant Enclosure") devices.
+# The ses driver drives SCSI Environment Services ("ses") and
+# SAF-TE ("SCSI Accessible Fault-Tolerant Enclosure") devices.
#
# The pt driver drives SCSI Processor devices.
#
@@ -1554,7 +1564,7 @@
#
# MII bus support is required for some PCI 10/100 ethernet NICs,
# namely those which use MII-compliant transceivers or implement
-# tranceiver control interfaces that operate like an MII. Adding
+# transceiver control interfaces that operate like an MII. Adding
# "device miibus0" to the kernel config pulls in support for
# the generic miibus API and all of the PHY drivers, including a
# generic one for PHYs that aren't specifically handled by an
@@ -1644,7 +1654,7 @@
# Compaq Netelligent 10/100 cards and the built-in ethernet controllers
# in several Compaq Prosignia, Proliant and Deskpro systems. It also
# supports several Olicom 10Mbps and 10/100 boards.
-# tx: SMC 9432 TX, BTX and FTX cards. (SMC EtherPower II serie)
+# tx: SMC 9432 TX, BTX and FTX cards. (SMC EtherPower II series)
# txp: Support for 3Com 3cR990 cards with the "Typhoon" chipset
# vr: Support for various fast ethernet adapters based on the VIA
# Technologies VT3043 `Rhine I' and VT86C100A `Rhine II' chips,
@@ -1800,7 +1810,7 @@
# Gravis UltraSound ISA PnP/non-PnP
# Crystal Semiconductor CS461x/428x PCI
# Neomagic 256AV (ac97)
-# Most of the more common ISA/PnP sb/mss/ess compatable cards.
+# Most of the more common ISA/PnP sb/mss/ess compatible cards.
device pcm
@@ -1919,7 +1929,7 @@
# options BROOKTREE_SYSTEM_DEFAULT=BROOKTREE_PAL
# or
# options BROOKTREE_SYSTEM_DEFAULT=BROOKTREE_NTSC
-# Specifes the default video capture mode.
+# Specifies the default video capture mode.
# This is required for Dual Crystal (28&35Mhz) boards where PAL is used
# to prevent hangs during initialisation. eg VideoLogic Captivator PCI.
#
@@ -2224,12 +2234,12 @@
makeoptions UKBD_DFLT_KEYMAP=it.iso
# options for uplcom:
-options UPLCOM_INTR_INTERVAL=100 # interrpt pipe interval
+options UPLCOM_INTR_INTERVAL=100 # interrupt pipe interval
# in milliseconds
# options for uvscom:
options UVSCOM_DEFAULT_OPKTSIZE=8 # default output packet size
-options UVSCOM_INTR_INTERVAL=100 # interrpt pipe interval
+options UVSCOM_INTR_INTERVAL=100 # interrupt pipe interval
# in milliseconds
#####################################################################
==== //depot/projects/smpng/sys/conf/files#111 (text+ko) ====
@@ -1,9 +1,14 @@
-# $FreeBSD: src/sys/conf/files,v 1.907 2004/06/22 20:13:24 brooks Exp $
+# $FreeBSD: src/sys/conf/files,v 1.914 2004/06/28 16:22:20 imp Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
# dependency lines other than the first are silently ignored.
#
+acpi_quirks.h standard \
+ dependency "$S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \
+ compile-with "${AWK} -f $S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \
+ no-obj no-implicit-rule \
+ clean "acpi_quirks.h"
aicasm optional ahc \
dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \
compile-with "CC=${CC} ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \
@@ -35,20 +40,20 @@
compile-with "CC=${CC} AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h emu10k1-alsa%diked.h" \
no-obj no-implicit-rule before-depend \
clean "emu10k1-alsa%diked.h"
-miidevs.h standard \
+miidevs.h optional miibus \
dependency "$S/tools/miidevs2h.awk $S/dev/mii/miidevs" \
compile-with "${AWK} -f $S/tools/miidevs2h.awk $S/dev/mii/miidevs" \
- no-obj no-implicit-rule \
+ no-obj no-implicit-rule before-depend \
clean "miidevs.h"
-pccarddevs.h standard \
+pccarddevs.h optional pccard \
dependency "$S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \
compile-with "${AWK} -f $S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \
- no-obj no-implicit-rule \
+ no-obj no-implicit-rule before-depend \
clean "pccarddevs.h"
-usbdevs.h standard \
+usbdevs.h optional usb \
dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
- no-obj no-implicit-rule \
+ no-obj no-implicit-rule before-depend \
clean "usbdevs.h"
kern/device_if.m standard
kern/bus_if.m standard
@@ -1408,7 +1413,9 @@
netgraph/ng_cisco.c optional netgraph_cisco
netgraph/ng_device.c optional netgraph_device
netgraph/ng_echo.c optional netgraph_echo
+netgraph/ng_eiface.c optional netgraph_eiface
netgraph/ng_ether.c optional netgraph_ether
+netgraph/ng_fec.c optional netgraph_fec
netgraph/ng_frame_relay.c optional netgraph_frame_relay
netgraph/ng_gif.c optional netgraph_gif
netgraph/ng_gif_demux.c optional netgraph_gif_demux
@@ -1465,6 +1472,7 @@
netinet/tcp_hostcache.c optional inet
netinet/tcp_input.c optional inet
netinet/tcp_output.c optional inet
+netinet/tcp_sack.c optional inet
netinet/tcp_subr.c optional inet
netinet/tcp_syncache.c optional inet
netinet/tcp_timer.c optional inet
==== //depot/projects/smpng/sys/conf/kern.post.mk#37 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.post.mk,v 1.66 2004/05/26 16:31:41 imp Exp $
+# $FreeBSD: src/sys/conf/kern.post.mk,v 1.68 2004/06/27 23:03:43 imp Exp $
# Part of a unified Makefile for building kernels. This part includes all
# the definitions that need to be after all the % directives except %RULES
@@ -77,8 +77,7 @@
${SYSTEM_LD_TAIL}
.if !exists(${.OBJDIR}/.depend)
-${SYSTEM_OBJS}: assym.s pccarddevs.h usbdevs.h miidevs.h vnode_if.h \
- ${BEFORE_DEPEND:M*.h} ${MFILES:T:S/.m$/.h/}
+${SYSTEM_OBJS}: assym.s vnode_if.h ${BEFORE_DEPEND:M*.h} ${MFILES:T:S/.m$/.h/}
.endif
LNFILES= ${CFILES:T:S/.c$/.ln/}
@@ -131,17 +130,14 @@
if [ -f .depend ]; then mv .depend .olddep; fi
${MAKE} _kernel-depend
-# XXX this belongs elsewhere (inside GEN_CFILES if possible).
-GEN_M_CFILES= ${MFILES:T:S/.m$/.c/}
-
# The argument list can be very long, so use make -V and xargs to
# pass it to mkdep.
-_kernel-depend: assym.s miidevs.h pccarddevs.h usbdevs.h vnode_if.h \
- ${BEFORE_DEPEND} ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} \
- ${GEN_M_CFILES} ${SFILES} ${MFILES:T:S/.m$/.h/}
+_kernel-depend: assym.s vnode_if.h ${BEFORE_DEPEND} ${CFILES} \
+ ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \
+ ${MFILES:T:S/.m$/.h/}
if [ -f .olddep ]; then mv .olddep .depend; fi
rm -f .newdep
- ${MAKE} -V CFILES -V SYSTEM_CFILES -V GEN_CFILES -V GEN_M_CFILES | \
+ ${MAKE} -V CFILES -V SYSTEM_CFILES -V GEN_CFILES | \
MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f .newdep ${CFLAGS}
${MAKE} -V SFILES | \
MKDEP_CPP="${CC} -E" xargs mkdep -a -f .newdep ${ASM_CFLAGS}
==== //depot/projects/smpng/sys/conf/kern.pre.mk#36 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.53 2004/06/13 17:29:06 mlaier Exp $
+# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.54 2004/06/27 23:03:43 imp Exp $
# Part of a unified Makefile for building kernels. This part contains all
# of the definitions that need to be before %BEFORE_DEPEND.
@@ -117,7 +117,7 @@
NORMAL_LINT= ${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.IMPSRC}
-GEN_CFILES= $S/$M/$M/genassym.c
+GEN_CFILES= $S/$M/$M/genassym.c ${MFILES:T:S/.m$/.c/}
SYSTEM_CFILES= config.c env.c hints.c majors.c vnode_if.c
SYSTEM_DEP= Makefile ${SYSTEM_OBJS}
SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS}
==== //depot/projects/smpng/sys/conf/kmod.mk#31 (text+ko) ====
@@ -1,5 +1,5 @@
# From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
-# $FreeBSD: src/sys/conf/kmod.mk,v 1.161 2004/06/13 17:29:06 mlaier Exp $
+# $FreeBSD: src/sys/conf/kmod.mk,v 1.162 2004/06/24 06:29:22 njl Exp $
#
# The include file <bsd.kmod.mk> handles installing Kernel Loadable Device
# drivers (KLD's).
@@ -343,6 +343,17 @@
.endif
.endfor # _i
+.if ${SRCS:Macpi_quirks.h} != ""
+CLEANFILES+= acpi_quirks.h
+.if !exists(@)
+acpi_quirks.h: @
+.endif
+.if exists(@)
+acpi_quirks.h: @/tools/acpi_quirks2h.awk @/dev/acpica/acpi_quirks
+.endif
+ ${AWK} -f @/tools/acpi_quirks2h.awk @/dev/acpica/acpi_quirks
+.endif
+
regress:
lint: ${SRCS}
==== //depot/projects/smpng/sys/conf/options#78 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.453 2004/06/13 17:29:06 mlaier Exp $
+# $FreeBSD: src/sys/conf/options,v 1.457 2004/06/29 02:30:12 jhb Exp $
#
# On the handling of kernel options
#
@@ -110,6 +110,7 @@
SCHED_4BSD opt_sched.h
SCHED_ULE opt_sched.h
SHOW_BUSYBUFS
+SLEEPQUEUE_PROFILING
SPX_HACK
SUIDDIR opt_suiddir.h
MSGMNB opt_sysvipc.h
@@ -134,6 +135,7 @@
SYSVSEM opt_sysvipc.h
SYSVSHM opt_sysvipc.h
SW_WATCHDOG opt_watchdog.h
+TURNSTILE_PROFILING
TTYHOG opt_tty.h
VFS_AIO
WLCACHE opt_wavelan.h
@@ -354,6 +356,7 @@
SLIP_IFF_OPTS opt_slip.h
TCPDEBUG
TCP_SIGNATURE opt_inet.h
+TCP_SACK_DEBUG opt_tcp_sack.h
TCP_DROP_SYNFIN opt_tcp_input.h
XBONEHACK
@@ -377,7 +380,9 @@
NETGRAPH_BRIDGE opt_netgraph.h
NETGRAPH_CISCO opt_netgraph.h
NETGRAPH_ECHO opt_netgraph.h
+NETGRAPH_EIFACE opt_netgraph.h
NETGRAPH_ETHER opt_netgraph.h
+NETGRAPH_FEC opt_netgraph.h
NETGRAPH_FRAME_RELAY opt_netgraph.h
NETGRAPH_GIF opt_netgraph.h
NETGRAPH_GIF_DEMUX opt_netgraph.h
==== //depot/projects/smpng/sys/conf/options.powerpc#9 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.powerpc,v 1.8 2004/01/21 05:20:58 grehan Exp $
+# $FreeBSD: src/sys/conf/options.powerpc,v 1.9 2004/06/25 13:44:34 grehan Exp $
# Options specific to the powerpc platform kernels
OEA opt_global.h
@@ -12,3 +12,5 @@
PSIM
SC_OFWFB opt_ofwfb.h
+
+OFWCONS_POLL_HZ opt_ofw.h
==== //depot/projects/smpng/sys/conf/options.sparc64#11 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.sparc64,v 1.10 2004/05/08 13:53:46 marius Exp $
+# $FreeBSD: src/sys/conf/options.sparc64,v 1.11 2004/06/24 02:57:10 obrien Exp $
SUN4U opt_global.h
@@ -9,6 +9,7 @@
PSYCHO_DEBUG opt_psycho.h
DEBUGGER_ON_POWERFAIL opt_psycho.h
OFW_PCI_DEBUG opt_ofw_pci.h
+OFWCONS_POLL_HZ opt_ofw.h
# Debug IOMMU inserts/removes using diagnostic accesses. Very loud.
IOMMU_DIAG opt_iommu.h
PMAP_STATS opt_pmap.h
==== //depot/projects/smpng/sys/dev/acpica/acpi.c#66 (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.164 2004/06/23 17:21:02 jhb Exp $
+ * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.168 2004/06/29 01:33:35 njl Exp $
*/
#include "opt_acpi.h"
@@ -52,6 +52,7 @@
#include <machine/bus.h>
#include <sys/rman.h>
#include <isa/isavar.h>
+#include <isa/pnpvar.h>
#include "acpi.h"
#include <dev/acpica/acpivar.h>
@@ -129,7 +130,6 @@
static ACPI_STATUS acpi_probe_child(ACPI_HANDLE handle, UINT32 level,
void *context, void **status);
static void acpi_shutdown_final(void *arg, int howto);
-static void acpi_shutdown_poweroff(void *arg);
static void acpi_enable_fixed_events(struct acpi_softc *sc);
static int acpi_parse_prw(ACPI_HANDLE h, struct acpi_prw_data *prw);
static ACPI_STATUS acpi_wake_limit(ACPI_HANDLE h, UINT32 level, void *context,
@@ -892,10 +892,9 @@
if (res == NULL)
return (NULL);
- /* Copy the bus tag from the pre-allocated resource. */
+ /* Copy the bus tag and handle from the pre-allocated resource. */
rman_set_bustag(res, rman_get_bustag(rle->res));
- if (type == SYS_RES_IOPORT)
- rman_set_bushandle(res, res->r_start);
+ rman_set_bushandle(res, rman_get_start(res));
/* If requested, activate the resource using the parent's method. */
if (flags & RF_ACTIVE)
@@ -971,19 +970,7 @@
return (bus_alloc_resource_any(dev, type, rid, RF_ACTIVE));
}
-/*
- * Handle ISA-like devices probing for a PnP ID to match.
- */
-#define PNP_EISAID(s) \
- ((((s[0] - '@') & 0x1f) << 2) \
- | (((s[1] - '@') & 0x18) >> 3) \
- | (((s[1] - '@') & 0x07) << 13) \
- | (((s[2] - '@') & 0x1f) << 8) \
- | (PNP_HEXTONUM(s[4]) << 16) \
- | (PNP_HEXTONUM(s[3]) << 20) \
- | (PNP_HEXTONUM(s[6]) << 24) \
- | (PNP_HEXTONUM(s[5]) << 28))
-
+/* Probe _HID and _CID for compatible ISA PNP ids. */
static uint32_t
acpi_isa_get_logicalid(device_t dev)
{
@@ -1282,9 +1269,9 @@
ACPI_STATUS status;
/*
- * If powering off, run the actual shutdown code on each processor.
- * It will only perform the shutdown on the BSP. Some chipsets do
- * not power off the system correctly if called from an AP.
+ * XXX Shutdown code should only run on the BSP (cpuid 0).
+ * Some chipsets do not power off the system correctly if called from
+ * an AP.
*/
if ((howto & RB_POWEROFF) != 0) {
status = AcpiEnterSleepStatePrep(ACPI_STATE_S5);
@@ -1294,36 +1281,20 @@
return;
}
printf("Powering system off using ACPI\n");
- smp_rendezvous(NULL, acpi_shutdown_poweroff, NULL, NULL);
+ ACPI_DISABLE_IRQS();
+ status = AcpiEnterSleepState(ACPI_STATE_S5);
+ if (ACPI_FAILURE(status)) {
+ printf("ACPI power-off failed - %s\n", AcpiFormatException(status));
+ } else {
+ DELAY(1000000);
+ printf("ACPI power-off failed - timeout\n");
+ }
} else {
printf("Shutting down ACPI\n");
AcpiTerminate();
}
}
-/*
- * Since this function may be called with locks held or in an unknown
- * context, it cannot allocate memory, acquire locks, sleep, etc.
- */
-static void
-acpi_shutdown_poweroff(void *arg)
-{
- ACPI_STATUS status;
-
- /* Only attempt to power off if this is the BSP (cpuid 0). */
- if (PCPU_GET(cpuid) != 0)
- return;
-
- ACPI_DISABLE_IRQS();
- status = AcpiEnterSleepState(ACPI_STATE_S5);
- if (ACPI_FAILURE(status)) {
- printf("ACPI power-off failed - %s\n", AcpiFormatException(status));
- } else {
- DELAY(1000000);
- printf("ACPI power-off failed - timeout\n");
- }
-}
-
static void
acpi_enable_fixed_events(struct acpi_softc *sc)
{
==== //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#26 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.40 2004/06/19 02:27:23 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.41 2004/06/24 00:38:51 njl Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -1046,7 +1046,7 @@
struct sbuf sb;
char buf[128];
int i;
- uint64_t fract, sum, whole;
+ uintmax_t fract, sum, whole;
sum = 0;
for (i = 0; i < cpu_cx_count; i++)
@@ -1054,7 +1054,7 @@
sbuf_new(&sb, buf, sizeof(buf), SBUF_FIXEDLEN);
for (i = 0; i < cpu_cx_count; i++) {
if (sum > 0) {
- whole = cpu_cx_stats[i] * 100;
+ whole = (uintmax_t)cpu_cx_stats[i] * 100;
fract = (whole % sum) * 100;
sbuf_printf(&sb, "%u.%02u%% ", (u_int)(whole / sum),
(u_int)(fract / sum));
==== //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#29 (text+ko) ====
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.52 2004/06/13 22:52:30 njl Exp $
+ * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.53 2004/06/28 20:41:30 njl Exp $
*/
/******************************************************************************
*
@@ -137,7 +137,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.52 2004/06/13 22:52:30 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.53 2004/06/28 20:41:30 njl Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -822,11 +822,18 @@
AcpiOsStall(1);
/*
+ * If we're up and running, wait up to 1 ms. Otherwise, burn the entire
+ * timeout value with delays since msleep() is a no-op.
+ */
+ period = 1000 / sc->ec_polldelay;
+ if (cold)
+ period *= ec_poll_timeout;
+
+ /*
* Poll the EC status register to detect completion of the last
- * command. First, wait up to 1 ms in chunks of sc->ec_polldelay
- * microseconds.
+ * command in chunks of ec_polldelay.
*/
- for (i = 0; i < 1000 / sc->ec_polldelay; i++) {
+ for (i = 0; i < period; i++) {
EcStatus = EC_GET_CSR(sc);
if (EVENT_READY(Event, EcStatus)) {
Status = AE_OK;
@@ -847,10 +854,10 @@
sc->ec_polldelay = 100;
/*
- * If we still don't have a response, wait up to ec_poll_timeout ms
- * for completion, sleeping for chunks of 10 ms.
+ * If we still don't have a response and we're up and running, wait up
+ * to ec_poll_timeout ms for completion, sleeping for chunks of 10 ms.
*/
- if (Status != AE_OK) {
+ if (!cold && Status != AE_OK) {
retval = -1;
for (i = 0; i < ec_poll_timeout / 10; i++) {
if (retval != 0)
==== //depot/projects/smpng/sys/dev/acpica/acpi_pci.c#11 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.19 2004/06/23 15:08:40 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.20 2004/06/24 01:57:31 njl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -232,7 +232,7 @@
if (ACPI_FAILURE(status))
printf("WARNING: Unable to detach object data from %s - %s\n",
acpi_name(handle), AcpiFormatException(status));
- status = AcpiAttachData(handle, acpi_fake_objhandler, child);
+ status = AcpiAttachData(handle, acpi_fake_objhandler, pci_child);
if (ACPI_FAILURE(status))
printf("WARNING: Unable to attach object data to %s - %s\n",
acpi_name(handle), AcpiFormatException(status));
@@ -261,8 +261,7 @@
dinfo->ap_dinfo.cfg.slot == slot) {
dinfo->ap_handle = handle;
acpi_pci_update_device(handle, devlist[i]);
- free(devlist, M_TEMP);
- return_ACPI_STATUS (AE_OK);
+ break;
}
}
free(devlist, M_TEMP);
==== //depot/projects/smpng/sys/dev/ar/if_ar.c#14 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ar/if_ar.c,v 1.63 2004/05/29 00:51:08 julian Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ar/if_ar.c,v 1.64 2004/06/25 19:22:04 julian Exp $");
/*
* Programming assumptions and other issues.
@@ -2228,10 +2228,9 @@
struct ar_softc * sc = NG_NODE_PRIVATE(NG_HOOK_NODE(hook));
struct ifqueue *xmitq_p;
struct mbuf *m;
- meta_p meta;
+ struct ng_tag_prio *ptag;
NGI_GET_M(item, m);
- NGI_GET_META(item, meta);
NG_FREE_ITEM(item);
/*
* data doesn't come in from just anywhere (e.g control hook)
@@ -2244,11 +2243,12 @@
/*
* Now queue the data for when it can be sent
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list