PERFORCE change 164007 for review
John Baldwin
jhb at FreeBSD.org
Wed Jun 10 15:21:32 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=164007
Change 164007 by jhb at jhb_jhbbsd on 2009/06/10 15:21:03
IFC @164004
Affected files ...
.. //depot/projects/multipass/sys/amd64/amd64/local_apic.c#4 integrate
.. //depot/projects/multipass/sys/amd64/amd64/machdep.c#4 integrate
.. //depot/projects/multipass/sys/amd64/conf/DEFAULTS#4 integrate
.. //depot/projects/multipass/sys/amd64/conf/GENERIC#5 integrate
.. //depot/projects/multipass/sys/amd64/conf/NOTES#4 integrate
.. //depot/projects/multipass/sys/amd64/isa/clock.c#3 integrate
.. //depot/projects/multipass/sys/arm/arm/intr.c#2 integrate
.. //depot/projects/multipass/sys/arm/arm/locore.S#3 integrate
.. //depot/projects/multipass/sys/arm/at91/at91.c#4 integrate
.. //depot/projects/multipass/sys/arm/include/intr.h#3 integrate
.. //depot/projects/multipass/sys/arm/mv/ic.c#3 integrate
.. //depot/projects/multipass/sys/arm/sa11x0/sa11x0_irqhandler.c#2 integrate
.. //depot/projects/multipass/sys/arm/xscale/i80321/i80321.c#2 integrate
.. //depot/projects/multipass/sys/arm/xscale/i8134x/i81342.c#2 integrate
.. //depot/projects/multipass/sys/arm/xscale/ixp425/ixp425.c#3 integrate
.. //depot/projects/multipass/sys/arm/xscale/pxa/pxa_icu.c#2 integrate
.. //depot/projects/multipass/sys/boot/forth/loader.conf#4 integrate
.. //depot/projects/multipass/sys/compat/freebsd32/freebsd32_proto.h#4 integrate
.. //depot/projects/multipass/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate
.. //depot/projects/multipass/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate
.. //depot/projects/multipass/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate
.. //depot/projects/multipass/sys/compat/freebsd32/syscalls.master#4 integrate
.. //depot/projects/multipass/sys/compat/linprocfs/linprocfs.c#3 integrate
.. //depot/projects/multipass/sys/compat/linux/linux_ioctl.c#5 integrate
.. //depot/projects/multipass/sys/compat/svr4/svr4_sockio.c#3 integrate
.. //depot/projects/multipass/sys/conf/NOTES#5 integrate
.. //depot/projects/multipass/sys/conf/files#5 integrate
.. //depot/projects/multipass/sys/conf/options#5 integrate
.. //depot/projects/multipass/sys/contrib/altq/altq/altq_subr.c#4 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/include/platform/acfreebsd.h#2 integrate
.. //depot/projects/multipass/sys/contrib/pf/net/if_pflog.c#3 integrate
.. //depot/projects/multipass/sys/contrib/pf/net/pf_if.c#3 integrate
.. //depot/projects/multipass/sys/contrib/pf/net/pf_ioctl.c#4 integrate
.. //depot/projects/multipass/sys/dev/acpica/Osd/OsdSynch.c#3 integrate
.. //depot/projects/multipass/sys/dev/acpica/acpi_pcib_acpi.c#5 integrate
.. //depot/projects/multipass/sys/dev/alc/if_alc.c#1 branch
.. //depot/projects/multipass/sys/dev/alc/if_alcreg.h#1 branch
.. //depot/projects/multipass/sys/dev/alc/if_alcvar.h#1 branch
.. //depot/projects/multipass/sys/dev/ata/chipsets/ata-acerlabs.c#3 integrate
.. //depot/projects/multipass/sys/dev/ce/if_ce.c#3 integrate
.. //depot/projects/multipass/sys/dev/cp/if_cp.c#3 integrate
.. //depot/projects/multipass/sys/dev/ctau/if_ct.c#3 integrate
.. //depot/projects/multipass/sys/dev/cx/if_cx.c#3 integrate
.. //depot/projects/multipass/sys/dev/cxgb/cxgb_multiq.c#4 integrate
.. //depot/projects/multipass/sys/dev/cxgb/cxgb_sge.c#4 integrate
.. //depot/projects/multipass/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 integrate
.. //depot/projects/multipass/sys/dev/e1000/if_igb.c#4 integrate
.. //depot/projects/multipass/sys/dev/fxp/if_fxp.c#4 integrate
.. //depot/projects/multipass/sys/dev/if_ndis/if_ndis_usb.c#4 integrate
.. //depot/projects/multipass/sys/dev/kbdmux/kbdmux.c#4 integrate
.. //depot/projects/multipass/sys/dev/nmdm/nmdm.c#4 integrate
.. //depot/projects/multipass/sys/dev/sound/pcm/sound.h#4 integrate
.. //depot/projects/multipass/sys/dev/sound/sbus/cs4231.c#3 integrate
.. //depot/projects/multipass/sys/dev/usb/wlan/if_zyd.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/wlan/if_zydreg.h#4 integrate
.. //depot/projects/multipass/sys/fs/cd9660/cd9660_vnops.c#3 integrate
.. //depot/projects/multipass/sys/fs/devfs/devfs_vnops.c#5 integrate
.. //depot/projects/multipass/sys/fs/fifofs/fifo_vnops.c#3 integrate
.. //depot/projects/multipass/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate
.. //depot/projects/multipass/sys/fs/nfsclient/nfs_clstate.c#3 integrate
.. //depot/projects/multipass/sys/fs/nfsclient/nfs_clvnops.c#3 integrate
.. //depot/projects/multipass/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate
.. //depot/projects/multipass/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#3 integrate
.. //depot/projects/multipass/sys/i386/conf/DEFAULTS#4 integrate
.. //depot/projects/multipass/sys/i386/conf/GENERIC#5 integrate
.. //depot/projects/multipass/sys/i386/conf/NOTES#4 integrate
.. //depot/projects/multipass/sys/i386/i386/local_apic.c#4 integrate
.. //depot/projects/multipass/sys/i386/i386/machdep.c#4 integrate
.. //depot/projects/multipass/sys/i386/isa/clock.c#3 integrate
.. //depot/projects/multipass/sys/i386/isa/vesa.c#2 integrate
.. //depot/projects/multipass/sys/kern/bus_if.m#3 integrate
.. //depot/projects/multipass/sys/kern/kern_jail.c#5 integrate
.. //depot/projects/multipass/sys/kern/kern_poll.c#4 integrate
.. //depot/projects/multipass/sys/kern/kern_uuid.c#4 integrate
.. //depot/projects/multipass/sys/kern/subr_acl_nfs4.c#1 branch
.. //depot/projects/multipass/sys/kern/subr_bus.c#7 integrate
.. //depot/projects/multipass/sys/kern/sys_pipe.c#4 integrate
.. //depot/projects/multipass/sys/kern/sysv_shm.c#4 integrate
.. //depot/projects/multipass/sys/kern/uipc_mqueue.c#4 integrate
.. //depot/projects/multipass/sys/kern/uipc_syscalls.c#5 integrate
.. //depot/projects/multipass/sys/kern/vfs_syscalls.c#5 integrate
.. //depot/projects/multipass/sys/kern/vfs_vnops.c#5 integrate
.. //depot/projects/multipass/sys/kern/vnode_if.src#4 integrate
.. //depot/projects/multipass/sys/libkern/jenkins.h#1 branch
.. //depot/projects/multipass/sys/modules/Makefile#5 integrate
.. //depot/projects/multipass/sys/modules/alc/Makefile#1 branch
.. //depot/projects/multipass/sys/modules/bridgestp/Makefile#3 integrate
.. //depot/projects/multipass/sys/modules/cxgb/iw_cxgb/Makefile#3 integrate
.. //depot/projects/multipass/sys/modules/if_ef/Makefile#3 integrate
.. //depot/projects/multipass/sys/modules/if_vlan/Makefile#3 integrate
.. //depot/projects/multipass/sys/modules/ip_mroute_mod/Makefile#4 integrate
.. //depot/projects/multipass/sys/modules/ipfw/Makefile#4 integrate
.. //depot/projects/multipass/sys/modules/linprocfs/Makefile#3 integrate
.. //depot/projects/multipass/sys/modules/linux/Makefile#5 integrate
.. //depot/projects/multipass/sys/modules/netgraph/atm/atm/Makefile#3 integrate
.. //depot/projects/multipass/sys/modules/netgraph/ether/Makefile#3 integrate
.. //depot/projects/multipass/sys/modules/netgraph/gif/Makefile#3 integrate
.. //depot/projects/multipass/sys/modules/nfsclient/Makefile#4 integrate
.. //depot/projects/multipass/sys/modules/pf/Makefile#4 integrate
.. //depot/projects/multipass/sys/modules/sound/sound/Makefile#4 integrate
.. //depot/projects/multipass/sys/modules/svr4/Makefile#5 integrate
.. //depot/projects/multipass/sys/modules/wlan/Makefile#4 integrate
.. //depot/projects/multipass/sys/net/bridgestp.c#4 integrate
.. //depot/projects/multipass/sys/net/flowtable.c#2 integrate
.. //depot/projects/multipass/sys/net/flowtable.h#2 integrate
.. //depot/projects/multipass/sys/net/if.c#5 integrate
.. //depot/projects/multipass/sys/net/if_arcsubr.c#4 integrate
.. //depot/projects/multipass/sys/net/if_bridge.c#5 integrate
.. //depot/projects/multipass/sys/net/if_ef.c#4 integrate
.. //depot/projects/multipass/sys/net/if_ethersubr.c#5 integrate
.. //depot/projects/multipass/sys/net/if_fddisubr.c#5 integrate
.. //depot/projects/multipass/sys/net/if_fwsubr.c#5 integrate
.. //depot/projects/multipass/sys/net/if_gif.c#5 integrate
.. //depot/projects/multipass/sys/net/if_gif.h#5 integrate
.. //depot/projects/multipass/sys/net/if_iso88025subr.c#5 integrate
.. //depot/projects/multipass/sys/net/if_loop.c#5 integrate
.. //depot/projects/multipass/sys/net/if_mib.c#4 integrate
.. //depot/projects/multipass/sys/net/if_var.h#5 integrate
.. //depot/projects/multipass/sys/net/if_vlan.c#4 integrate
.. //depot/projects/multipass/sys/net/raw_cb.c#3 integrate
.. //depot/projects/multipass/sys/net/raw_usrreq.c#3 integrate
.. //depot/projects/multipass/sys/net/rtsock.c#5 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211.c#5 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211.h#5 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_crypto_ccmp.c#4 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_ddb.c#5 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_dfs.c#3 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_ht.c#4 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_proto.h#5 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_radiotap.c#2 integrate
.. //depot/projects/multipass/sys/netgraph/atm/ng_atm.c#3 integrate
.. //depot/projects/multipass/sys/netgraph/ng_ether.c#4 integrate
.. //depot/projects/multipass/sys/netgraph/ng_gif.c#3 integrate
.. //depot/projects/multipass/sys/netgraph/ng_ipfw.c#3 integrate
.. //depot/projects/multipass/sys/netgraph/ng_ipfw.h#2 integrate
.. //depot/projects/multipass/sys/netgraph/ng_message.h#2 integrate
.. //depot/projects/multipass/sys/netinet/if_ether.c#5 integrate
.. //depot/projects/multipass/sys/netinet/igmp.c#5 integrate
.. //depot/projects/multipass/sys/netinet/in.c#5 integrate
.. //depot/projects/multipass/sys/netinet/in_mcast.c#4 integrate
.. //depot/projects/multipass/sys/netinet/in_proto.c#4 integrate
.. //depot/projects/multipass/sys/netinet/in_rmx.c#5 integrate
.. //depot/projects/multipass/sys/netinet/ip_dummynet.h#4 integrate
.. //depot/projects/multipass/sys/netinet/ip_fw.h#5 integrate
.. //depot/projects/multipass/sys/netinet/ipfw/ip_dummynet.c#2 integrate
.. //depot/projects/multipass/sys/netinet/ipfw/ip_fw2.c#2 integrate
.. //depot/projects/multipass/sys/netinet/ipfw/ip_fw_pfil.c#2 integrate
.. //depot/projects/multipass/sys/netinet/raw_ip.c#5 integrate
.. //depot/projects/multipass/sys/netinet/sctp_os_bsd.h#4 integrate
.. //depot/projects/multipass/sys/netinet/tcp_debug.c#2 integrate
.. //depot/projects/multipass/sys/netinet6/icmp6.c#5 integrate
.. //depot/projects/multipass/sys/netinet6/in6.c#5 integrate
.. //depot/projects/multipass/sys/netinet6/in6_ifattach.c#5 integrate
.. //depot/projects/multipass/sys/netinet6/in6_mcast.c#3 integrate
.. //depot/projects/multipass/sys/netinet6/in6_proto.c#5 integrate
.. //depot/projects/multipass/sys/netinet6/in6_rmx.c#5 integrate
.. //depot/projects/multipass/sys/netinet6/ip6_input.c#5 integrate
.. //depot/projects/multipass/sys/netinet6/ip6_mroute.c#4 integrate
.. //depot/projects/multipass/sys/netinet6/ip6_output.c#5 integrate
.. //depot/projects/multipass/sys/netinet6/nd6.c#5 integrate
.. //depot/projects/multipass/sys/netinet6/nd6_rtr.c#5 integrate
.. //depot/projects/multipass/sys/netinet6/raw_ip6.c#4 integrate
.. //depot/projects/multipass/sys/netinet6/scope6.c#3 integrate
.. //depot/projects/multipass/sys/netipsec/keysock.c#4 integrate
.. //depot/projects/multipass/sys/netipsec/xform_ipip.c#3 integrate
.. //depot/projects/multipass/sys/netipx/spx_debug.c#2 integrate
.. //depot/projects/multipass/sys/nfsclient/bootp_subr.c#4 integrate
.. //depot/projects/multipass/sys/nfsclient/nfs_diskless.c#4 integrate
.. //depot/projects/multipass/sys/powerpc/aim/machdep.c#5 integrate
.. //depot/projects/multipass/sys/powerpc/aim/platform_chrp.c#2 integrate
.. //depot/projects/multipass/sys/powerpc/powerpc/openpic.c#3 integrate
.. //depot/projects/multipass/sys/sys/buf_ring.h#3 integrate
.. //depot/projects/multipass/sys/sys/bus.h#4 integrate
.. //depot/projects/multipass/sys/sys/mount.h#5 integrate
.. //depot/projects/multipass/sys/sys/soundcard.h#4 integrate
.. //depot/projects/multipass/sys/sys/vimage.h#5 integrate
.. //depot/projects/multipass/sys/tools/emu10k1-mkalsa.sh#2 delete
.. //depot/projects/multipass/sys/tools/feeder_eq_mkfilter.awk#2 delete
.. //depot/projects/multipass/sys/tools/feeder_rate_mkfilter.awk#2 delete
.. //depot/projects/multipass/sys/tools/snd_fxdiv_gen.awk#2 delete
.. //depot/projects/multipass/sys/tools/sound/emu10k1-mkalsa.sh#1 branch
.. //depot/projects/multipass/sys/tools/sound/feeder_eq_mkfilter.awk#1 branch
.. //depot/projects/multipass/sys/tools/sound/feeder_rate_mkfilter.awk#1 branch
.. //depot/projects/multipass/sys/tools/sound/snd_fxdiv_gen.awk#1 branch
.. //depot/projects/multipass/sys/vm/vm_map.c#5 integrate
Differences ...
==== //depot/projects/multipass/sys/amd64/amd64/local_apic.c#4 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.55 2009/05/05 01:13:20 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.56 2009/06/09 04:17:36 ariff Exp $");
#include "opt_hwpmc_hooks.h"
#include "opt_kdtrace.h"
@@ -329,29 +329,6 @@
/* XXX: Error and thermal LVTs */
- if (cpu_vendor_id == CPU_VENDOR_AMD) {
- /*
- * Detect the presence of C1E capability mostly on latest
- * dual-cores (or future) k8 family. This feature renders
- * the local APIC timer dead, so we disable it by reading
- * the Interrupt Pending Message register and clearing both
- * C1eOnCmpHalt (bit 28) and SmiOnCmpHalt (bit 27).
- *
- * Reference:
- * "BIOS and Kernel Developer's Guide for AMD NPT
- * Family 0Fh Processors"
- * #32559 revision 3.00
- */
- if ((cpu_id & 0x00000f00) == 0x00000f00 &&
- (cpu_id & 0x0fff0000) >= 0x00040000) {
- uint64_t msr;
-
- msr = rdmsr(0xc0010055);
- if (msr & 0x18000000)
- wrmsr(0xc0010055, msr & ~0x18000000ULL);
- }
- }
-
intr_restore(eflags);
}
==== //depot/projects/multipass/sys/amd64/amd64/machdep.c#4 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.701 2009/05/18 18:37:18 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.702 2009/06/09 04:17:36 ariff Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -600,7 +600,70 @@
__asm __volatile("sti; hlt");
}
+static int cpu_ident_amdc1e = 0;
+
+static int
+cpu_probe_amdc1e(void)
+{
+ int i;
+
+ /*
+ * Forget it, if we're not using local APIC timer.
+ */
+ if (resource_disabled("apic", 0) ||
+ (resource_int_value("apic", 0, "clock", &i) == 0 && i == 0))
+ return (0);
+
+ /*
+ * Detect the presence of C1E capability mostly on latest
+ * dual-cores (or future) k8 family.
+ */
+ if (cpu_vendor_id == CPU_VENDOR_AMD &&
+ (cpu_id & 0x00000f00) == 0x00000f00 &&
+ (cpu_id & 0x0fff0000) >= 0x00040000) {
+ cpu_ident_amdc1e = 1;
+ return (1);
+ }
+
+ return (0);
+}
+
+/*
+ * C1E renders the local APIC timer dead, so we disable it by
+ * reading the Interrupt Pending Message register and clearing
+ * both C1eOnCmpHalt (bit 28) and SmiOnCmpHalt (bit 27).
+ *
+ * Reference:
+ * "BIOS and Kernel Developer's Guide for AMD NPT Family 0Fh Processors"
+ * #32559 revision 3.00+
+ */
+#define MSR_AMDK8_IPM 0xc0010055
+#define AMDK8_SMIONCMPHALT (1ULL << 27)
+#define AMDK8_C1EONCMPHALT (1ULL << 28)
+#define AMDK8_CMPHALT (AMDK8_SMIONCMPHALT | AMDK8_C1EONCMPHALT)
+
static void
+cpu_idle_amdc1e(int busy)
+{
+
+ disable_intr();
+ if (sched_runnable())
+ enable_intr();
+ else {
+ uint64_t msr;
+
+ msr = rdmsr(MSR_AMDK8_IPM);
+ if (msr & AMDK8_CMPHALT)
+ wrmsr(MSR_AMDK8_IPM, msr & ~AMDK8_CMPHALT);
+
+ if (cpu_idle_hook)
+ cpu_idle_hook();
+ else
+ __asm __volatile("sti; hlt");
+ }
+}
+
+static void
cpu_idle_spin(int busy)
{
return;
@@ -697,6 +760,7 @@
{ cpu_idle_spin, "spin" },
{ cpu_idle_mwait, "mwait" },
{ cpu_idle_mwait_hlt, "mwait_hlt" },
+ { cpu_idle_amdc1e, "amdc1e" },
{ cpu_idle_hlt, "hlt" },
{ cpu_idle_acpi, "acpi" },
{ NULL, NULL }
@@ -715,6 +779,9 @@
if (strstr(idle_tbl[i].id_name, "mwait") &&
(cpu_feature2 & CPUID2_MON) == 0)
continue;
+ if (strcmp(idle_tbl[i].id_name, "amdc1e") == 0 &&
+ cpu_ident_amdc1e == 0)
+ continue;
p += sprintf(p, "%s, ", idle_tbl[i].id_name);
}
error = sysctl_handle_string(oidp, avail, 0, req);
@@ -745,6 +812,9 @@
if (strstr(idle_tbl[i].id_name, "mwait") &&
(cpu_feature2 & CPUID2_MON) == 0)
continue;
+ if (strcmp(idle_tbl[i].id_name, "amdc1e") == 0 &&
+ cpu_ident_amdc1e == 0)
+ continue;
if (strcmp(idle_tbl[i].id_name, buf))
continue;
cpu_idle_fn = idle_tbl[i].id_fn;
@@ -1593,6 +1663,9 @@
}
#endif
+ if (cpu_probe_amdc1e())
+ cpu_idle_fn = cpu_idle_amdc1e;
+
/* Location of kernel stack for locore */
return ((u_int64_t)thread0.td_pcb);
}
==== //depot/projects/multipass/sys/amd64/conf/DEFAULTS#4 (text+ko) ====
@@ -1,7 +1,7 @@
#
# DEFAULTS -- Default kernel configuration file for FreeBSD/amd64
#
-# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.18 2009/05/10 00:00:25 kuriyama Exp $
+# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.19 2009/06/09 20:26:52 kmacy Exp $
machine amd64
@@ -21,4 +21,3 @@
options GEOM_PART_EBR_COMPAT
options GEOM_PART_MBR
-options FLOWTABLE
==== //depot/projects/multipass/sys/amd64/conf/GENERIC#5 (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.526 2009/06/02 18:31:08 rwatson Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.528 2009/06/10 02:07:58 yongari Exp $
cpu HAMMER
ident GENERIC
@@ -71,6 +71,7 @@
options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
options AUDIT # Security event auditing
options MAC # TrustedBSD MAC Framework
+options FLOWTABLE # per-cpu routing cache
#options KDTRACE_FRAME # Ensure frames are compiled in
#options KDTRACE_HOOKS # Kernel DTrace hooks
@@ -212,6 +213,7 @@
device miibus # MII bus support
device ae # Attansic/Atheros L2 FastEthernet
device age # Attansic/Atheros L1 Gigabit Ethernet
+device alc # Atheros AR8131/AR8132 Ethernet
device ale # Atheros AR8121/AR8113/AR8114 Ethernet
device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet
device bfe # Broadcom BCM440x 10/100 Ethernet
==== //depot/projects/multipass/sys/amd64/conf/NOTES#4 (text+ko) ====
@@ -4,7 +4,7 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.90 2009/05/10 00:00:25 kuriyama Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.91 2009/06/08 20:07:16 jkim Exp $
#
#
@@ -237,12 +237,9 @@
# kernel environment variables to select initial debugging levels for the
# Intel ACPICA code. (Note that the Intel code must also have USE_DEBUGGER
# defined when it is built).
-#
-# ACPI_NO_SEMAPHORES makes the AcpiOs*Semaphore routines a no-op.
device acpi
options ACPI_DEBUG
-#!options ACPI_NO_SEMAPHORES
# The cpufreq(4) driver provides support for non-ACPI CPU frequency control
device cpufreq
==== //depot/projects/multipass/sys/amd64/isa/clock.c#3 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.246 2009/05/03 17:47:21 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.248 2009/06/09 09:47:02 bz Exp $");
/*
* Routines to handle clock hardware.
@@ -93,6 +93,9 @@
static int using_atrtc_timer;
static int using_lapic_timer;
+static u_int stat_ticks = 0;
+static u_int prof_ticks = 0;
+
/* Values for timerX_state: */
#define RELEASED 0
#define RELEASE_PENDING 1
@@ -122,8 +125,6 @@
hardclock(TRAPF_USERMODE(frame), TRAPF_PC(frame));
else
hardclock_cpu(TRAPF_USERMODE(frame));
- if (!using_atrtc_timer)
- statclockintr(frame);
return (FILTER_HANDLED);
}
@@ -131,8 +132,6 @@
statclockintr(struct trapframe *frame)
{
- if (profprocs != 0)
- profclock(TRAPF_USERMODE(frame), TRAPF_PC(frame));
statclock(TRAPF_USERMODE(frame));
return (FILTER_HANDLED);
}
@@ -166,6 +165,30 @@
ipi_all_but_self(IPI_HARDCLOCK);
#endif
hardclockintr(frame);
+
+ if (!using_atrtc_timer) {
+ prof_ticks += profhz;
+ if (prof_ticks >= hz) {
+ prof_ticks -= hz;
+ if (profprocs != 0) {
+#ifdef SMP
+ if (smp_started)
+ ipi_all_but_self(IPI_PROFCLOCK);
+#endif
+ profclockintr(frame);
+ }
+ }
+ stat_ticks += stathz;
+ if (stat_ticks >= hz) {
+ stat_ticks -= hz;
+#ifdef SMP
+ if (smp_started)
+ ipi_all_but_self(IPI_STATCLOCK);
+#endif
+ statclockintr(frame);
+ }
+ }
+
return (FILTER_HANDLED);
}
@@ -500,7 +523,8 @@
INTR_TYPE_CLK, NULL);
atrtc_enable_intr();
} else {
- profhz = stathz = hz;
+ profhz = min(RTC_PROFRATE, hz);
+ stathz = min(RTC_NOPROFRATE, hz);
}
}
@@ -511,7 +535,7 @@
cpu_startprofclock(void)
{
- if (using_lapic_timer)
+ if (using_lapic_timer || !using_atrtc_timer)
return;
atrtc_rate(RTCSA_PROF);
psdiv = pscnt = psratio;
@@ -521,7 +545,7 @@
cpu_stopprofclock(void)
{
- if (using_lapic_timer)
+ if (using_lapic_timer || !using_atrtc_timer)
return;
atrtc_rate(RTCSA_NOPROF);
psdiv = pscnt = 1;
==== //depot/projects/multipass/sys/arm/arm/intr.c#2 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.24 2008/09/11 12:36:13 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.25 2009/06/09 18:18:41 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/syslog.h>
@@ -120,7 +120,8 @@
int i;
PCPU_INC(cnt.v_intr);
- while ((i = arm_get_next_irq()) != -1) {
+ i = -1;
+ while ((i = arm_get_next_irq(i)) != -1) {
intrcnt[intrcnt_tab[i]]++;
event = intr_events[i];
if (intr_event_handle(event, frame) != 0) {
==== //depot/projects/multipass/sys/arm/arm/locore.S#3 (text+ko) ====
@@ -37,7 +37,7 @@
#include <machine/asm.h>
#include <machine/armreg.h>
#include <machine/pte.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.22 2009/03/31 23:06:20 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.23 2009/06/09 17:21:47 marcel Exp $");
/* What size should this really be ? It is only used by initarm() */
#define INIT_ARM_STACK_SIZE 2048
@@ -73,6 +73,11 @@
mov ip, r0
+ /* Make sure interrupts are disabled. */
+ mrs r7, cpsr
+ orr r7, r7, #(I32_bit|F32_bit)
+ msr cpsr_c, r7
+
#if defined (FLASHADDR) && defined(LOADERRAMADDR)
/* Check if we're running from flash. */
ldr r7, =FLASHADDR
==== //depot/projects/multipass/sys/arm/at91/at91.c#4 (text) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.24 2009/05/15 04:49:20 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.25 2009/06/09 18:18:41 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -702,9 +702,8 @@
}
int
-arm_get_next_irq()
+arm_get_next_irq(int last __unused)
{
-
int status;
int irq;
==== //depot/projects/multipass/sys/arm/include/intr.h#3 (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.12 2008/12/20 03:26:09 sam Exp $
+ * $FreeBSD: src/sys/arm/include/intr.h,v 1.13 2009/06/09 18:18:41 marcel Exp $
*
*/
@@ -56,7 +56,7 @@
#include <machine/psl.h>
-int arm_get_next_irq(void);
+int arm_get_next_irq(int);
void arm_mask_irq(uintptr_t);
void arm_unmask_irq(uintptr_t);
void arm_setup_irqhandler(const char *, int (*)(void*), void (*)(void*),
==== //depot/projects/multipass/sys/arm/mv/ic.c#3 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/mv/ic.c,v 1.2 2009/04/16 11:20:18 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/mv/ic.c,v 1.3 2009/06/09 18:18:41 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -137,7 +137,7 @@
DRIVER_MODULE(ic, mbus, mv_ic_driver, mv_ic_devclass, 0, 0);
int
-arm_get_next_irq(void)
+arm_get_next_irq(int last __unused)
{
int irq;
==== //depot/projects/multipass/sys/arm/sa11x0/sa11x0_irqhandler.c#2 (text+ko) ====
@@ -76,7 +76,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_irqhandler.c,v 1.6 2006/10/21 04:25:00 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_irqhandler.c,v 1.7 2009/06/09 18:18:41 marcel Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -108,7 +108,7 @@
extern vm_offset_t saipic_base;
int
-arm_get_next_irq()
+arm_get_next_irq(int last __unused)
{
int irq;
==== //depot/projects/multipass/sys/arm/xscale/i80321/i80321.c#2 (text+ko) ====
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321.c,v 1.7 2007/09/04 18:45:27 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321.c,v 1.8 2009/06/09 18:18:41 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -240,7 +240,7 @@
}
int
-arm_get_next_irq()
+arm_get_next_irq(int last __unused)
{
int irq;
==== //depot/projects/multipass/sys/arm/xscale/i8134x/i81342.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342.c,v 1.2 2007/09/22 16:25:43 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342.c,v 1.3 2009/06/09 18:18:41 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -295,7 +295,7 @@
}
int
-arm_get_next_irq(void)
+arm_get_next_irq(int last __unused)
{
uint32_t val;
val = intpnd0_read() & intr_enabled0;
==== //depot/projects/multipass/sys/arm/xscale/ixp425/ixp425.c#3 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.17 2009/03/10 19:15:35 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.18 2009/06/09 18:18:41 marcel Exp $");
#include "opt_ddb.h"
@@ -202,7 +202,7 @@
}
int
-arm_get_next_irq(void)
+arm_get_next_irq(int last __unused)
{
uint32_t irq;
==== //depot/projects/multipass/sys/arm/xscale/pxa/pxa_icu.c#2 (text+ko) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/pxa/pxa_icu.c,v 1.1 2008/06/06 05:08:09 benno Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/pxa/pxa_icu.c,v 1.2 2009/06/09 18:18:41 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -128,7 +128,7 @@
DRIVER_MODULE(pxaicu, pxa, pxa_icu_driver, pxa_icu_devclass, 0, 0);
int
-arm_get_next_irq()
+arm_get_next_irq(int last __unused)
{
int irq;
==== //depot/projects/multipass/sys/boot/forth/loader.conf#4 (text+ko) ====
@@ -6,7 +6,7 @@
#
# All arguments must be in double quotes.
#
-# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.140 2009/05/17 10:58:50 brueffer Exp $
+# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.141 2009/06/10 02:07:58 yongari Exp $
##############################################################
### Basic configuration options ############################
@@ -210,6 +210,7 @@
miibus_load="NO" # miibus support, needed for some drivers
if_ae_load="NO" # Attansic/Atheros L2 FastEthernet
if_age_load="NO" # Attansic/Atheros L1 Gigabit Ethernet
+if_alc_load="NO" # Atheros AR8131/AR8132 Ethernet
if_ale_load="NO" # Atheros AR8121/AR8113/AR8114 Ethernet
if_an_load="NO" # Aironet 4500/4800 802.11 wireless NICs
if_ar_load="NO" # Digi SYNC/570i
==== //depot/projects/multipass/sys/compat/freebsd32/freebsd32_proto.h#4 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.100 2009/04/29 21:50:13 jamie Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 191673 2009-04-29 21:14:15Z jamie
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.101 2009/06/10 13:48:43 kib Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 193916 2009-06-10 13:48:13Z kib
*/
#ifndef _FREEBSD32_SYSPROTO_H_
==== //depot/projects/multipass/sys/compat/freebsd32/freebsd32_syscall.h#4 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.99 2009/04/29 21:50:13 jamie Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 191673 2009-04-29 21:14:15Z jamie
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.100 2009/06/10 13:48:43 kib Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 193916 2009-06-10 13:48:13Z kib
*/
#define FREEBSD32_SYS_syscall 0
@@ -303,6 +303,9 @@
#define FREEBSD32_SYS_statfs 396
#define FREEBSD32_SYS_fstatfs 397
#define FREEBSD32_SYS_fhstatfs 398
+#define FREEBSD32_SYS_extattr_set_link 412
+#define FREEBSD32_SYS_extattr_get_link 413
+#define FREEBSD32_SYS_extattr_delete_link 414
#define FREEBSD32_SYS_freebsd32_sigaction 416
#define FREEBSD32_SYS_freebsd32_sigreturn 417
#define FREEBSD32_SYS_freebsd32_getcontext 421
@@ -315,6 +318,9 @@
#define FREEBSD32_SYS_freebsd32_umtx_lock 434
#define FREEBSD32_SYS_freebsd32_umtx_unlock 435
#define FREEBSD32_SYS_jail_attach 436
+#define FREEBSD32_SYS_extattr_list_fd 437
+#define FREEBSD32_SYS_extattr_list_file 438
+#define FREEBSD32_SYS_extattr_list_link 439
#define FREEBSD32_SYS_freebsd32_thr_suspend 442
#define FREEBSD32_SYS_thr_wake 443
#define FREEBSD32_SYS_kldunloadf 444
==== //depot/projects/multipass/sys/compat/freebsd32/freebsd32_syscalls.c#4 (text+ko) ====
@@ -2,8 +2,8 @@
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.90 2009/04/29 21:50:13 jamie Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 191673 2009-04-29 21:14:15Z jamie
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.91 2009/06/10 13:48:43 kib Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 193916 2009-06-10 13:48:13Z kib
*/
const char *freebsd32_syscallnames[] = {
@@ -419,9 +419,9 @@
"#409", /* 409 = __mac_get_pid */
"#410", /* 410 = __mac_get_link */
"#411", /* 411 = __mac_set_link */
- "#412", /* 412 = extattr_set_link */
- "#413", /* 413 = extattr_get_link */
- "#414", /* 414 = extattr_delete_link */
+ "extattr_set_link", /* 412 = extattr_set_link */
+ "extattr_get_link", /* 413 = extattr_get_link */
+ "extattr_delete_link", /* 414 = extattr_delete_link */
"#415", /* 415 = __mac_execve */
"freebsd32_sigaction", /* 416 = freebsd32_sigaction */
"freebsd32_sigreturn", /* 417 = freebsd32_sigreturn */
@@ -444,9 +444,9 @@
"freebsd32_umtx_lock", /* 434 = freebsd32_umtx_lock */
"freebsd32_umtx_unlock", /* 435 = freebsd32_umtx_unlock */
"jail_attach", /* 436 = jail_attach */
- "#437", /* 437 = extattr_list_fd */
- "#438", /* 438 = extattr_list_file */
- "#439", /* 439 = extattr_list_link */
+ "extattr_list_fd", /* 437 = extattr_list_fd */
+ "extattr_list_file", /* 438 = extattr_list_file */
+ "extattr_list_link", /* 439 = extattr_list_link */
"#440", /* 440 = kse_switchin */
"#441", /* 441 = ksem_timedwait */
"freebsd32_thr_suspend", /* 442 = freebsd32_thr_suspend */
==== //depot/projects/multipass/sys/compat/freebsd32/freebsd32_sysent.c#5 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.101 2009/06/01 16:14:38 rwatson Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 191673 2009-04-29 21:14:15Z jamie
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.102 2009/06/10 13:48:43 kib Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 193916 2009-06-10 13:48:13Z kib
*/
#include "opt_compat.h"
@@ -450,9 +450,9 @@
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 409 = __mac_get_pid */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 410 = __mac_get_link */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 411 = __mac_set_link */
- { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 412 = extattr_set_link */
- { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 413 = extattr_get_link */
- { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 414 = extattr_delete_link */
+ { AS(extattr_set_link_args), (sy_call_t *)extattr_set_link, AUE_EXTATTR_SET_LINK, NULL, 0, 0, 0 }, /* 412 = extattr_set_link */
+ { AS(extattr_get_link_args), (sy_call_t *)extattr_get_link, AUE_EXTATTR_GET_LINK, NULL, 0, 0, 0 }, /* 413 = extattr_get_link */
+ { AS(extattr_delete_link_args), (sy_call_t *)extattr_delete_link, AUE_EXTATTR_DELETE_LINK, NULL, 0, 0, 0 }, /* 414 = extattr_delete_link */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 415 = __mac_execve */
{ AS(freebsd32_sigaction_args), (sy_call_t *)freebsd32_sigaction, AUE_SIGACTION, NULL, 0, 0, 0 }, /* 416 = freebsd32_sigaction */
{ AS(freebsd32_sigreturn_args), (sy_call_t *)freebsd32_sigreturn, AUE_SIGRETURN, NULL, 0, 0, 0 }, /* 417 = freebsd32_sigreturn */
@@ -475,9 +475,9 @@
{ AS(freebsd32_umtx_lock_args), (sy_call_t *)freebsd32_umtx_lock, AUE_NULL, NULL, 0, 0, 0 }, /* 434 = freebsd32_umtx_lock */
{ AS(freebsd32_umtx_unlock_args), (sy_call_t *)freebsd32_umtx_unlock, AUE_NULL, NULL, 0, 0, 0 }, /* 435 = freebsd32_umtx_unlock */
{ AS(jail_attach_args), (sy_call_t *)jail_attach, AUE_NULL, NULL, 0, 0, 0 }, /* 436 = jail_attach */
- { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 437 = extattr_list_fd */
- { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 438 = extattr_list_file */
- { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 439 = extattr_list_link */
+ { AS(extattr_list_fd_args), (sy_call_t *)extattr_list_fd, AUE_EXTATTR_LIST_FD, NULL, 0, 0, 0 }, /* 437 = extattr_list_fd */
+ { AS(extattr_list_file_args), (sy_call_t *)extattr_list_file, AUE_EXTATTR_LIST_FILE, NULL, 0, 0, 0 }, /* 438 = extattr_list_file */
+ { AS(extattr_list_link_args), (sy_call_t *)extattr_list_link, AUE_EXTATTR_LIST_LINK, NULL, 0, 0, 0 }, /* 439 = extattr_list_link */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 440 = kse_switchin */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 441 = ksem_timedwait */
{ AS(freebsd32_thr_suspend_args), (sy_call_t *)freebsd32_thr_suspend, AUE_NULL, NULL, 0, 0, 0 }, /* 442 = freebsd32_thr_suspend */
==== //depot/projects/multipass/sys/compat/freebsd32/syscalls.master#4 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.115 2009/04/29 21:14:15 jamie Exp $
+ $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.116 2009/06/10 13:48:13 kib Exp $
; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94
; from: src/sys/kern/syscalls.master 1.107
;
@@ -708,9 +708,17 @@
409 AUE_NULL UNIMPL __mac_get_pid
410 AUE_NULL UNIMPL __mac_get_link
411 AUE_NULL UNIMPL __mac_set_link
-412 AUE_EXTATTR_SET_LINK UNIMPL extattr_set_link
-413 AUE_EXTATTR_GET_LINK UNIMPL extattr_get_link
-414 AUE_EXTATTR_DELETE_LINK UNIMPL extattr_delete_link
+412 AUE_EXTATTR_SET_LINK NOPROTO { int extattr_set_link( \
+ const char *path, int attrnamespace, \
+ const char *attrname, void *data, \
+ size_t nbytes); }
+413 AUE_EXTATTR_GET_LINK NOPROTO { ssize_t extattr_get_link( \
+ const char *path, int attrnamespace, \
+ const char *attrname, void *data, \
+ size_t nbytes); }
+414 AUE_EXTATTR_DELETE_LINK NOPROTO { int extattr_delete_link( \
+ const char *path, int attrnamespace, \
+ const char *attrname); }
415 AUE_NULL UNIMPL __mac_execve
416 AUE_SIGACTION STD { int freebsd32_sigaction(int sig, \
struct sigaction32 *act, \
@@ -741,9 +749,15 @@
434 AUE_NULL STD { int freebsd32_umtx_lock(struct umtx *umtx); }
435 AUE_NULL STD { int freebsd32_umtx_unlock(struct umtx *umtx); }
436 AUE_NULL NOPROTO { int jail_attach(int jid); }
-437 AUE_EXTATTR_LIST_FD UNIMPL extattr_list_fd
-438 AUE_EXTATTR_LIST_FILE UNIMPL extattr_list_file
-439 AUE_EXTATTR_LIST_LINK UNIMPL extattr_list_link
+437 AUE_EXTATTR_LIST_FD NOPROTO { ssize_t extattr_list_fd(int fd, \
+ int attrnamespace, void *data, \
+ size_t nbytes); }
+438 AUE_EXTATTR_LIST_FILE NOPROTO { ssize_t extattr_list_file( \
+ const char *path, int attrnamespace, \
+ void *data, size_t nbytes); }
+439 AUE_EXTATTR_LIST_LINK NOPROTO { ssize_t extattr_list_link( \
+ const char *path, int attrnamespace, \
+ void *data, size_t nbytes); }
440 AUE_NULL UNIMPL kse_switchin
441 AUE_NULL UNIMPL ksem_timedwait
442 AUE_NULL STD { int freebsd32_thr_suspend( \
==== //depot/projects/multipass/sys/compat/linprocfs/linprocfs.c#3 (text+ko) ====
@@ -39,11 +39,10 @@
* @(#)procfs_status.c 8.4 (Berkeley) 6/15/94
*/
-#include "opt_route.h"
#include "opt_compat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.137 2009/03/26 17:14:22 ambrisko Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.138 2009/06/08 19:57:35 bz Exp $");
#include <sys/param.h>
#include <sys/queue.h>
==== //depot/projects/multipass/sys/compat/linux/linux_ioctl.c#5 (text+ko) ====
@@ -26,11 +26,10 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "opt_route.h"
#include "opt_compat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.149 2009/05/27 15:23:12 avg Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.150 2009/06/08 19:57:35 bz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/multipass/sys/compat/svr4/svr4_sockio.c#3 (text+ko) ====
@@ -27,9 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.23 2009/02/27 14:12:05 bz Exp $");
-
-#include "opt_route.h"
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.24 2009/06/08 19:57:35 bz Exp $");
#include <sys/param.h>
#include <sys/proc.h>
==== //depot/projects/multipass/sys/conf/NOTES#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1544 2009/06/08 04:39:48 svn Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1545 2009/06/10 02:07:58 yongari Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -1754,6 +1754,7 @@
# L2 PCI-Express FastEthernet controllers.
# age: Support for gigabit ethernet adapters based on the Attansic/Atheros
# L1 PCI express gigabit ethernet controllers.
+# alc: Support for Atheros AR8131/AR8132 PCIe ethernet controllers.
# ale: Support for Atheros AR8121/AR8113/AR8114 PCIe ethernet controllers.
# bce: Broadcom NetXtreme II (BCM5706/BCM5708) PCI/PCIe Gigabit Ethernet
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list