Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 9 Sep 2008 14:38:18 GMT
From:      Brooks Davis <brooks@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 149477 for review
Message-ID:  <200809091438.m89EcIqN048025@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=149477

Change 149477 by brooks@brooks_coredump on 2008/09/09 14:38:11

	IFC (exact change number lost due to running out of battery :)

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/cpu_switch.S#4 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/genassym.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/machdep.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/mp_machdep.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/trap.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/include/pcb.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/include/pcpu.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/include/segments.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_genassym.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_locore.s#2 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_machdep.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/at91/at91.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_mci.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_ssc.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/at91/kb920x_machdep.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/conf/KB920X#3 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/conf/NSLU#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/sparc64/loader/main.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/NOTES#8 integrate
.. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 integrate
.. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/wisoc.hal.o.uu#1 branch
.. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/wisoc.inc#1 branch
.. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/wisoc.opt_ah.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/acpi_support/acpi_fujitsu.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/asmc/asmc.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/asmc/asmcvar.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-chipset.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-pci.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/bge/if_bge.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/esp/esp_sbus.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/esp/ncr53c9x.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/esp/ncr53c9xreg.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/esp/ncr53c9xvar.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ic/i8251.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ic/i8255.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/iicbus/ds133x.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/iicbus/ds1672.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/le/if_le_ledma.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mii/e1000phy.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mii/miidevs#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/re/if_re.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/si/si.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/hda/hdac.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/uart/uart_cpu_pc98.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/if_zyd.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/ucom.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/ucomvar.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#8 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/geom_dev.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/part/g_part.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/part/g_part.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_gpt.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/include/pmc_mdep.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/isa/isa.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/linux/linux_genassym.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/linux/linux_locore.s#2 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_proc.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_resource.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/subr_sleepqueue.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/tty.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/tty_compat.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/tty_pts.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/uipc_mbuf.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/uipc_mqueue.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/uipc_sockbuf.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/mips/intr_machdep.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_bridge.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/net/route.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ddb.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_freebsd.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ht.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ht.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ioctl.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ioctl.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_node.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_node.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_phy.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_sta.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#19 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_debug.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#10 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_var.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/pc98/cbus/sio.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/pc98/include/bus.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/pc98/pc98/busiosubr.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/security/audit/audit_syscalls.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/include/cpu.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/include/dcr.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/sparc64/include/trap.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/include/tte.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sbus/dma_sbus.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sbus/lsi64854.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sbus/lsi64854var.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/cheetah.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/exception.S#5 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/genassym.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/machdep.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/mp_machdep.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/pmap.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/trap.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/disk.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/gpt.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/param.h#10 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/termios.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/tty.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/ttydevsw.h#2 integrate

Differences ...

==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/cpu_switch.S#4 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.163 2008/09/02 17:52:11 kib Exp $
+ * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.164 2008/09/08 09:59:05 kib Exp $
  */
 
 #include <machine/asmacros.h>
@@ -266,7 +266,7 @@
 	movl	%es,PCB_ES(%r8)
 	movl	%fs,PCB_FS(%r8)
 	jmp	done_store_seg
-2:	movq	PCB_GS32P(%r8),%rax
+2:	movq	PCPU(GS32P),%rax
 	movq	(%rax),%rax
 	movq	%rax,PCB_GS32SD(%r8)
 	jmp	1b
@@ -283,7 +283,7 @@
 	movl	PCB_FS(%r8),%fs
 	jmp	done_load_seg
 	/* Restore userland %gs while preserving kernel gsbase */
-2:	movq	PCB_GS32P(%r8),%rax
+2:	movq	PCPU(GS32P),%rax
 	movq	PCB_GS32SD(%r8),%rcx
 	movq	%rcx,(%rax)
 	jmp	1b

==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/genassym.c#3 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.169 2008/07/30 11:30:55 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.170 2008/09/08 09:59:05 kib Exp $");
 
 #include "opt_compat.h"
 #include "opt_kstack_pages.h"
@@ -147,7 +147,6 @@
 ASSYM(PCB_SAVEFPU, offsetof(struct pcb, pcb_save));
 ASSYM(PCB_SAVEFPU_SIZE, sizeof(struct savefpu));
 ASSYM(PCB_ONFAULT, offsetof(struct pcb, pcb_onfault));
-ASSYM(PCB_GS32P, offsetof(struct pcb, pcb_gs32p));
 ASSYM(PCB_GS32SD, offsetof(struct pcb, pcb_gs32sd));
 
 ASSYM(PCB_SIZE, sizeof(struct pcb));
@@ -199,6 +198,7 @@
 ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap));
 ASSYM(PC_TSSP, offsetof(struct pcpu, pc_tssp));
 ASSYM(PC_RSP0, offsetof(struct pcpu, pc_rsp0));
+ASSYM(PC_GS32P, offsetof(struct pcpu, pc_gs32p));
  
 ASSYM(LA_VER, offsetof(struct LAPIC, version));
 ASSYM(LA_TPR, offsetof(struct LAPIC, tpr));

==== //depot/projects/vimage-commit2/src/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.688 2008/09/02 17:52:11 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.690 2008/09/08 09:59:05 kib Exp $");
 
 #include "opt_atalk.h"
 #include "opt_atpic.h"
@@ -803,7 +803,7 @@
  * Initialize segments & interrupt table
  */
 
-struct user_segment_descriptor gdt[NGDT * MAXCPU];/* global descriptor table */
+struct user_segment_descriptor gdt[NGDT * MAXCPU];/* global descriptor tables */
 static struct gate_descriptor idt0[NIDT];
 struct gate_descriptor *idt = &idt0[0];	/* interrupt descriptor table */
 
@@ -870,7 +870,7 @@
 /* GPROC0_SEL	6 Proc 0 Tss Descriptor */
 {
 	0x0,			/* segment base address */
-	sizeof(struct amd64tss)-1,/* length - all address space */
+	sizeof(struct amd64tss)-1,/* length */
 	SDT_SYSTSS,		/* segment type */
 	SEL_KPL,		/* segment descriptor priority level */
 	1,			/* segment descriptor present */
@@ -1347,6 +1347,7 @@
 	PCPU_SET(curthread, &thread0);
 	PCPU_SET(curpcb, thread0.td_pcb);
 	PCPU_SET(tssp, &common_tss[0]);
+	PCPU_SET(gs32p, &gdt[GUGS32_SEL]);
 
 	/*
 	 * Initialize mutexes.

==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/mp_machdep.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.291 2008/07/09 19:44:37 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.293 2008/09/08 09:59:05 kib Exp $");
 
 #include "opt_cpu.h"
 #include "opt_kstack_pages.h"
@@ -436,7 +436,8 @@
 {
 	struct pcpu *pc;
 	u_int64_t msr, cr0;
-	int cpu, gsel_tss;
+	int cpu, gsel_tss, x;
+	struct region_descriptor ap_gdt;
 
 	/* Set by the startup code for us to use */
 	cpu = bootAP;
@@ -447,11 +448,17 @@
 	common_tss[cpu].tss_iobase = sizeof(struct amd64tss);
 	common_tss[cpu].tss_ist1 = (long)&doublefault_stack[PAGE_SIZE];
 
+	/* Prepare private GDT */
 	gdt_segs[GPROC0_SEL].ssd_base = (long) &common_tss[cpu];
 	ssdtosyssd(&gdt_segs[GPROC0_SEL],
-	   (struct system_segment_descriptor *)&gdt[GPROC0_SEL]);
-
-	lgdt(&r_gdt);			/* does magic intra-segment return */
+	   (struct system_segment_descriptor *)&gdt[NGDT * cpu + GPROC0_SEL]);
+	for (x = 0; x < NGDT; x++) {
+		if (x != GPROC0_SEL && x != (GPROC0_SEL + 1))
+			ssdtosd(&gdt_segs[x], &gdt[NGDT * cpu + x]);
+	}
+	ap_gdt.rd_limit = NGDT * sizeof(gdt[0]) - 1;
+	ap_gdt.rd_base =  (long) &gdt[NGDT * cpu];
+	lgdt(&ap_gdt);			/* does magic intra-segment return */
 
 	/* Get per-cpu data */
 	pc = &__pcpu[cpu];
@@ -463,6 +470,7 @@
 	pc->pc_curthread = 0;
 	pc->pc_tssp = &common_tss[cpu];
 	pc->pc_rsp0 = 0;
+	pc->pc_gs32p = &gdt[NGDT * cpu + GUGS32_SEL];
 
 	wrmsr(MSR_FSBASE, 0);		/* User value */
 	wrmsr(MSR_GSBASE, (u_int64_t)pc);

==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/trap.c#3 (text+ko) ====

@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.327 2008/06/20 05:22:09 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.328 2008/09/08 09:55:51 kib Exp $");
 
 /*
  * AMD64 Trap and System call handling
@@ -692,7 +692,8 @@
 
 	code = frame->tf_err;
 	type = frame->tf_trapno;
-	sdtossd(&gdt[IDXSEL(frame->tf_cs & 0xffff)], &softseg);
+	sdtossd(&gdt[NGDT * PCPU_GET(cpuid) + IDXSEL(frame->tf_cs & 0xffff)],
+	    &softseg);
 
 	if (type <= MAX_TRAP_MSG)
 		msg = trap_msg[type];

==== //depot/projects/vimage-commit2/src/sys/amd64/include/pcb.h#3 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pcb.h	5.10 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.65 2008/07/30 11:30:55 kib Exp $
+ * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.66 2008/09/08 09:59:05 kib Exp $
  */
 
 #ifndef _AMD64_PCB_H_
@@ -77,7 +77,6 @@
 	caddr_t	pcb_onfault;	/* copyin/out fault recovery */
 
 	/* 32-bit segment descriptor */
-	struct user_segment_descriptor	*pcb_gs32p;
 	struct user_segment_descriptor	pcb_gs32sd;
 };
 

==== //depot/projects/vimage-commit2/src/sys/amd64/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/amd64/include/pcpu.h,v 1.50 2008/08/19 19:53:52 jhb Exp $
+ * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.51 2008/09/08 09:59:05 kib Exp $
  */
 
 #ifndef _MACHINE_PCPU_H_
@@ -48,7 +48,8 @@
 	register_t pc_rsp0;						\
 	register_t pc_scratch_rsp;	/* User %rsp in syscall */	\
 	u_int	pc_apic_id;						\
-	u_int   pc_acpi_id		/* ACPI CPU id */
+	u_int   pc_acpi_id;		/* ACPI CPU id */		\
+	struct user_segment_descriptor	*pc_gs32p
 
 #ifdef _KERNEL
 

==== //depot/projects/vimage-commit2/src/sys/amd64/include/segments.h#2 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)segments.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/amd64/include/segments.h,v 1.39 2007/03/30 00:06:21 jkim Exp $
+ * $FreeBSD: src/sys/amd64/include/segments.h,v 1.40 2008/09/08 08:58:29 kib Exp $
  */
 
 #ifndef _MACHINE_SEGMENTS_H_
@@ -201,7 +201,7 @@
 #define	GUDATA_SEL	4	/* User 32/64 bit Data Descriptor */
 #define	GUCODE_SEL	5	/* User 64 bit Code Descriptor */
 #define	GPROC0_SEL	6	/* TSS for entering kernel etc */
-/* slot 6 is second half of GPROC0_SEL */
+/* slot 7 is second half of GPROC0_SEL */
 #define	GUGS32_SEL	8	/* User 32 bit GS Descriptor */
 #define	NGDT 		9
 

==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_genassym.c#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_genassym.c,v 1.1 2004/08/16 07:55:06 tjr Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_genassym.c,v 1.2 2008/09/07 16:39:21 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/assym.h>
@@ -9,9 +9,8 @@
 
 ASSYM(LINUX_SIGF_HANDLER, offsetof(struct l_sigframe, sf_handler));
 ASSYM(LINUX_SIGF_SC, offsetof(struct l_sigframe, sf_sc));
-ASSYM(LINUX_SC_GS, offsetof(struct l_sigcontext, sc_gs));
-ASSYM(LINUX_SC_FS, offsetof(struct l_sigcontext, sc_fs));
 ASSYM(LINUX_SC_ES, offsetof(struct l_sigcontext, sc_es));
 ASSYM(LINUX_SC_DS, offsetof(struct l_sigcontext, sc_ds));
 ASSYM(LINUX_RT_SIGF_HANDLER, offsetof(struct l_rt_sigframe, sf_handler));
 ASSYM(LINUX_RT_SIGF_UC, offsetof(struct l_rt_sigframe, sf_sc));
+ASSYM(LINUX_RT_SIGF_SC, offsetof(struct l_ucontext, uc_mcontext));

==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_locore.s#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/amd64/linux32/linux32_locore.s,v 1.2 2007/03/30 00:06:21 jkim Exp $ */
+/* $FreeBSD: src/sys/amd64/linux32/linux32_locore.s,v 1.3 2008/09/07 16:39:21 kib Exp $ */
 
 #include "linux32_assym.h"			/* system definitions */
 #include <machine/asmacros.h>			/* miscellaneous asm macros */
@@ -23,8 +23,9 @@
 linux_rt_sigcode:
 	call	*LINUX_RT_SIGF_HANDLER(%esp)
 	leal	LINUX_RT_SIGF_UC(%esp),%ebx	/* linux ucp */
-	movl	LINUX_SC_ES(%ebx),%es
-	movl	LINUX_SC_DS(%ebx),%ds
+	leal	LINUX_RT_SIGF_SC(%ebx),%ecx	/* linux sigcontext */
+	movl	LINUX_SC_ES(%ecx),%es
+	movl	LINUX_SC_DS(%ecx),%ds
 	push	%eax				/* fake ret addr */
 	movl	$LINUX_SYS_linux_rt_sigreturn,%eax   /* linux_rt_sigreturn() */
 	int	$0x80				/* enter kernel with args */

==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_machdep.c#3 (text+ko) ====

@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.47 2008/07/30 11:30:55 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.49 2008/09/08 09:59:05 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -694,7 +694,6 @@
 #endif
 			td2->td_pcb->pcb_gsbase = (register_t)info.base_addr;
 			td2->td_pcb->pcb_gs32sd = sd;
-			td2->td_pcb->pcb_gs32p = &gdt[GUGS32_SEL];
 			td2->td_pcb->pcb_gs = GSEL(GUGS32_SEL, SEL_UPL);
 			td2->td_pcb->pcb_flags |= PCB_GS32BIT | PCB_32BIT;
 		}
@@ -1352,9 +1351,8 @@
 
 	critical_enter();
 	td->td_pcb->pcb_gsbase = (register_t)info.base_addr;
-	td->td_pcb->pcb_gs32sd = gdt[GUGS32_SEL] = sd;
-	td->td_pcb->pcb_gs32p = &gdt[GUGS32_SEL];
-	td->td_pcb->pcb_flags |= PCB_32BIT;
+	td->td_pcb->pcb_gs32sd = *PCPU_GET(gs32p) = sd;
+	td->td_pcb->pcb_flags |= PCB_32BIT | PCB_GS32BIT;
 	wrmsr(MSR_KGSBASE, td->td_pcb->pcb_gsbase);
 	critical_exit();
 

==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91.c#3 (text) ====

@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.17 2008/08/19 22:15:14 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.18 2008/09/05 22:27:10 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -458,10 +458,6 @@
 	sc->sc_irq_rman.rm_descr = "AT91 IRQs";
 	sc->sc_mem_rman.rm_type = RMAN_ARRAY;
 	sc->sc_mem_rman.rm_descr = "AT91 Memory";
-#if 0
-	sc->sc_usbmem_rman.rm_type = RMAN_ARRAY;
-	sc->sc_usbmem_rman.rm_descr = "AT91RM9200 USB Memory-mapped regs";
-#endif
 	if (rman_init(&sc->sc_irq_rman) != 0 ||
 	    rman_manage_region(&sc->sc_irq_rman, 1, 31) != 0)
 		panic("at91_attach: failed to set up IRQ rman");
@@ -536,14 +532,8 @@
 		    start, end, count, flags, child);
 		break;
 	case SYS_RES_MEMORY:
-#if 0
-		if (start >= 0x00300000 && start <= 0x003fffff)
-			rle->res = rman_reserve_resource(&sc->sc_usbmem_rman,
-			    start, end, count, flags, child);
-		else
-#endif
-			rle->res = rman_reserve_resource(&sc->sc_mem_rman,
-			    start, end, count, flags, child);
+		rle->res = rman_reserve_resource(&sc->sc_mem_rman,
+		    start, end, count, flags, child);
 		rman_set_bustag(rle->res, &at91_bs_tag);
 		rman_set_bushandle(rle->res, start);
 		break;

==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91_mci.c#2 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.4 2007/09/16 07:48:58 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.5 2008/09/05 22:30:59 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -298,14 +298,7 @@
 	else
 		WR4(sc, MCI_SDCR, RD4(sc, MCI_SDCR) & ~MCI_SDCR_SDCBUS);
 	WR4(sc, MCI_MR, (RD4(sc, MCI_MR) & ~MCI_MR_CLKDIV) | clkdiv);
-#if 0
-	if (sc->vcc_pin) {
-		if (sc->power_mode == MMC_POWER_OFF)
-			gpio_set(sc->vcc_pin, 0);
-		else
-			gpio_set(sc->vcc_pin, 1);
-	}
-#endif
+	/* XXX We need to turn the device on/off here with a GPIO pin */
 	return (0);
 }
 

==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91_ssc.c#2 (text) ====

@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.4 2007/02/23 12:18:27 piso Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.5 2008/09/05 22:29:50 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -209,16 +209,6 @@
 at91_ssc_intr(void *xsc)
 {
 	struct at91_ssc_softc *sc = xsc;
-#if 0
-	uint32_t status;
-
-	/* Reading the status also clears the interrupt */
-	status = RD4(sc, SSC_SR);
-	if (status == 0)
-		return;
-	AT91_SSC_LOCK(sc);
-	AT91_SSC_UNLOCK(sc);
-#endif
 	wakeup(sc);
 	return;
 }
@@ -232,9 +222,6 @@
 	AT91_SSC_LOCK(sc);
 	if (!(sc->flags & OPENED)) {
 		sc->flags |= OPENED;
-#if 0
-	// Enable interrupts
-#endif
 	}
 	AT91_SSC_UNLOCK(sc);
     	return (0);
@@ -248,9 +235,6 @@
 	sc = CDEV2SOFTC(dev);
 	AT91_SSC_LOCK(sc);
 	sc->flags &= ~OPENED;
-#if 0
-	// Disable interrupts
-#endif
 	AT91_SSC_UNLOCK(sc);
 	return (0);
 }

==== //depot/projects/vimage-commit2/src/sys/arm/at91/kb920x_machdep.c#2 (text) ====

@@ -47,7 +47,7 @@
 #include "opt_at91.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.30 2008/04/03 16:44:49 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.31 2008/09/05 22:23:41 imp Exp $");
 
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
@@ -164,7 +164,6 @@
 	 * initialization is done. However, the AT91 resource allocation
 	 * system doesn't know how to use pmap_mapdev() yet.
 	 */
-#if 1
 	{
 		/*
 		 * Add the ohci controller, and anything else that might be
@@ -176,7 +175,6 @@
 		VM_PROT_READ|VM_PROT_WRITE,                             
 		PTE_NOCACHE,
 	},
-#endif
 	{
 		0,
 		0,

==== //depot/projects/vimage-commit2/src/sys/arm/conf/KB920X#3 (text) ====

@@ -1,4 +1,4 @@
-# KB920X -- Custom kernel configuration for the KB9200, 9201 and 9202
+# KB920X -- Custom kernel configuration for the KB9202 (no letter, A and B)
 # AT91RM9200 evaluation boards from kwikbyte.com.
 #
 # For more information on this file, please read the handbook section on
@@ -16,19 +16,19 @@
 # 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.18 2008/08/03 10:32:17 ed Exp $
+# $FreeBSD: src/sys/arm/conf/KB920X,v 1.19 2008/09/07 18:55:55 imp Exp $
 
 machine		arm
 ident		KB920X
 
 include		"../at91/std.kb920x"
-#To statically compile in device wiring instead of /boot/device.hints
-#hints		"GENERIC.hints"		#Default places to look for devices.
+# The AT91 platform doesn't use /boot/loader, so we have to statically wire
+# hints.
 hints		"KB920X.hints"
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
-options		DDB
-options		KDB
+options 	DDB
+options 	KDB
 
 options 	SCHED_4BSD		#4BSD scheduler
 options 	INET			#InterNETworking
@@ -38,14 +38,14 @@
 #options 	UFS_ACL			#Support for access control lists
 #options 	UFS_DIRHASH		#Improve performance on big directories
 #options 	MD_ROOT			#MD is a potential root device
-#options		MD_ROOT_SIZE=4096	# 3MB ram disk
+#options 	MD_ROOT_SIZE=4096	# 4MB ram disk
 options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
 options 	NFSCLIENT		#Network Filesystem Client
 #options 	NFSSERVER		#Network Filesystem Server
 #options 	NFSLOCKD		#Network Lock Manager
 #options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
-#options	BOOTP_NFSROOT
-#options	BOOTP
+#options 	BOOTP_NFSROOT
+#options 	BOOTP
 
 #options 	MSDOSFS			#MSDOS Filesystem
 #options 	CD9660			#ISO 9660 Filesystem
@@ -58,8 +58,11 @@
 options 	SYSVSEM			#SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
 #options 	SYSCTL_OMIT_DESCR
+# Disable the inlining of mutex, rwlock and sx locks.  These eat up a lot
+# of space.
 options 	MUTEX_NOINLINE
-options		RWLOCK_NOINLINE
+options 	RWLOCK_NOINLINE
+options 	SX_NOINLINE
 options 	NO_FFS_SNAPSHOT
 options 	NO_SWAPPING
 device		random

==== //depot/projects/vimage-commit2/src/sys/arm/conf/NSLU#2 (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/NSLU,v 1.1 2008/08/03 07:10:25 imp Exp $
+# $FreeBSD: src/sys/arm/conf/NSLU,v 1.2 2008/09/08 00:41:32 imp Exp $
 
 machine		arm
 ident		NSLU
@@ -67,6 +67,9 @@
 options 	SYSVMSG			#SYSV-style message queues
 options 	SYSVSEM			#SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
+options 	MUTEX_NOINLINE		#Mutex inlines are space hogs
+options 	RWLOCK_NOINLINE		#rwlock inlines are space hogs
+options 	SX_NOINLINE		#sx inliens are space hogs
 options 	BOOTP
 options 	BOOTP_NFSROOT
 options 	BOOTP_NFSV3
@@ -89,7 +92,8 @@
 device		npe_fw
 device		firmware
 device		qmgr		# Q Manager (required by npe)
-device		miibus		# NB: required by npe
+device		mii		# Minimal mii routines
+device		rlphy		# NSLU2 uses Realtek PHY attached to npe
 device		ether
 device		bpf
 

==== //depot/projects/vimage-commit2/src/sys/boot/sparc64/loader/main.c#5 (text+ko) ====

@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.35 2008/08/30 16:03:22 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.36 2008/09/04 19:41:54 marius Exp $");
 
 /*
  * FreeBSD/sparc64 kernel loader - machine dependent part
@@ -396,36 +396,44 @@
 static vm_offset_t
 dtlb_va_to_pa_sun4u(vm_offset_t va)
 {
-	u_long reg;
+	u_long pstate, reg;
 	int i;
 
+	pstate = rdpr(pstate);
+	wrpr(pstate, pstate & ~PSTATE_IE, 0);
 	for (i = 0; i < dtlb_slot_max; i++) {
 		reg = ldxa(TLB_DAR_SLOT(i), ASI_DTLB_TAG_READ_REG);
 		if (TLB_TAR_VA(reg) != va)
 			continue;
 		reg = dtlb_get_data_sun4u(i);
+		wrpr(pstate, pstate, 0);
 		if (cpu_impl >= CPU_IMPL_ULTRASPARCIII)
 			return ((reg & TD_PA_CH_MASK) >> TD_PA_SHIFT);
 		return ((reg & TD_PA_SF_MASK) >> TD_PA_SHIFT);
 	}
+	wrpr(pstate, pstate, 0);
 	return (-1);
 }
 
 static vm_offset_t
 itlb_va_to_pa_sun4u(vm_offset_t va)
 {
-	u_long reg;
+	u_long pstate, reg;
 	int i;
 
+	pstate = rdpr(pstate);
+	wrpr(pstate, pstate & ~PSTATE_IE, 0);
 	for (i = 0; i < itlb_slot_max; i++) {
 		reg = ldxa(TLB_DAR_SLOT(i), ASI_ITLB_TAG_READ_REG);
 		if (TLB_TAR_VA(reg) != va)
 			continue;
 		reg = itlb_get_data_sun4u(i);
+		wrpr(pstate, pstate, 0);
 		if (cpu_impl >= CPU_IMPL_ULTRASPARCIII)
 			return ((reg & TD_PA_CH_MASK) >> TD_PA_SHIFT);
 		return ((reg & TD_PA_SF_MASK) >> TD_PA_SHIFT);
 	}
+	wrpr(pstate, pstate, 0);
 	return (-1);
 }
 

==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#2 (text+ko) ====

@@ -358,6 +358,7 @@
 	fp = kmem_zalloc(size, KM_SLEEP);
 	error = getnewvnode("zfs", vfsp, ops, &vp);
 	ASSERT(error == 0);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	vp->v_data = (caddr_t)fp;
 
 	/*
@@ -368,7 +369,9 @@
 	fp->gfs_size = size;
 	fp->gfs_type = GFS_FILE;
 
+	vp->v_vflag |= VV_FORCEINSMQ;
 	error = insmntque(vp, vfsp);
+	vp->v_vflag &= ~VV_FORCEINSMQ;
 	KASSERT(error == 0, ("insmntque() failed: error %d", error));
 
 	/*

==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 (text+ko) ====

@@ -176,6 +176,8 @@
 	vp->v_vflag &= ~VV_ROOT;
 
 	zfsvfs->z_ctldir = vp;
+
+	VOP_UNLOCK(vp, 0);
 }
 
 /*
@@ -788,6 +790,7 @@
 	mutex_init(&sdp->sd_lock, NULL, MUTEX_DEFAULT, NULL);
 	avl_create(&sdp->sd_snaps, snapentry_compare,
 	    sizeof (zfs_snapentry_t), offsetof(zfs_snapentry_t, se_node));
+	VOP_UNLOCK(vp, 0);
 	return (vp);
 }
 
@@ -860,6 +863,7 @@
 	    &zfsctl_ops_snapshot, NULL, NULL, MAXNAMELEN, NULL, NULL);
 	zcp = vp->v_data;
 	zcp->zc_id = objset;
+	VOP_UNLOCK(vp, 0);
 
 	return (vp);
 }

==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 (text+ko) ====

@@ -1303,12 +1303,6 @@
 		}
 	}
 out:
-
-	if (error == 0) {
-		*vpp = ZTOV(zp);
-		vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
-	}
-
 	if (dl)
 		zfs_dirent_unlock(dl);
 
@@ -1588,8 +1582,6 @@
 	zfs_log_create(zilog, tx, TX_MKDIR, dzp, zp, dirname);
 	dmu_tx_commit(tx);
 
-	vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
-
 	zfs_dirent_unlock(dl);
 
 	ZFS_EXIT(zfsvfs);
@@ -2773,7 +2765,6 @@
 	if (error == 0) {
 		zfs_log_symlink(zilog, tx, TX_SYMLINK, dzp, zp, name, link);
 		*vpp = ZTOV(zp);
-		vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
 	}
 
 	dmu_tx_commit(tx);

==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 (text+ko) ====

@@ -117,6 +117,7 @@
 	if (cdrarg != NULL) {
 		error = getnewvnode("zfs", vfsp, &zfs_vnodeops, &vp);
 		ASSERT(error == 0);
+		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 		zp->z_vnode = vp;
 		vp->v_data = (caddr_t)zp;
 		VN_LOCK_AREC(vp);
@@ -346,7 +347,9 @@
 	if (vp == NULL)
 		return (zp);
 
+	vp->v_vflag |= VV_FORCEINSMQ;
 	error = insmntque(vp, zfsvfs->z_vfs);
+	vp->v_vflag &= ~VV_FORCEINSMQ;
 	KASSERT(error == 0, ("insmntque() failed: error %d", error));
 
 	vp->v_type = IFTOVT((mode_t)zp->z_phys->zp_mode);
@@ -533,8 +536,10 @@
 
 		*zpp = zp;
 	} else {
-		if (ZTOV(zp) != NULL)
+		if (ZTOV(zp) != NULL) {
 			ZTOV(zp)->v_count = 0;
+			VOP_UNLOCK(ZTOV(zp), 0);
+		}
 		dmu_buf_rele(dbp, NULL);
 		zfs_znode_free(zp);
 	}
@@ -596,14 +601,18 @@
 			    &zp->z_vnode);
 			ASSERT(err == 0);
 			vp = ZTOV(zp);
+			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 			vp->v_data = (caddr_t)zp;
 			VN_LOCK_AREC(vp);
 			VN_LOCK_ASHARE(vp);
 			vp->v_type = IFTOVT((mode_t)zp->z_phys->zp_mode);
 			if (vp->v_type == VDIR)
 				zp->z_zn_prefetch = B_TRUE;	/* z_prefetch default is enabled */
+			vp->v_vflag |= VV_FORCEINSMQ;
 			err = insmntque(vp, zfsvfs->z_vfs);
+			vp->v_vflag &= ~VV_FORCEINSMQ;
 			KASSERT(err == 0, ("insmntque() failed: error %d", err));
+			VOP_UNLOCK(vp, 0);
 		}
 		mutex_exit(&zp->z_lock);
 		ZFS_OBJ_HOLD_EXIT(zfsvfs, obj_num);
@@ -619,6 +628,8 @@
 	zfs_znode_dmu_init(zp);
 	ZFS_OBJ_HOLD_EXIT(zfsvfs, obj_num);
 	*zpp = zp;
+	if ((vp = ZTOV(zp)) != NULL)
+		VOP_UNLOCK(vp, 0);
 	return (0);
 }
 

==== //depot/projects/vimage-commit2/src/sys/conf/NOTES#8 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1504 2008/08/20 08:31:58 ed Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1505 2008/09/08 10:40:48 raj Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
@@ -2276,6 +2276,14 @@
 device		iic
 device		iicsmb		# smb over i2c bridge
 
+# I2C peripheral devices
+#
+# ds133x	Dallas Semiconductor DS1337, DS1338 and DS1339 RTC
+# ds1672	Dallas Semiconductor DS1672 RTC
+#
+device		ds133x
+device		ds1672
+
 # Parallel-Port Bus
 #
 # Parallel port bus support is provided by the `ppbus' device.

==== //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 (text+ko) ====

@@ -3203,7 +3203,7 @@
 M"0.@,"T00`'H)`,``X^D`5`PAO__CJ)<P`)`("V/I0$T`$#X"0.@."T00`'?
 M)`,``XIC``":8P`#/`(`!S1"`$``8A@D$&``$P)`("V6HD)X+$)0`Q1```L\
 M`@`"CF(``#!"`*`D`P"@$$,`!3P"```D0@```$#X"8^E`30"0"`M/`(``B1"
-M.R0`0/@)CZ4!-`)`("T\`@`")$)'V`!`^`F/I0$T$$`!P"0#``./H@$P4: //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 $``
+M.R0`0/@)CZ4!-`)`("T\`@`")$)'V`!`^`F/I0$T$$`!P"0#``./H@$P4: //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 $``
 M")*F7#@"0"`M)`410#P"```D0@```$#X"8^F`3R2IEPXDJ)<.0`"$@``PC`E
 MDJ)<.@`"%```PC`EDJ)<.P`"%@``PC`E`D`@+3P0```F$````@#X"30%@`"2
 MIEP]``8R`)*B7#P`PC`ECZ,!2`##,"6.HE_4`,(P)3P"`(``PC`E`D`@+0(`

==== //depot/projects/vimage-commit2/src/sys/dev/acpi_support/acpi_fujitsu.c#2 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_fujitsu.c,v 1.5 2007/03/22 18:16:39 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_fujitsu.c,v 1.6 2008/09/08 06:29:24 ed Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
@@ -245,7 +245,7 @@
 	AcpiInstallNotifyHandler(sc->handle, ACPI_DEVICE_NOTIFY,
 	    acpi_fujitsu_notify_handler, sc);
 
-	/* Snag our default values for the hotkys / hotkey states. */
+	/* Snag our default values for the hotkeys / hotkey states. */
 	ACPI_SERIAL_BEGIN(fujitsu);
 	if (!acpi_fujitsu_init(sc))
 		device_printf(dev, "Couldn't initialize hotkey states!\n");

==== //depot/projects/vimage-commit2/src/sys/dev/asmc/asmc.c#2 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/asmc/asmc.c,v 1.9 2008/04/12 12:04:09 rpaulo Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/asmc/asmc.c,v 1.10 2008/09/07 18:15:34 rpaulo Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -197,6 +197,13 @@
 	  NULL, NULL,
 	  ASMC_MP_TEMPS, ASMC_MP_TEMPNAMES, ASMC_MP_TEMPDESCS
 	},
+
+	{
+	  "MacBookAir1,1", "Apple SMC MacBook Air",
+	  ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, NULL, NULL,
+	  ASMC_MBA_TEMPS, ASMC_MBA_TEMPNAMES, ASMC_MBA_TEMPDESCS
+	},	
+
 	
 	{ NULL, NULL }
 };

==== //depot/projects/vimage-commit2/src/sys/dev/asmc/asmcvar.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/asmc/asmcvar.h,v 1.6 2008/04/12 12:04:09 rpaulo Exp $
+ * $FreeBSD: src/sys/dev/asmc/asmcvar.h,v 1.7 2008/09/07 18:15:34 rpaulo Exp $
  *
  */
 
@@ -126,8 +126,8 @@
 /*
  * Temperatures.
  *
- * First for MacBook, second for MacBook Pro, third for Intel Mac Mini and
- * last Mac Pro 8-core.
+ * First for MacBook, second for MacBook Pro, third for Intel Mac Mini,
+ * fourth the Mac Pro 8-core and finally the MacBook Air.
  *
  */
 /* maximum array size for temperatures including the last NULL */
@@ -186,3 +186,7 @@
 				  "TM1S", "TM2P", "TM2S", "TM3S", "TM8P", \
 				  "TM8S", "TM9P", "TM9S", "TN0H", "TS0C", \
 				  NULL }
+
+#define	ASMC_MBA_TEMPS		{ "TB0T", NULL }
+#define	ASMC_MBA_TEMPNAMES	{ "enclosure" }
+#define	ASMC_MBA_TEMPDESCS	{ "Enclosure Bottom" }

==== //depot/projects/vimage-commit2/src/sys/dev/ata/ata-chipset.c#5 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.225 2008/08/15 10:55:11 philip Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.226 2008/09/04 10:27:58 mav Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
@@ -4932,6 +4932,7 @@

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809091438.m89EcIqN048025>