PERFORCE change 140473 for review
Marius Strobl
marius at FreeBSD.org
Wed Apr 23 21:36:00 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=140473
Change 140473 by marius at flak on 2008/04/23 21:35:45
IFC @140469 and adjust schizo(4) to MD interrupt changes.
Affected files ...
.. //depot/projects/usiii/amd64/amd64/machdep.c#6 integrate
.. //depot/projects/usiii/amd64/conf/GENERIC#8 integrate
.. //depot/projects/usiii/amd64/include/clock.h#4 integrate
.. //depot/projects/usiii/amd64/include/cpufunc.h#2 integrate
.. //depot/projects/usiii/amd64/isa/clock.c#6 integrate
.. //depot/projects/usiii/amd64/linux32/linux32_dummy.c#3 integrate
.. //depot/projects/usiii/arm/arm/intr.c#3 integrate
.. //depot/projects/usiii/arm/at91/at91.c#3 integrate
.. //depot/projects/usiii/arm/conf/AVILA#7 integrate
.. //depot/projects/usiii/arm/conf/BWCT#4 integrate
.. //depot/projects/usiii/arm/conf/CRB#5 integrate
.. //depot/projects/usiii/arm/conf/EP80219#4 integrate
.. //depot/projects/usiii/arm/conf/HL200#3 integrate
.. //depot/projects/usiii/arm/conf/IQ31244#4 integrate
.. //depot/projects/usiii/arm/conf/KB920X#4 integrate
.. //depot/projects/usiii/arm/conf/SIMICS#4 integrate
.. //depot/projects/usiii/arm/conf/SKYEYE#4 integrate
.. //depot/projects/usiii/arm/include/intr.h#2 integrate
.. //depot/projects/usiii/arm/sa11x0/sa11x0_ost.c#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_string.c#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/rpc/xdr.h#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/sys/acl.h#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/sys/bitmap.h#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/sys/byteorder.h#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/sys/callb.h#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/sys/cpupart.h#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/sys/cpuvar.h#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/sys/dkio.h#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/sys/mntent.h#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/sys/objfs.h#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/sys/sysmacros.h#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/sys/taskq.h#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/sys/taskq_impl.h#2 integrate
.. //depot/projects/usiii/compat/linux/linux_file.c#5 integrate
.. //depot/projects/usiii/compat/svr4/svr4_misc.c#4 integrate
.. //depot/projects/usiii/conf/NOTES#9 integrate
.. //depot/projects/usiii/conf/files#9 integrate
.. //depot/projects/usiii/conf/files.amd64#6 integrate
.. //depot/projects/usiii/conf/files.i386#6 integrate
.. //depot/projects/usiii/conf/files.pc98#4 integrate
.. //depot/projects/usiii/conf/options#9 integrate
.. //depot/projects/usiii/contrib/dev/ral/LICENSE#1 branch
.. //depot/projects/usiii/contrib/dev/ral/Makefile#1 branch
.. //depot/projects/usiii/contrib/dev/ral/rt2561.fw.uu#1 branch
.. //depot/projects/usiii/contrib/dev/ral/rt2561s.fw.uu#1 branch
.. //depot/projects/usiii/contrib/dev/ral/rt2661.fw.uu#1 branch
.. //depot/projects/usiii/contrib/dev/ral/rt2661_ucode.h#1 branch
.. //depot/projects/usiii/contrib/dev/ral/rt2860.fw.uu#1 branch
.. //depot/projects/usiii/contrib/pf/net/pf.c#3 integrate
.. //depot/projects/usiii/dev/ata/ata-all.c#4 integrate
.. //depot/projects/usiii/dev/ata/ata-chipset.c#7 integrate
.. //depot/projects/usiii/dev/ata/ata-dma.c#5 integrate
.. //depot/projects/usiii/dev/ata/ata-pci.c#4 integrate
.. //depot/projects/usiii/dev/ata/ata-pci.h#6 integrate
.. //depot/projects/usiii/dev/ata/ata-queue.c#3 integrate
.. //depot/projects/usiii/dev/ath/ah_osdep.c#2 integrate
.. //depot/projects/usiii/dev/ath/ah_osdep.h#2 integrate
.. //depot/projects/usiii/dev/ath/ath_rate/amrr/amrr.c#2 integrate
.. //depot/projects/usiii/dev/ath/ath_rate/amrr/amrr.h#2 integrate
.. //depot/projects/usiii/dev/ath/ath_rate/onoe/onoe.c#2 integrate
.. //depot/projects/usiii/dev/ath/ath_rate/onoe/onoe.h#2 integrate
.. //depot/projects/usiii/dev/ath/ath_rate/sample/sample.c#4 integrate
.. //depot/projects/usiii/dev/ath/ath_rate/sample/sample.h#2 integrate
.. //depot/projects/usiii/dev/ath/if_ath.c#6 integrate
.. //depot/projects/usiii/dev/ath/if_ath_pci.c#3 integrate
.. //depot/projects/usiii/dev/ath/if_athioctl.h#2 integrate
.. //depot/projects/usiii/dev/ath/if_athrate.h#2 integrate
.. //depot/projects/usiii/dev/ath/if_athvar.h#2 integrate
.. //depot/projects/usiii/dev/awi/am79c930.c#2 delete
.. //depot/projects/usiii/dev/awi/am79c930reg.h#2 delete
.. //depot/projects/usiii/dev/awi/am79c930var.h#2 delete
.. //depot/projects/usiii/dev/awi/awi.c#3 delete
.. //depot/projects/usiii/dev/awi/awireg.h#2 delete
.. //depot/projects/usiii/dev/awi/awivar.h#2 delete
.. //depot/projects/usiii/dev/awi/if_awi_pccard.c#2 delete
.. //depot/projects/usiii/dev/cxgb/cxgb_l2t.c#4 delete
.. //depot/projects/usiii/dev/cxgb/cxgb_l2t.h#4 delete
.. //depot/projects/usiii/dev/cxgb/cxgb_main.c#6 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_offload.c#4 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_offload.h#5 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_cpl_io.c#4 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#4 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_ddp.c#3 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_defs.h#4 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_l2t.c#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_l2t.h#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_listen.c#3 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#3 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_tom.c#3 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#3 integrate
.. //depot/projects/usiii/dev/if_ndis/if_ndis.c#4 integrate
.. //depot/projects/usiii/dev/if_ndis/if_ndisvar.h#3 integrate
.. //depot/projects/usiii/dev/ipw/if_ipw.c#4 integrate
.. //depot/projects/usiii/dev/ipw/if_ipwvar.h#3 integrate
.. //depot/projects/usiii/dev/iscsi/initiator/iscsi.c#2 integrate
.. //depot/projects/usiii/dev/iwi/if_iwi.c#4 integrate
.. //depot/projects/usiii/dev/iwi/if_iwivar.h#2 integrate
.. //depot/projects/usiii/dev/k8temp/k8temp.c#2 integrate
.. //depot/projects/usiii/dev/malo/if_malo.c#2 integrate
.. //depot/projects/usiii/dev/malo/if_malo.h#2 integrate
.. //depot/projects/usiii/dev/ral/if_ral_pci.c#2 integrate
.. //depot/projects/usiii/dev/ral/if_ralrate.c#2 delete
.. //depot/projects/usiii/dev/ral/if_ralrate.h#2 delete
.. //depot/projects/usiii/dev/ral/rt2560.c#6 integrate
.. //depot/projects/usiii/dev/ral/rt2560reg.h#3 integrate
.. //depot/projects/usiii/dev/ral/rt2560var.h#3 integrate
.. //depot/projects/usiii/dev/ral/rt2661.c#6 integrate
.. //depot/projects/usiii/dev/ral/rt2661_ucode.h#2 delete
.. //depot/projects/usiii/dev/ral/rt2661var.h#2 integrate
.. //depot/projects/usiii/dev/sound/pci/hda/hdac.c#5 integrate
.. //depot/projects/usiii/dev/usb/if_rum.c#7 integrate
.. //depot/projects/usiii/dev/usb/if_rumvar.h#2 integrate
.. //depot/projects/usiii/dev/usb/if_ural.c#5 integrate
.. //depot/projects/usiii/dev/usb/if_uralvar.h#2 integrate
.. //depot/projects/usiii/dev/usb/if_zyd.c#7 integrate
.. //depot/projects/usiii/dev/usb/if_zydreg.h#3 integrate
.. //depot/projects/usiii/dev/usb/uipaq.c#4 integrate
.. //depot/projects/usiii/dev/usb/usbdevs#8 integrate
.. //depot/projects/usiii/dev/wi/if_wavelan_ieee.h#2 integrate
.. //depot/projects/usiii/dev/wi/if_wi.c#4 integrate
.. //depot/projects/usiii/dev/wi/if_wi_pccard.c#2 integrate
.. //depot/projects/usiii/dev/wi/if_wi_pci.c#2 integrate
.. //depot/projects/usiii/dev/wi/if_wivar.h#2 integrate
.. //depot/projects/usiii/dev/wi/spectrum24t_cf.h#2 delete
.. //depot/projects/usiii/dev/wpi/if_wpi.c#4 integrate
.. //depot/projects/usiii/dev/wpi/if_wpivar.h#3 integrate
.. //depot/projects/usiii/i386/bios/apm.c#3 integrate
.. //depot/projects/usiii/i386/conf/GENERIC#8 integrate
.. //depot/projects/usiii/i386/conf/PAE#4 integrate
.. //depot/projects/usiii/i386/i386/machdep.c#5 integrate
.. //depot/projects/usiii/i386/include/clock.h#4 integrate
.. //depot/projects/usiii/i386/include/cpufunc.h#2 integrate
.. //depot/projects/usiii/i386/isa/clock.c#5 integrate
.. //depot/projects/usiii/i386/isa/pmtimer.c#2 integrate
.. //depot/projects/usiii/i386/linux/linux_dummy.c#3 integrate
.. //depot/projects/usiii/ia64/conf/DEFAULTS#5 integrate
.. //depot/projects/usiii/ia64/ia64/clock.c#3 integrate
.. //depot/projects/usiii/ia64/ia64/machdep.c#7 integrate
.. //depot/projects/usiii/ia64/ia64/mp_machdep.c#3 integrate
.. //depot/projects/usiii/ia64/ia64/pmap.c#6 integrate
.. //depot/projects/usiii/ia64/include/vmparam.h#4 integrate
.. //depot/projects/usiii/kern/kern_linker.c#5 integrate
.. //depot/projects/usiii/kern/subr_clock.c#3 integrate
.. //depot/projects/usiii/kern/subr_rtc.c#2 integrate
.. //depot/projects/usiii/kern/subr_witness.c#8 integrate
.. //depot/projects/usiii/kern/vfs_mount.c#7 integrate
.. //depot/projects/usiii/mips/conf/ADM5120#2 integrate
.. //depot/projects/usiii/mips/conf/IDT#2 integrate
.. //depot/projects/usiii/mips/conf/MALTA#2 integrate
.. //depot/projects/usiii/mips/conf/QEMU#2 integrate
.. //depot/projects/usiii/mips/conf/SENTRY5#2 integrate
.. //depot/projects/usiii/modules/Makefile#9 integrate
.. //depot/projects/usiii/modules/ath_rate_amrr/Makefile#2 integrate
.. //depot/projects/usiii/modules/ath_rate_onoe/Makefile#2 integrate
.. //depot/projects/usiii/modules/ath_rate_sample/Makefile#2 integrate
.. //depot/projects/usiii/modules/awi/Makefile#2 delete
.. //depot/projects/usiii/modules/cxgb/cxgb/Makefile#3 integrate
.. //depot/projects/usiii/modules/cxgb/tom/Makefile#3 integrate
.. //depot/projects/usiii/modules/firmware/Makefile#2 integrate
.. //depot/projects/usiii/modules/malo/Makefile#2 integrate
.. //depot/projects/usiii/modules/ral/Makefile#2 integrate
.. //depot/projects/usiii/modules/ralfw/Makefile#1 branch
.. //depot/projects/usiii/modules/ralfw/Makefile.inc#1 branch
.. //depot/projects/usiii/modules/ralfw/rt2561/Makefile#1 branch
.. //depot/projects/usiii/modules/ralfw/rt2561s/Makefile#1 branch
.. //depot/projects/usiii/modules/ralfw/rt2661/Makefile#1 branch
.. //depot/projects/usiii/modules/wlan/Makefile#2 integrate
.. //depot/projects/usiii/modules/wlan_acl/Makefile#2 integrate
.. //depot/projects/usiii/modules/wlan_amrr/Makefile#2 integrate
.. //depot/projects/usiii/modules/wlan_ccmp/Makefile#2 integrate
.. //depot/projects/usiii/modules/wlan_rssadapt/Makefile#1 branch
.. //depot/projects/usiii/modules/wlan_scan_ap/Makefile#2 delete
.. //depot/projects/usiii/modules/wlan_scan_sta/Makefile#2 delete
.. //depot/projects/usiii/modules/wlan_tkip/Makefile#2 integrate
.. //depot/projects/usiii/modules/wlan_wep/Makefile#2 integrate
.. //depot/projects/usiii/modules/wlan_xauth/Makefile#2 integrate
.. //depot/projects/usiii/net/if.c#5 integrate
.. //depot/projects/usiii/net/if_media.h#4 integrate
.. //depot/projects/usiii/net80211/_ieee80211.h#4 integrate
.. //depot/projects/usiii/net80211/ieee80211.c#4 integrate
.. //depot/projects/usiii/net80211/ieee80211.h#4 integrate
.. //depot/projects/usiii/net80211/ieee80211_acl.c#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_adhoc.c#1 branch
.. //depot/projects/usiii/net80211/ieee80211_adhoc.h#1 branch
.. //depot/projects/usiii/net80211/ieee80211_amrr.c#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_amrr.h#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_crypto.c#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_crypto.h#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_crypto_ccmp.c#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_crypto_none.c#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_crypto_tkip.c#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_crypto_wep.c#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_ddb.c#1 branch
.. //depot/projects/usiii/net80211/ieee80211_dfs.c#1 branch
.. //depot/projects/usiii/net80211/ieee80211_dfs.h#1 branch
.. //depot/projects/usiii/net80211/ieee80211_freebsd.c#3 integrate
.. //depot/projects/usiii/net80211/ieee80211_freebsd.h#4 integrate
.. //depot/projects/usiii/net80211/ieee80211_hostap.c#1 branch
.. //depot/projects/usiii/net80211/ieee80211_hostap.h#1 branch
.. //depot/projects/usiii/net80211/ieee80211_ht.c#6 integrate
.. //depot/projects/usiii/net80211/ieee80211_ht.h#5 integrate
.. //depot/projects/usiii/net80211/ieee80211_input.c#5 integrate
.. //depot/projects/usiii/net80211/ieee80211_input.h#1 branch
.. //depot/projects/usiii/net80211/ieee80211_ioctl.c#4 integrate
.. //depot/projects/usiii/net80211/ieee80211_ioctl.h#5 integrate
.. //depot/projects/usiii/net80211/ieee80211_monitor.c#1 branch
.. //depot/projects/usiii/net80211/ieee80211_monitor.h#1 branch
.. //depot/projects/usiii/net80211/ieee80211_node.c#5 integrate
.. //depot/projects/usiii/net80211/ieee80211_node.h#4 integrate
.. //depot/projects/usiii/net80211/ieee80211_output.c#4 integrate
.. //depot/projects/usiii/net80211/ieee80211_phy.c#1 branch
.. //depot/projects/usiii/net80211/ieee80211_phy.h#1 branch
.. //depot/projects/usiii/net80211/ieee80211_power.c#3 integrate
.. //depot/projects/usiii/net80211/ieee80211_power.h#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_proto.c#5 integrate
.. //depot/projects/usiii/net80211/ieee80211_proto.h#5 integrate
.. //depot/projects/usiii/net80211/ieee80211_regdomain.c#3 integrate
.. //depot/projects/usiii/net80211/ieee80211_regdomain.h#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_rssadapt.c#1 branch
.. //depot/projects/usiii/net80211/ieee80211_rssadapt.h#1 branch
.. //depot/projects/usiii/net80211/ieee80211_scan.c#3 integrate
.. //depot/projects/usiii/net80211/ieee80211_scan.h#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_scan_ap.c#3 delete
.. //depot/projects/usiii/net80211/ieee80211_scan_sta.c#4 integrate
.. //depot/projects/usiii/net80211/ieee80211_sta.c#1 branch
.. //depot/projects/usiii/net80211/ieee80211_sta.h#1 branch
.. //depot/projects/usiii/net80211/ieee80211_var.h#5 integrate
.. //depot/projects/usiii/net80211/ieee80211_wds.c#1 branch
.. //depot/projects/usiii/net80211/ieee80211_wds.h#1 branch
.. //depot/projects/usiii/net80211/ieee80211_xauth.c#2 integrate
.. //depot/projects/usiii/netgraph/ng_base.c#8 integrate
.. //depot/projects/usiii/netinet/in.h#3 integrate
.. //depot/projects/usiii/netinet/in_mcast.c#2 integrate
.. //depot/projects/usiii/netinet/in_pcb.c#6 integrate
.. //depot/projects/usiii/netinet/in_pcb.h#4 integrate
.. //depot/projects/usiii/netinet/ip_divert.c#3 integrate
.. //depot/projects/usiii/netinet/ip_fw2.c#8 integrate
.. //depot/projects/usiii/netinet/ip_icmp.c#3 integrate
.. //depot/projects/usiii/netinet/ip_options.c#4 integrate
.. //depot/projects/usiii/netinet/ip_output.c#5 integrate
.. //depot/projects/usiii/netinet/raw_ip.c#3 integrate
.. //depot/projects/usiii/netinet/tcp_input.c#6 integrate
.. //depot/projects/usiii/netinet/tcp_offload.h#2 integrate
.. //depot/projects/usiii/netinet/tcp_output.c#5 integrate
.. //depot/projects/usiii/netinet/tcp_reass.c#3 integrate
.. //depot/projects/usiii/netinet/tcp_sack.c#2 integrate
.. //depot/projects/usiii/netinet/tcp_subr.c#6 integrate
.. //depot/projects/usiii/netinet/tcp_syncache.c#4 integrate
.. //depot/projects/usiii/netinet/tcp_timer.c#5 integrate
.. //depot/projects/usiii/netinet/tcp_timewait.c#3 integrate
.. //depot/projects/usiii/netinet/tcp_usrreq.c#6 integrate
.. //depot/projects/usiii/netinet/tcp_var.h#7 integrate
.. //depot/projects/usiii/netinet/udp_usrreq.c#4 integrate
.. //depot/projects/usiii/netinet6/icmp6.c#3 integrate
.. //depot/projects/usiii/netinet6/in6_pcb.c#4 integrate
.. //depot/projects/usiii/netinet6/in6_src.c#4 integrate
.. //depot/projects/usiii/netinet6/raw_ip6.c#3 integrate
.. //depot/projects/usiii/netinet6/udp6_usrreq.c#5 integrate
.. //depot/projects/usiii/nfsclient/nfs_vfsops.c#7 integrate
.. //depot/projects/usiii/pc98/cbus/clock.c#3 integrate
.. //depot/projects/usiii/pc98/cbus/pcrtc.c#1 branch
.. //depot/projects/usiii/pc98/conf/GENERIC#7 integrate
.. //depot/projects/usiii/pc98/include/clock.h#3 integrate
.. //depot/projects/usiii/pc98/pc98/machdep.c#7 integrate
.. //depot/projects/usiii/powerpc/aim/clock.c#3 integrate
.. //depot/projects/usiii/powerpc/aim/machdep.c#5 integrate
.. //depot/projects/usiii/powerpc/aim/nexus.c#2 integrate
.. //depot/projects/usiii/powerpc/booke/clock.c#3 integrate
.. //depot/projects/usiii/powerpc/conf/DEFAULTS#3 integrate
.. //depot/projects/usiii/powerpc/conf/MPC85XX#3 integrate
.. //depot/projects/usiii/security/audit/audit_arg.c#5 integrate
.. //depot/projects/usiii/security/mac/mac_inet.c#3 integrate
.. //depot/projects/usiii/sparc64/conf/GENERIC#7 integrate
.. //depot/projects/usiii/sparc64/conf/NOTES#2 integrate
.. //depot/projects/usiii/sparc64/fhc/fhc.c#4 integrate
.. //depot/projects/usiii/sparc64/include/bus_common.h#3 integrate
.. //depot/projects/usiii/sparc64/include/intr_machdep.h#5 integrate
.. //depot/projects/usiii/sparc64/pci/psycho.c#8 integrate
.. //depot/projects/usiii/sparc64/pci/schizo.c#5 edit
.. //depot/projects/usiii/sparc64/sbus/sbus.c#4 integrate
.. //depot/projects/usiii/sparc64/sparc64/intr_machdep.c#6 integrate
.. //depot/projects/usiii/sparc64/sparc64/mp_machdep.c#4 integrate
.. //depot/projects/usiii/sparc64/sparc64/nexus.c#2 integrate
.. //depot/projects/usiii/sparc64/sparc64/upa.c#4 integrate
.. //depot/projects/usiii/sun4v/conf/DEFAULTS#2 integrate
.. //depot/projects/usiii/sun4v/conf/NOTES#2 integrate
.. //depot/projects/usiii/sys/clock.h#2 integrate
.. //depot/projects/usiii/sys/param.h#9 integrate
.. //depot/projects/usiii/sys/termios.h#2 integrate
.. //depot/projects/usiii/sys/time.h#5 integrate
.. //depot/projects/usiii/ufs/ufs/inode.h#3 integrate
.. //depot/projects/usiii/ufs/ufs/ufs_lookup.c#5 integrate
Differences ...
==== //depot/projects/usiii/amd64/amd64/machdep.c#6 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.683 2008/03/16 10:58:02 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.685 2008/04/22 19:38:26 phk Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -61,7 +61,6 @@
#include <sys/buf.h>
#include <sys/bus.h>
#include <sys/callout.h>
-#include <sys/clock.h>
#include <sys/cons.h>
#include <sys/cpu.h>
#include <sys/eventhandler.h>
@@ -847,11 +846,23 @@
#if !defined(DEV_ATPIC) && defined(DEV_ISA)
#include <isa/isavar.h>
-u_int
+#include <isa/isareg.h>
+/*
+ * Return a bitmap of the current interrupt requests. This is 8259-specific
+ * and is only suitable for use at probe time.
+ * This is only here to pacify sio. It is NOT FATAL if this doesn't work.
+ * It shouldn't be here. There should probably be an APIC centric
+ * implementation in the apic driver code, if at all.
+ */
+intrmask_t
isa_irq_pending(void)
{
+ u_char irr1;
+ u_char irr2;
- return (0);
+ irr1 = inb(IO_ICU1);
+ irr2 = inb(IO_ICU2);
+ return ((irr2 << 8) | irr1);
}
#endif
==== //depot/projects/usiii/amd64/conf/GENERIC#8 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.495 2008/03/27 11:54:17 dfr Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.497 2008/04/20 20:35:34 sam Exp $
cpu HAMMER
ident GENERIC
@@ -239,13 +239,10 @@
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
device wlan_amrr # AMRR transmit rate control algorithm
-device wlan_scan_ap # 802.11 AP mode scanning
-device wlan_scan_sta # 802.11 STA mode scanning
device an # Aironet 4500/4800 802.11 wireless NICs.
device ath # Atheros pci/cardbus NIC's
device ath_hal # Atheros HAL (Hardware Access Layer)
device ath_rate_sample # SampleRate tx rate control for ath
-device awi # BayStack 660 and others
device ral # Ralink Technology RT2500 wireless NICs.
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
==== //depot/projects/usiii/amd64/include/clock.h#4 (text+ko) ====
@@ -3,7 +3,7 @@
* Garrett Wollman, September 1994.
* This file is in the public domain.
*
- * $FreeBSD: src/sys/amd64/include/clock.h,v 1.59 2008/04/14 07:59:59 phk Exp $
+ * $FreeBSD: src/sys/amd64/include/clock.h,v 1.60 2008/04/22 19:38:27 phk Exp $
*/
#ifndef _MACHINE_CLOCK_H_
@@ -27,6 +27,7 @@
* Driver to clock driver interface.
*/
+void startrtclock(void);
void init_TSC(void);
void init_TSC_tc(void);
==== //depot/projects/usiii/amd64/include/cpufunc.h#2 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.148 2005/05/13 00:05:55 nectar Exp $
+ * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.149 2008/04/18 05:47:56 jeff Exp $
*/
/*
@@ -514,6 +514,19 @@
__asm __volatile("movl %0,%%es" : : "rm" (sel));
}
+static inline void
+cpu_monitor(const void *addr, int extensions, int hints)
+{
+ __asm __volatile("monitor;"
+ : :"a" (addr), "c" (extensions), "d"(hints));
+}
+
+static inline void
+cpu_mwait(int extensions, int hints)
+{
+ __asm __volatile("mwait;" : :"a" (hints), "c" (extensions));
+}
+
#ifdef _KERNEL
/* This is defined in <machine/specialreg.h> but is too painful to get to */
#ifndef MSR_FSBASE
==== //depot/projects/usiii/amd64/isa/clock.c#6 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.242 2008/04/14 07:59:59 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.243 2008/04/22 19:38:27 phk Exp $");
/*
* Routines to handle clock hardware.
@@ -45,7 +45,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
-#include <sys/clock.h>
#include <sys/lock.h>
#include <sys/kdb.h>
#include <sys/mutex.h>
==== //depot/projects/usiii/amd64/linux32/linux32_dummy.c#3 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.11 2008/04/16 19:25:38 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.12 2008/04/23 15:56:33 rdivacky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,7 +57,6 @@
DUMMY(capget);
DUMMY(capset);
DUMMY(sendfile);
-DUMMY(truncate64);
DUMMY(setfsuid);
DUMMY(setfsgid);
DUMMY(pivot_root);
==== //depot/projects/usiii/arm/arm/intr.c#3 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.21 2008/04/11 03:26:40 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.22 2008/04/20 23:29:06 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/syslog.h>
@@ -59,6 +59,8 @@
void arm_handler_execute(struct trapframe *, int);
+void (*arm_post_filter)(void *) = NULL;
+
void
arm_setup_irqhandler(const char *name, driver_filter_t *filt,
void (*hand)(void*), void *arg, int irq, int flags, void **cookiep)
@@ -72,7 +74,7 @@
if (event == NULL) {
error = intr_event_create(&event, (void *)irq, 0, irq,
(mask_fn)arm_mask_irq, (mask_fn)arm_unmask_irq,
- NULL, NULL, "intr%d:", irq);
+ arm_post_filter, NULL, "intr%d:", irq);
if (error)
return;
intr_events[irq] = event;
==== //depot/projects/usiii/arm/at91/at91.c#3 (text) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.15 2007/12/19 17:34:17 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.16 2008/04/20 23:29:06 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,6 +47,8 @@
static struct at91_softc *at91_softc;
+static void at91_eoi(void *);
+
static int
at91_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags,
bus_space_handle_t *bshp)
@@ -172,6 +174,7 @@
at91_probe(device_t dev)
{
device_set_desc(dev, "AT91 device bus");
+ arm_post_filter = at91_eoi;
return (0);
}
@@ -689,6 +692,13 @@
}
+static void
+at91_eoi(void *unused)
+{
+ bus_space_write_4(at91_softc->sc_st, at91_softc->sc_sys_sh,
+ IC_EOICR, 0);
+}
+
static device_method_t at91_methods[] = {
DEVMETHOD(device_probe, at91_probe),
DEVMETHOD(device_attach, at91_attach),
==== //depot/projects/usiii/arm/conf/AVILA#7 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/AVILA,v 1.11 2008/03/27 11:54:17 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/AVILA,v 1.13 2008/04/21 10:09:54 phk Exp $
machine arm
ident AVILA
@@ -80,7 +80,6 @@
#options PREEMPTION
#options VERBOSE_SYSINIT
-device genclock
device mem # Memory and kernel memory devices
#device saarm
@@ -130,8 +129,6 @@
device wlan_wep # 802.11 WEP support
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
-device wlan_scan_sta
-device wlan_scan_ap
device wlan_xauth
device ath # Atheros pci/cardbus NIC's
device ath_hal # Atheros HAL (Hardware Access Layer)
==== //depot/projects/usiii/arm/conf/BWCT#4 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/BWCT,v 1.4 2008/03/27 11:54:17 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/BWCT,v 1.5 2008/04/21 10:09:54 phk Exp $
machine arm
ident BWCT
@@ -68,7 +68,6 @@
options RWLOCK_NOINLINE
options NO_FFS_SNAPSHOT
options NO_SWAPPING
-device genclock
device loop
device random
device ether
==== //depot/projects/usiii/arm/conf/CRB#5 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/CRB,v 1.4 2008/03/27 11:54:17 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/CRB,v 1.5 2008/04/21 10:09:54 phk Exp $
machine arm
ident CRB
@@ -65,7 +65,6 @@
options BOOTP_WIRED_TO=em0
options BOOTP_COMPAT
#options PREEMPTION
-device genclock
device loop
device ether
device mem # Memory and kernel memory devices
==== //depot/projects/usiii/arm/conf/EP80219#4 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/EP80219,v 1.7 2008/03/27 11:54:17 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/EP80219,v 1.8 2008/04/21 10:09:54 phk Exp $
machine arm
ident EP80219
@@ -67,7 +67,6 @@
options BOOTP_WIRED_TO=fxp0
options BOOTP_COMPAT
#options PREEMPTION
-device genclock
device loop
device ether
device mem # Memory and kernel memory devices
==== //depot/projects/usiii/arm/conf/HL200#3 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/HL200,v 1.3 2008/03/27 11:54:18 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/HL200,v 1.5 2008/04/21 10:09:54 phk Exp $
machine arm
ident HL200
@@ -74,7 +74,6 @@
options RWLOCK_NOINLINE
options NO_FFS_SNAPSHOT
options NO_SWAPPING
-device genclock
device random
device pty
device loop
@@ -147,5 +146,3 @@
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
device wlan_amrr # AMRR transmit rate control algorithm
-device wlan_scan_ap # 802.11 AP mode scanning
-device wlan_scan_sta # 802.11 STA mode scanning
==== //depot/projects/usiii/arm/conf/IQ31244#4 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.21 2008/03/27 11:54:18 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.22 2008/04/21 10:09:54 phk Exp $
machine arm
ident IQ31244
@@ -64,7 +64,6 @@
options BOOTP_WIRED_TO=em0
options BOOTP_COMPAT
#options PREEMPTION
-device genclock
device loop
device ether
device mem # Memory and kernel memory devices
==== //depot/projects/usiii/arm/conf/KB920X#4 (text) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/KB920X,v 1.15 2008/03/27 11:54:18 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/KB920X,v 1.17 2008/04/21 10:09:54 phk Exp $
machine arm
ident KB920X
@@ -62,7 +62,6 @@
options RWLOCK_NOINLINE
options NO_FFS_SNAPSHOT
options NO_SWAPPING
-device genclock
device random
device pty
device loop
@@ -135,5 +134,3 @@
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
device wlan_amrr # AMRR transmit rate control algorithm
-device wlan_scan_ap # 802.11 AP mode scanning
-device wlan_scan_sta # 802.11 STA mode scanning
==== //depot/projects/usiii/arm/conf/SIMICS#4 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.15 2008/03/27 11:54:18 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.16 2008/04/21 10:09:54 phk Exp $
machine arm
ident SIMICS
@@ -54,7 +54,6 @@
options SYSVMSG #SYSV-style message queues
options SYSVSEM #SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
-device genclock
device loop
device ether
device saip
==== //depot/projects/usiii/arm/conf/SKYEYE#4 (text) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.9 2008/03/27 11:54:18 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.10 2008/04/21 10:09:54 phk Exp $
machine arm
ident KB920X
@@ -59,7 +59,6 @@
options SYSVSEM #SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
-device genclock
device loop
device ether
#device saarm
==== //depot/projects/usiii/arm/include/intr.h#2 (text+ko) ====
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/arm/include/intr.h,v 1.7 2007/06/16 15:03:33 cognet Exp $
+ * $FreeBSD: src/sys/arm/include/intr.h,v 1.8 2008/04/20 23:29:06 cognet Exp $
*
*/
@@ -55,4 +55,5 @@
void arm_setup_irqhandler(const char *, int (*)(void*), void (*)(void*),
void *, int, int, void **);
int arm_remove_irqhandler(void *);
+extern void (*arm_post_filter)(void *);
#endif /* _MACHINE_INTR_H */
==== //depot/projects/usiii/arm/sa11x0/sa11x0_ost.c#2 (text+ko) ====
@@ -38,14 +38,13 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.7 2007/02/26 05:17:47 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.8 2008/04/22 19:38:27 phk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/time.h>
#include <sys/bus.h>
-#include <sys/clock.h>
#include <sys/module.h>
#include <machine/bus.h>
==== //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_string.c#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c,v 1.4 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/usiii/cddl/compat/opensolaris/rpc/xdr.h#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/rpc/xdr.h,v 1.4 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/usiii/cddl/compat/opensolaris/sys/acl.h#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/acl.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/usiii/cddl/compat/opensolaris/sys/bitmap.h#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/bitmap.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
==== //depot/projects/usiii/cddl/compat/opensolaris/sys/byteorder.h#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/byteorder.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
==== //depot/projects/usiii/cddl/compat/opensolaris/sys/callb.h#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/callb.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/usiii/cddl/compat/opensolaris/sys/cpupart.h#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/cpupart.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
==== //depot/projects/usiii/cddl/compat/opensolaris/sys/cpuvar.h#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/cpuvar.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
==== //depot/projects/usiii/cddl/compat/opensolaris/sys/dkio.h#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/dkio.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/usiii/cddl/compat/opensolaris/sys/mntent.h#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/mntent.h,v 1.3 2008/04/22 07:43:00 jb Exp $
*/
/*
* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/usiii/cddl/compat/opensolaris/sys/objfs.h#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/objfs.h,v 1.3 2008/04/22 07:43:00 jb Exp $
*/
#ifndef _COMPAT_OPENSOLARIS_SYS_OBJFS_H
==== //depot/projects/usiii/cddl/compat/opensolaris/sys/sysmacros.h#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/sysmacros.h,v 1.3 2008/04/22 07:43:00 jb Exp $
*/
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
==== //depot/projects/usiii/cddl/compat/opensolaris/sys/taskq.h#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/taskq.h,v 1.3 2008/04/22 07:43:00 jb Exp $
*/
/*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/usiii/cddl/compat/opensolaris/sys/taskq_impl.h#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/taskq_impl.h,v 1.3 2008/04/22 07:43:00 jb Exp $
*/
/*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/usiii/compat/linux/linux_file.c#5 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.112 2008/04/09 16:42:50 rdivacky Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.113 2008/04/23 15:56:33 rdivacky Exp $");
#include "opt_compat.h"
#include "opt_mac.h"
@@ -886,6 +886,7 @@
LFREEPATH(name);
return (error);
}
+
int
linux_truncate(struct thread *td, struct linux_truncate_args *args)
{
@@ -905,6 +906,23 @@
}
int
+linux_truncate64(struct thread *td, struct linux_truncate64_args *args)
+{
+ char *path;
+ int error;
+
+ LCONVPATHEXIST(td, args->path, &path);
+
+#ifdef DEBUG
+ if (ldebug(truncate64))
+ printf(ARGS(truncate64, "%s, %jd"), path, args->length);
+#endif
+
+ error = kern_truncate(td, path, UIO_SYSSPACE, args->length);
+ LFREEPATH(path);
+ return (error);
+}
+int
linux_ftruncate(struct thread *td, struct linux_ftruncate_args *args)
{
struct ftruncate_args /* {
==== //depot/projects/usiii/compat/svr4/svr4_misc.c#4 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.100 2008/01/13 14:44:01 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.101 2008/04/21 21:24:08 rdivacky Exp $");
#include "opt_mac.h"
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list