Date: Wed, 20 Aug 2008 08:59:25 GMT From: Ed Schouten <ed@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 147898 for review Message-ID: <200808200859.m7K8xPjd037702@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=147898 Change 147898 by ed@ed_dull on 2008/08/20 08:58:39 IFC my own TTY changes. Affected files ... .. //depot/projects/mpsafetty/etc/rc.d/Makefile#2 integrate .. //depot/projects/mpsafetty/lib/libkvm/Makefile#2 integrate .. //depot/projects/mpsafetty/lib/libkvm/kvm.h#2 integrate .. //depot/projects/mpsafetty/lib/libkvm/kvm_cptime.c#1 branch .. //depot/projects/mpsafetty/lib/libkvm/kvm_getcptime.3#1 branch .. //depot/projects/mpsafetty/lib/libkvm/kvm_getpcpu.3#1 branch .. //depot/projects/mpsafetty/lib/libkvm/kvm_pcpu.c#1 branch .. //depot/projects/mpsafetty/share/man/man4/Makefile#6 integrate .. //depot/projects/mpsafetty/share/man/man4/acpi_asus.4#1 branch .. //depot/projects/mpsafetty/sys/amd64/conf/GENERIC#8 integrate .. //depot/projects/mpsafetty/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_pio.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_piovar.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_pmc.c#3 integrate .. //depot/projects/mpsafetty/sys/arm/include/pcpu.h#2 integrate .. //depot/projects/mpsafetty/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_ioctl.c#6 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_stats.c#3 integrate .. //depot/projects/mpsafetty/sys/conf/NOTES#8 integrate .. //depot/projects/mpsafetty/sys/conf/files#14 integrate .. //depot/projects/mpsafetty/sys/conf/options#7 integrate .. //depot/projects/mpsafetty/sys/dev/acpi_support/acpi_asus.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/dcons/dcons.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/nmdm/nmdm.c#9 integrate .. //depot/projects/mpsafetty/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/schistory.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/scmouse.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/scterm-sc.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/scvesactl.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/sysmouse.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/uart/uart_tty.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ucom.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ucomvar.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/uftdi.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb/umodem.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/i386/conf/GENERIC#8 integrate .. //depot/projects/mpsafetty/sys/i386/conf/XBOX#4 integrate .. //depot/projects/mpsafetty/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/mpsafetty/sys/i386/ibcs2/ibcs2_ioctl.c#3 integrate .. //depot/projects/mpsafetty/sys/i386/include/pcpu.h#3 integrate .. //depot/projects/mpsafetty/sys/ia64/conf/GENERIC#5 integrate .. //depot/projects/mpsafetty/sys/ia64/conf/SKI#4 integrate .. //depot/projects/mpsafetty/sys/ia64/ia64/ssc.c#3 integrate .. //depot/projects/mpsafetty/sys/ia64/include/pcpu.h#2 integrate .. //depot/projects/mpsafetty/sys/kern/init_main.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/init_sysent.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/kern_acct.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_conf.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/kern_exit.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/kern_proc.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/kern_resource.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/subr_prf.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/syscalls.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/syscalls.master#3 integrate .. //depot/projects/mpsafetty/sys/kern/systrace_args.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/tty.c#23 integrate .. //depot/projects/mpsafetty/sys/kern/tty_compat.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/tty_cons.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/tty_info.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/tty_inq.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/tty_outq.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/tty_pts.c#12 integrate .. //depot/projects/mpsafetty/sys/kern/tty_pty.c#9 integrate .. //depot/projects/mpsafetty/sys/kern/tty_ttydisc.c#11 integrate .. //depot/projects/mpsafetty/sys/mips/include/pcpu.h#2 integrate .. //depot/projects/mpsafetty/sys/modules/nmdm/Makefile#4 integrate .. //depot/projects/mpsafetty/sys/modules/rc/Makefile#3 integrate .. //depot/projects/mpsafetty/sys/net/if.c#3 integrate .. //depot/projects/mpsafetty/sys/net/if_var.h#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_input.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_mroute.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/raw_ip.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_hostcache.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_syncache.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_gif.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_ifattach.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_pcb.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet6/nd6.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/mpsafetty/sys/pc98/cbus/scterm-sck.c#2 integrate .. //depot/projects/mpsafetty/sys/pc98/conf/GENERIC#6 integrate .. //depot/projects/mpsafetty/sys/pc98/conf/NOTES#3 integrate .. //depot/projects/mpsafetty/sys/powerpc/conf/GENERIC#6 integrate .. //depot/projects/mpsafetty/sys/powerpc/include/pcpu.h#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/conf/GENERIC#6 integrate .. //depot/projects/mpsafetty/sys/sparc64/include/pcpu.h#3 integrate .. //depot/projects/mpsafetty/sys/sun4v/conf/GENERIC#6 integrate .. //depot/projects/mpsafetty/sys/sun4v/include/pcpu.h#2 integrate .. //depot/projects/mpsafetty/sys/sun4v/sun4v/hvcons.c#3 integrate .. //depot/projects/mpsafetty/sys/sys/conf.h#4 integrate .. //depot/projects/mpsafetty/sys/sys/file.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/param.h#7 integrate .. //depot/projects/mpsafetty/sys/sys/pcpu.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/proc.h#5 integrate .. //depot/projects/mpsafetty/sys/sys/resource.h#3 integrate .. //depot/projects/mpsafetty/sys/sys/resourcevar.h#4 integrate .. //depot/projects/mpsafetty/sys/sys/syscall.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/syscall.mk#2 integrate .. //depot/projects/mpsafetty/sys/sys/sysctl.h#3 integrate .. //depot/projects/mpsafetty/sys/sys/sysproto.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/termios.h#7 integrate .. //depot/projects/mpsafetty/sys/sys/tty.h#13 integrate .. //depot/projects/mpsafetty/sys/sys/ttycom.h#5 integrate .. //depot/projects/mpsafetty/sys/sys/ttydefaults.h#3 integrate .. //depot/projects/mpsafetty/sys/sys/ttydevsw.h#4 integrate .. //depot/projects/mpsafetty/sys/sys/ttydisc.h#4 integrate .. //depot/projects/mpsafetty/sys/sys/ttyqueue.h#4 integrate .. //depot/projects/mpsafetty/sys/sys/types.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/user.h#3 integrate .. //depot/projects/mpsafetty/sys/vm/vm_meter.c#2 integrate .. //depot/projects/mpsafetty/sys/xen/xenbus/xenbus_comms.c#3 integrate .. //depot/projects/mpsafetty/sys/xen/xenbus/xenbus_comms.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/xenbus/xenbus_dev.c#3 integrate .. //depot/projects/mpsafetty/sys/xen/xenbus/xenbus_probe.c#3 integrate .. //depot/projects/mpsafetty/sys/xen/xenbus/xenbus_probe_backend.c#3 integrate .. //depot/projects/mpsafetty/sys/xen/xenbus/xenbus_xs.c#3 integrate .. //depot/projects/mpsafetty/usr.bin/tar/test/test_patterns.c#3 integrate .. //depot/projects/mpsafetty/usr.bin/tar/test/test_patterns.tgz.err.uu#2 delete .. //depot/projects/mpsafetty/usr.bin/tar/test/test_patterns.tgz.out.uu#2 delete .. //depot/projects/mpsafetty/usr.bin/tar/test/test_patterns.tgz.uu#2 delete .. //depot/projects/mpsafetty/usr.bin/tar/test/test_patterns_2.tgz.err.uu#1 branch .. //depot/projects/mpsafetty/usr.bin/tar/test/test_patterns_2.tgz.out.uu#1 branch .. //depot/projects/mpsafetty/usr.bin/tar/test/test_patterns_2.tgz.uu#1 branch .. //depot/projects/mpsafetty/usr.bin/vmstat/vmstat.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/iostat/iostat.c#2 integrate Differences ... ==== //depot/projects/mpsafetty/etc/rc.d/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.92 2008/06/05 17:26:47 brooks Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.93 2008/08/20 03:02:06 obrien Exp $ .include <bsd.own.mk> @@ -18,7 +18,7 @@ ip6addrctl ip6fw ipfilter ipfs ipfw ipmon \ ipnat ipsec ipxrouted \ jail \ - kadmind kerberos kernel keyserv kldxref kpasswdd \ + kadmind kerberos kernel_symlink keyserv kldxref kpasswdd \ ldconfig local localpkg lockd lpd \ mixer motd mountcritlocal mountcritremote mountlate \ mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \ ==== //depot/projects/mpsafetty/lib/libkvm/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libkvm/Makefile,v 1.17 2006/10/09 05:12:54 kmacy Exp $ +# $FreeBSD: src/lib/libkvm/Makefile,v 1.19 2008/08/19 21:30:36 jhb Exp $ LIB= kvm SHLIBDIR?= /lib @@ -9,16 +9,18 @@ CFLAGS+=-DSUN4V .endif -SRCS= kvm.c kvm_${MACHINE_ARCH}.c kvm_file.c kvm_getloadavg.c \ - kvm_getswapinfo.c kvm_proc.c +SRCS= kvm.c kvm_${MACHINE_ARCH}.c kvm_cptime.c kvm_file.c kvm_getloadavg.c \ + kvm_getswapinfo.c kvm_pcpu.c kvm_proc.c .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" SRCS+= kvm_minidump_${MACHINE_ARCH}.c .endif INCS= kvm.h -MAN= kvm.3 kvm_geterr.3 kvm_getfiles.3 kvm_getloadavg.3 kvm_getprocs.3 \ - kvm_getswapinfo.3 kvm_nlist.3 kvm_open.3 kvm_read.3 +MAN= kvm.3 kvm_getcptime.3 kvm_geterr.3 kvm_getfiles.3 kvm_getloadavg.3 \ + kvm_getpcpu.3 kvm_getprocs.3 kvm_getswapinfo.3 kvm_nlist.3 kvm_open.3 \ + kvm_read.3 +MLINKS+=kvm_getpcpu.3 kvm_getmaxcpu.3 MLINKS+=kvm_getprocs.3 kvm_getargv.3 kvm_getprocs.3 kvm_getenvv.3 MLINKS+=kvm_open.3 kvm_close.3 kvm_open.3 kvm_openfiles.3 MLINKS+=kvm_read.3 kvm_write.3 ==== //depot/projects/mpsafetty/lib/libkvm/kvm.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)kvm.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/lib/libkvm/kvm.h,v 1.17 2007/01/08 17:35:36 imp Exp $ + * $FreeBSD: src/lib/libkvm/kvm.h,v 1.19 2008/08/19 21:30:36 jhb Exp $ */ #ifndef _KVM_H_ @@ -70,10 +70,13 @@ __BEGIN_DECLS int kvm_close(kvm_t *); char **kvm_getargv(kvm_t *, const struct kinfo_proc *, int); +int kvm_getcptime(kvm_t *, long *); char **kvm_getenvv(kvm_t *, const struct kinfo_proc *, int); char *kvm_geterr(kvm_t *); char *kvm_getfiles(kvm_t *, int, int, int *); int kvm_getloadavg(kvm_t *, double [], int); +int kvm_getmaxcpu(kvm_t *); +void *kvm_getpcpu(kvm_t *, int); struct kinfo_proc * kvm_getprocs(kvm_t *, int, int, int *); int kvm_getswapinfo(kvm_t *, struct kvm_swap *, int, int); ==== //depot/projects/mpsafetty/share/man/man4/Makefile#6 (text+ko) ==== @@ -1,8 +1,9 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.424 2008/08/11 04:48:34 weongyo Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.425 2008/08/19 23:06:21 rpaulo Exp $ MAN= aac.4 \ acpi.4 \ + ${_acpi_asus.4} \ ${_acpi_dock.4} \ acpi_thermal.4 \ acpi_video.4 \ @@ -550,6 +551,7 @@ MLINKS+=xl.4 if_xl.4 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +_acpi_asus.4= acpi_asus.4 _acpi_dock.4= acpi_dock.4 _amdsmb.4= amdsmb.4 _asmc.4= asmc.4 ==== //depot/projects/mpsafetty/sys/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.506 2008/08/03 10:32:17 ed Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.507 2008/08/20 08:31:58 ed Exp $ cpu HAMMER ident GENERIC ==== //depot/projects/mpsafetty/sys/amd64/include/pcpu.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.49 2008/04/25 05:18:48 jeff Exp $ + * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.50 2008/08/19 19:53:52 jhb Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -33,8 +33,6 @@ #error "sys/cdefs.h is a prerequisite for this file" #endif -#ifdef _KERNEL - /* * The SMP parts are setup in pmap.c and locore.s for the BSP, and * mp_machdep.c sets up the data for the AP's to "see" when they awake. @@ -52,6 +50,8 @@ u_int pc_apic_id; \ u_int pc_acpi_id /* ACPI CPU id */ +#ifdef _KERNEL + #ifdef lint extern struct pcpu *pcpup; ==== //depot/projects/mpsafetty/sys/arm/at91/at91.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.16 2008/04/20 23:29:06 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.17 2008/08/19 22:15:14 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -304,7 +304,7 @@ { "at91_udp", 0, AT91RM92_BASE + AT91RM92_UDP_BASE, AT91RM92_UDP_SIZE, - AT91RM92_IRQ_UDP + AT91RM92_IRQ_UDP, AT91RM92_IRQ_PIOB }, { "at91_mci", 0, ==== //depot/projects/mpsafetty/sys/arm/at91/at91_pio.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.5 2007/02/23 12:18:27 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.6 2008/08/19 22:17:14 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -349,6 +349,49 @@ PIO[PIO_CODR / 4] = data_mask; } +uint8_t +at91_pio_gpio_get(uint32_t pio, uint32_t data_mask) +{ + uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); + + data_mask &= PIO[PIO_PDSR / 4]; + + return (data_mask ? 1 : 0); +} + +void +at91_pio_gpio_set_deglitch(uint32_t pio, uint32_t data_mask, int use_deglitch) +{ + uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); + + if (use_deglitch) + PIO[PIO_IFER / 4] = data_mask; + else + PIO[PIO_IFDR / 4] = data_mask; + return; +} + +void +at91_pio_gpio_set_interrupt(uint32_t pio, uint32_t data_mask, + int enable_interrupt) +{ + uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); + + if (enable_interrupt) + PIO[PIO_IER / 4] = data_mask; + else + PIO[PIO_IDR / 4] = data_mask; + return; +} + +uint32_t +at91_pio_gpio_clear_interrupt(uint32_t pio) +{ + uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); + /* reading this register will clear the interrupts */ + return (PIO[PIO_ISR / 4]); +} + static device_method_t at91_pio_methods[] = { /* Device interface */ DEVMETHOD(device_probe, at91_pio_probe), ==== //depot/projects/mpsafetty/sys/arm/at91/at91_piovar.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91_piovar.h,v 1.2 2006/07/14 22:22:57 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_piovar.h,v 1.3 2008/08/19 22:17:14 imp Exp $ */ #ifndef ARM_AT91_AT91_PIOVAR_H #define ARM_AT91_AT91_PIOVAR_H @@ -35,5 +35,9 @@ int use_pullup); void at91_pio_gpio_set(uint32_t pio, uint32_t data_mask); void at91_pio_gpio_clear(uint32_t pio, uint32_t data_mask); +uint8_t at91_pio_gpio_get(uint32_t pio, uint32_t data_mask); +void at91_pio_gpio_set_deglitch(uint32_t pio, uint32_t data_mask, int use_deglitch); +void at91_pio_gpio_set_interrupt(uint32_t pio, uint32_t data_mask, int enable_interrupt); +uint32_t at91_pio_gpio_clear_interrupt(uint32_t pio); #endif /* ARM_AT91_AT91_PIOVAR_H */ ==== //depot/projects/mpsafetty/sys/arm/at91/at91_pmc.c#3 (text) ==== @@ -25,7 +25,7 @@ #include "opt_at91.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.6 2008/07/22 14:04:06 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.7 2008/08/19 22:16:10 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -128,7 +128,7 @@ static struct at91_pmc_clock ohci_clk = { .name = "ohci_clk", .parent = &mck, - .pmc_mask = 1 << AT91RM92_IRQ_UDP, + .pmc_mask = 1 << AT91RM92_IRQ_UHP, .set_mode = &at91_pmc_set_periph_mode }; ==== //depot/projects/mpsafetty/sys/arm/include/pcpu.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/i386/include/globaldata.h,v 1.27 2001/04/27 - * $FreeBSD: src/sys/arm/include/pcpu.h,v 1.6 2007/06/06 23:23:47 jeff Exp $ + * $FreeBSD: src/sys/arm/include/pcpu.h,v 1.7 2008/08/19 19:53:52 jhb Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -38,6 +38,8 @@ struct vmspace; +#endif /* _KERNEL */ + /* * Inside the kernel, the globally reserved register g7 is used to * point at the globaldata structure. @@ -45,6 +47,8 @@ #define PCPU_MD_FIELDS \ struct pcup *pc_prvspace; +#ifdef _KERNEL + struct pcb; struct pcpu; ==== //depot/projects/mpsafetty/sys/bsm/audit_kevents.h#3 (text) ==== @@ -27,7 +27,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#34 - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.13 2008/07/31 09:54:35 rwatson Exp $ + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.14 2008/08/20 08:31:58 ed Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ ==== //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 (text+ko) ==== @@ -18,7 +18,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.5 2008/06/11 18:55:19 ed Exp $ + * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.6 2008/08/19 21:28:58 jb Exp $ */ /* @@ -13616,7 +13616,9 @@ cyclic_remove(state->dts_deadman); #else callout_stop(&state->dts_cleaner); + callout_drain(&state->dts_cleaner); callout_stop(&state->dts_deadman); + callout_drain(&state->dts_deadman); #endif dtrace_dstate_fini(&vstate->dtvs_dynvars); ==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_proto.h#3 (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.87 2008/07/10 17:46:58 brooks Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.88 2008/08/20 08:39:10 ed Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 181905 2008-08-20 08:31:58Z ed */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscall.h#3 (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.85 2008/07/10 17:46:58 brooks Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.87 2008/08/20 08:39:10 ed Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 181905 2008-08-20 08:31:58Z ed */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscalls.c#3 (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.76 2008/07/10 17:46:58 brooks Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.78 2008/08/20 08:39:10 ed Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 181905 2008-08-20 08:31:58Z ed */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_sysent.c#3 (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.86 2008/07/10 17:46:58 brooks Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 180433 2008-07-10 17:45:57Z brooks + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.88 2008/08/20 08:39:10 ed Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 181905 2008-08-20 08:31:58Z ed */ #include "opt_compat.h" ==== //depot/projects/mpsafetty/sys/compat/freebsd32/syscalls.master#3 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.101 2008/07/10 17:45:57 brooks Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.102 2008/08/20 08:31:58 ed Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; ==== //depot/projects/mpsafetty/sys/compat/linux/linux_ioctl.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.141 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.142 2008/08/20 08:31:58 ed Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/mpsafetty/sys/compat/linux/linux_stats.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.92 2008/06/02 08:40:06 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.93 2008/08/20 08:31:58 ed Exp $"); #include "opt_compat.h" #include "opt_mac.h" ==== //depot/projects/mpsafetty/sys/conf/NOTES#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1503 2008/08/03 10:32:17 ed Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1504 2008/08/20 08:31:58 ed Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # ==== //depot/projects/mpsafetty/sys/conf/files#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1330 2008/08/15 20:58:57 kmacy Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1331 2008/08/20 08:31:58 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -2356,4 +2356,4 @@ dev/xen/console/console.c optional xen dev/xen/console/xencons_ring.c optional xen dev/xen/blkfront/blkfront.c optional xen -dev/xen/netfront/netfront.c optional xen+dev/xen/netfront/netfront.c optional xen ==== //depot/projects/mpsafetty/sys/conf/options#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.635 2008/08/18 16:48:09 attilio Exp $ +# $FreeBSD: src/sys/conf/options,v 1.636 2008/08/20 08:31:58 ed Exp $ # # On the handling of kernel options # ==== //depot/projects/mpsafetty/sys/dev/acpi_support/acpi_asus.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.37 2008/08/09 11:14:05 des Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.38 2008/08/19 22:28:24 rpaulo Exp $"); /* * Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on @@ -291,7 +291,7 @@ }, { .name = "L8L" - /* Only has hotkeys, apparantly */ + /* Only has hotkeys, apparently */ }, { .name = "M1A", ==== //depot/projects/mpsafetty/sys/dev/dcons/dcons.h#2 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * $Id: dcons.h,v 1.15 2003/10/23 15:05:31 simokawa Exp $ - * $FreeBSD: src/sys/dev/dcons/dcons.h,v 1.6 2007/06/08 04:33:25 simokawa Exp $ + * $FreeBSD: src/sys/dev/dcons/dcons.h,v 1.7 2008/08/20 08:31:58 ed Exp $ */ #if defined(_KERNEL) || defined(_BOOT) ==== //depot/projects/mpsafetty/sys/dev/dcons/dcons_os.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/dcons/dcons_os.c,v 1.22 2008/05/05 08:25:46 peter Exp $ + * $FreeBSD: src/sys/dev/dcons/dcons_os.c,v 1.23 2008/08/20 08:31:58 ed Exp $ */ #include <sys/param.h> ==== //depot/projects/mpsafetty/sys/dev/nmdm/nmdm.c#9 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.40 2008/06/11 18:55:19 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.41 2008/08/20 08:31:58 ed Exp $"); /* * Pseudo-nulmodem driver ==== //depot/projects/mpsafetty/sys/dev/ofw/ofw_console.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.39 2008/05/04 23:29:37 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.40 2008/08/20 08:31:58 ed Exp $"); #include "opt_comconsole.h" #include "opt_ofw.h" ==== //depot/projects/mpsafetty/sys/dev/syscons/schistory.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/syscons/schistory.c,v 1.20 2005/12/04 02:12:42 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/syscons/schistory.c,v 1.21 2008/08/20 08:31:58 ed Exp $"); #include "opt_syscons.h" ==== //depot/projects/mpsafetty/sys/dev/syscons/scmouse.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/syscons/scmouse.c,v 1.42 2007/05/25 13:13:12 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/syscons/scmouse.c,v 1.43 2008/08/20 08:31:58 ed Exp $"); #include "opt_syscons.h" ==== //depot/projects/mpsafetty/sys/dev/syscons/scterm-sc.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/syscons/scterm-sc.c,v 1.23 2006/05/12 05:04:43 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/syscons/scterm-sc.c,v 1.24 2008/08/20 08:31:58 ed Exp $"); #include "opt_syscons.h" ==== //depot/projects/mpsafetty/sys/dev/syscons/scvesactl.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/syscons/scvesactl.c,v 1.25 2007/01/10 19:04:00 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/syscons/scvesactl.c,v 1.26 2008/08/20 08:31:58 ed Exp $"); #include "opt_vga.h" ==== //depot/projects/mpsafetty/sys/dev/syscons/scvidctl.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/syscons/scvidctl.c,v 1.39 2007/12/29 23:26:56 wkoszek Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/syscons/scvidctl.c,v 1.40 2008/08/20 08:31:58 ed Exp $"); #include "opt_compat.h" #include "opt_syscons.h" ==== //depot/projects/mpsafetty/sys/dev/syscons/syscons.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.460 2008/08/04 12:22:33 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.461 2008/08/20 08:31:58 ed Exp $"); #include "opt_compat.h" #include "opt_syscons.h" ==== //depot/projects/mpsafetty/sys/dev/syscons/syscons.h#3 (text+ko) ==== @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/syscons/syscons.h,v 1.90 2008/02/13 23:38:08 jhb Exp $ + * $FreeBSD: src/sys/dev/syscons/syscons.h,v 1.91 2008/08/20 08:31:58 ed Exp $ */ #ifndef _DEV_SYSCONS_SYSCONS_H_ ==== //depot/projects/mpsafetty/sys/dev/syscons/sysmouse.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/syscons/sysmouse.c,v 1.30 2008/03/16 10:58:03 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/syscons/sysmouse.c,v 1.31 2008/08/20 08:31:58 ed Exp $"); #include "opt_syscons.h" ==== //depot/projects/mpsafetty/sys/dev/uart/uart_core.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.24 2008/05/04 23:29:38 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.25 2008/08/20 08:31:58 ed Exp $"); #ifndef KLD_MODULE #include "opt_comconsole.h" ==== //depot/projects/mpsafetty/sys/dev/uart/uart_tty.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.29 2006/07/27 00:07:10 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.30 2008/08/20 08:31:58 ed Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/mpsafetty/sys/dev/usb/ucom.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/ucom.c,v 1.66 2008/03/25 23:46:24 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ucom.c,v 1.67 2008/08/20 08:31:58 ed Exp $"); /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. ==== //depot/projects/mpsafetty/sys/dev/usb/ucomvar.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ucomvar.h,v 1.9 2001/01/23 21:56:17 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ucomvar.h,v 1.10 2008/03/25 23:46:24 sam Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ucomvar.h,v 1.11 2008/08/20 08:31:58 ed Exp $ */ /*- * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>. ==== //depot/projects/mpsafetty/sys/dev/usb/uftdi.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/uftdi.c,v 1.38 2008/01/25 02:41:44 emaste Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uftdi.c,v 1.39 2008/08/20 08:31:58 ed Exp $"); /* * FTDI FT8U100AX serial adapter driver ==== //depot/projects/mpsafetty/sys/dev/usb/umodem.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/umodem.c,v 1.71 2007/07/29 18:16:43 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/umodem.c,v 1.72 2008/08/20 08:31:58 ed Exp $"); /*- * Copyright (c) 2003, M. Warner Losh <imp@freebsd.org>. * All rights reserved. ==== //depot/projects/mpsafetty/sys/fs/devfs/devfs_vnops.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * @(#)kernfs_vnops.c 8.15 (Berkeley) 5/21/95 * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vnops.c 1.43 * - * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.164 2008/08/12 19:34:45 kib Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.165 2008/08/20 08:31:58 ed Exp $ */ /* ==== //depot/projects/mpsafetty/sys/i386/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/i386/conf/GENERIC,v 1.496 2008/08/03 10:32:17 ed Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.497 2008/08/20 08:31:58 ed Exp $ cpu I486_CPU cpu I586_CPU ==== //depot/projects/mpsafetty/sys/i386/conf/XBOX#4 (text+ko) ==== @@ -1,7 +1,7 @@ # # XBOX -- kernel for an XBOX # -# $FreeBSD: src/sys/i386/conf/XBOX,v 1.9 2008/03/27 11:54:18 dfr Exp $ +# $FreeBSD: src/sys/i386/conf/XBOX,v 1.10 2008/08/20 08:31:58 ed Exp $ cpu I686_CPU # Celeron ident XBOX ==== //depot/projects/mpsafetty/sys/i386/i386/machdep.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.672 2008/08/17 23:38:14 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.673 2008/08/20 03:28:32 kmacy Exp $"); #include "opt_apic.h" #include "opt_atalk.h" @@ -1149,9 +1149,14 @@ HYPERVISOR_shutdown(SHUTDOWN_poweroff); } +int scheduler_running; + static void cpu_idle_hlt(int busy) { + + scheduler_running = 1; + enable_intr(); idle_block(); } @@ -1199,7 +1204,11 @@ return; } +#ifdef XEN +void (*cpu_idle_fn)(int) = cpu_idle_hlt; +#else void (*cpu_idle_fn)(int) = cpu_idle_acpi; +#endif void cpu_idle(int busy) ==== //depot/projects/mpsafetty/sys/i386/ibcs2/ibcs2_ioctl.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_ioctl.c,v 1.31 2005/01/06 23:22:04 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_ioctl.c,v 1.32 2008/08/20 08:31:58 ed Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/mpsafetty/sys/i386/include/pcpu.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/pcpu.h,v 1.52 2008/08/15 20:51:31 kmacy Exp $ + * $FreeBSD: src/sys/i386/include/pcpu.h,v 1.53 2008/08/19 19:53:52 jhb Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -33,8 +33,6 @@ #error "sys/cdefs.h is a prerequisite for this file" #endif -#ifdef _KERNEL - #include <machine/segments.h> #include <machine/tss.h> @@ -82,6 +80,9 @@ int pc_private_tss /* Flag indicating private tss */ #endif + +#ifdef _KERNEL + #ifdef lint extern struct pcpu *pcpup; ==== //depot/projects/mpsafetty/sys/ia64/conf/GENERIC#5 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.98 2008/07/07 22:55:11 delphij Exp $ +# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.99 2008/08/20 08:31:58 ed Exp $ cpu ITANIUM ident GENERIC ==== //depot/projects/mpsafetty/sys/ia64/conf/SKI#4 (text+ko) ==== @@ -17,7 +17,7 @@ # If you are in doubt as to the purpose or necessity of a line, check # first in NOTES. # -# $FreeBSD: src/sys/ia64/conf/SKI,v 1.25 2008/04/15 05:02:41 marcel Exp $ +# $FreeBSD: src/sys/ia64/conf/SKI,v 1.26 2008/08/20 08:31:58 ed Exp $ cpu ITANIUM ident SKI ==== //depot/projects/mpsafetty/sys/ia64/ia64/ssc.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/ssc.c,v 1.30 2006/11/06 17:43:10 rwatson Exp $ + * $FreeBSD: src/sys/ia64/ia64/ssc.c,v 1.31 2008/08/20 08:31:58 ed Exp $ */ #include <sys/param.h> #include <sys/bus.h> ==== //depot/projects/mpsafetty/sys/ia64/include/pcpu.h#2 (text+ko) ==== @@ -24,14 +24,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200808200859.m7K8xPjd037702>