 @@ -1,14 +1,14 @@
-#	$NetBSD: genassym.cf,v 1.55 2014/02/15 10:11:14 dsl Exp $
+#	$NetBSD: genassym.cf,v 1.56 2014/02/20 18:19:09 dsl Exp $
+#
 # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Charles M. Hannum, and by Andrew Doran.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 @@ -171,27 +171,26 @@ define	P_MD_SYSCALL		offsetof(struct pro
 define	LW_SYSTEM		LW_SYSTEM
 define	M_DATA			offsetof(struct mbuf, m_data)
 define	M_LEN			offsetof(struct mbuf, m_len)
 define	M_NEXT			offsetof(struct mbuf, m_next)
 define	IP_SRC			offsetof(struct ip, ip_src)
 define	IP_DST			offsetof(struct ip, ip_dst)
 define	PCB_CR3			offsetof(struct pcb, pcb_cr3)
 define	PCB_RBP			offsetof(struct pcb, pcb_rbp)
 define	PCB_RSP			offsetof(struct pcb, pcb_rsp)
 define	PCB_USERSP		offsetof(struct pcb, pcb_usersp)
 define	PCB_RSP0		offsetof(struct pcb, pcb_rsp0)
 define	PCB_CR0			offsetof(struct pcb, pcb_cr0)
 define	PCB_ONFAULT		offsetof(struct pcb, pcb_onfault)
 define	PCB_FLAGS		offsetof(struct pcb, pcb_flags)
 define	PCB_COMPAT32		PCB_COMPAT32
 define	PCB_FS			offsetof(struct pcb, pcb_fs)
 define	PCB_GS			offsetof(struct pcb, pcb_gs)
 define	TF_RDI			offsetof(struct trapframe, tf_rdi)
 define	TF_RSI			offsetof(struct trapframe, tf_rsi)
 define	TF_RDX			offsetof(struct trapframe, tf_rdx)
 define	TF_RCX			offsetof(struct trapframe, tf_rcx)
 define	TF_R8			offsetof(struct trapframe, tf_r8)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.205 2014/02/15 22:20:41 dsl Exp $	*/
+/*	$NetBSD: machdep.c,v 1.206 2014/02/20 18:19:09 dsl Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
  *     The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum and by Jason R. Thorpe of the Numerical Aerospace
  * Simulation Facility, NASA Ames Research Center.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Coyote Point Systems, Inc. which was written under contract to Coyote
  * Point by Jed Davis and Devon O'Dell.
 @@ -101,27 +101,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)machdep.c	7.4 (Berkeley) 6/3/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.205 2014/02/15 22:20:41 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.206 2014/02/20 18:19:09 dsl Exp $");
 /* #define XENDEBUG_LOW  */
 #include "opt_modular.h"
 #include "opt_user_ldt.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_cpureset_delay.h"
 #include "opt_mtrr.h"
 #include "opt_realmem.h"
 #include "opt_xen.h"
 #ifndef XEN
 #include "opt_physmem.h"
 @@ -457,27 +457,27 @@ x86_64_tls_switch(struct lwp *l)
 /*
  * Set up proc0's TSS and LDT.
  */
 void
 x86_64_proc0_tss_ldt_init(void)
+{
 	struct lwp *l = &lwp0;
 	struct pcb *pcb = lwp_getpcb(l);
 	pcb->pcb_flags = 0;
 	pcb->pcb_fs = 0;
 	pcb->pcb_gs = 0;
-	pcb->pcb_rsp0 = (uvm_lwp_getuarea(l) + KSTACK_SIZE - 16) & ~0xf;
+	pcb->pcb_rsp0 = (uvm_lwp_getuarea(l) + USPACE - 16) & ~0xf;
 	pcb->pcb_iopl = SEL_KPL;
 	pmap_kernel()->pm_ldt_sel = GSYSSEL(GLDT_SEL, SEL_KPL);
 	pcb->pcb_cr0 = rcr0() & ~CR0_TS;
 	l->l_md.md_regs = (struct trapframe *)pcb->pcb_rsp0 - 1;
 #if !defined(XEN)
 	lldt(pmap_kernel()->pm_ldt_sel);
 #else
+	{
 	struct physdev_op physop;
 	xen_set_ldt((vaddr_t) ldtstore, LDT_SIZE >> 3);
 	/* Reset TS bit and set kernel stack for interrupt handlers */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pcb.h,v 1.24 2014/02/11 20:17:16 dsl Exp $	*/
+/*	$NetBSD: pcb.h,v 1.25 2014/02/20 18:19:10 dsl Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -62,50 +62,47 @@
+ *
  *	@(#)pcb.h	5.10 (Berkeley) 5/12/91
  */
 /*
  * XXXfvdl these copyrights don't really match anymore
  */
 #ifndef _AMD64_PCB_H_
 #define _AMD64_PCB_H_
 #ifdef __x86_64__
-#include <sys/signal.h>
+#include <x86/cpu_extended_state.h>
 #include <machine/segments.h>
 #include <machine/tss.h>
 #include <x86/fpu.h>
 #include <machine/sysarch.h>
 #define	NIOPORTS	1024		/* # of ports we allow to be mapped */
 struct pcb {
 	int	  pcb_flags;
 #define	PCB_USER_LDT	0x01		/* has user-set LDT */
 #define	PCB_COMPAT32	0x02
 	u_int	  pcb_cr0;		/* saved image of CR0 */
 	uint64_t pcb_rsp0;
 	uint64_t pcb_cr2;		/* page fault address (CR2) */
 	uint64_t pcb_cr3;
 	uint64_t pcb_rsp;
 	uint64_t pcb_rbp;
 	uint64_t pcb_usersp;
 	uint32_t pcb_unused[2];		/* unused */
 	union	savefpu pcb_savefpu __aligned(16); /* floating point state */
 	uint32_t pcb_unused_1[4];	/* unused */
 	void     *pcb_onfault;		/* copyin/out fault recovery */
 	struct cpu_info *pcb_fpcpu;	/* cpu holding our fp state. */
 	uint64_t  pcb_fs;
 	uint64_t  pcb_gs;
 	int pcb_iopl;
 	uint32_t pcb_unused[11];		/* unused */
 	struct cpu_info *pcb_fpcpu;	/* cpu holding our fp state. */
 	union savefpu	pcb_savefpu __aligned(64); /* floating point state */
 	/* **** DO NOT ADD ANYTHING HERE **** */
 };
 __CTASSERT(sizeof(struct pcb) - sizeof (union savefpu) ==  128);
 #else	/*	__x86_64__	*/
 #include <i386/pcb.h>
 #endif	/*	__x86_64__	*/
 #endif /* _AMD64_PCB_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: proc.h,v 1.18 2014/02/15 10:11:15 dsl Exp $	*/
+/*	$NetBSD: proc.h,v 1.19 2014/02/20 18:19:10 dsl Exp $	*/
 /*
  * Copyright (c) 1991 Regents of the University of California.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -55,25 +55,20 @@ struct mdlwp {
 #define	MDL_COMPAT32	0x0008	/* i386, always return via iret */
 #define	MDL_IRET	0x0010	/* force return via iret, not sysret */
 struct mdproc {
 	int	md_flags;
 					/* Syscall handling function */
 	void	(*md_syscall)(struct trapframe *);
 };
 /* md_flags */
 #define MDP_USEDMTRR	0x0008	/* has set volatile MTRRs */
 #define	UAREA_PCB_OFFSET	(USPACE - ALIGN(sizeof(struct pcb)))
 #define	KSTACK_LOWEST_ADDR(l)	\
     ((void *)((vaddr_t)(l)->l_addr - UAREA_PCB_OFFSET))
 #define	KSTACK_SIZE		UAREA_PCB_OFFSET
 #else	/*	__x86_64__	*/
 #include <i386/proc.h>
 #endif	/*	__x86_64__	*/
 #endif /* _AMD64_PROC_H */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: locore.S,v 1.111 2014/02/02 22:41:20 dsl Exp $	*/
+/*	$NetBSD: locore.S,v 1.112 2014/02/20 18:19:10 dsl Exp $	*/
 /*
  * Copyright-o-rama!
  */
 /*
  * Copyright (c) 2006 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -119,27 +119,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)locore.s	7.3 (Berkeley) 5/13/91
  */
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.111 2014/02/02 22:41:20 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.112 2014/02/20 18:19:10 dsl Exp $");
 #include "opt_compat_oldboot.h"
 #include "opt_ddb.h"
 #include "opt_modular.h"
 #include "opt_multiboot.h"
 #include "opt_realmem.h"
 #include "opt_vm86.h"
 #include "opt_xen.h"
 #include "assym.h"
 #include "lapic.h"
 #include "ioapic.h"
 #include "ksyms.h"
 @@ -717,28 +717,28 @@ begin:
 	movl	$0,(%ebx)
 	addl	$PDE_SIZE,%ebx
 	loop	1b
 	/* Relocate atdevbase. */
 	movl	$KERNBASE,%edx
 	addl	_C_LABEL(tablesize),%edx
 	addl	%esi,%edx
 	movl	%edx,_C_LABEL(atdevbase)
 	/* Set up bootstrap stack. */
 	leal	(PROC0_STK_OFF+KERNBASE)(%esi),%eax
 	movl	%eax,_C_LABEL(lwp0uarea)
-	leal	(KSTACK_SIZE-FRAMESIZE)(%eax),%esp
+	leal	(USPACE-FRAMESIZE)(%eax),%esp
-	movl	%esi,(KSTACK_SIZE+PCB_CR3)(%eax)	# pcb->pcb_cr3
+	movl	%esi,PCB_CR3(%eax)	# pcb->pcb_cr3
 	xorl	%ebp,%ebp		# mark end of frames
 #if defined(MULTIBOOT)
 	/* It is now safe to parse the Multiboot information structure
 	 * we saved before from C code.  Note that we cannot delay its
 	 * parsing any more because initgdt (called below) needs to make
 	 * use of this information. */
 	call	_C_LABEL(multiboot_post_reloc)
 #endif
 	subl	$NGDT*8, %esp		# space for temporary gdt
 	pushl	%esp
 	call	_C_LABEL(initgdt)
 @@ -815,27 +815,27 @@ begin:
 	pushl	%eax		# start of temporary gdt
 	call	_C_LABEL(initgdt)
 	addl	$4,%esp
 	call	xen_pmap_bootstrap
 	/*
 	 * First avail returned by xen_pmap_bootstrap in %eax
 	 */
 	movl	%eax, %esi;
 	movl	%esi, _C_LABEL(lwp0uarea)
 	/* Set up bootstrap stack. */
-	leal	(KSTACK_SIZE-FRAMESIZE)(%eax),%esp
+	leal	(USPACE-FRAMESIZE)(%eax),%esp
 	xorl	%ebp,%ebp		# mark end of frames
 	addl	$USPACE, %esi
 	subl	$KERNBASE, %esi		#init386 want a physical address
 #ifdef PAE
 	pushl	$0	# init386() expects a 64 bits paddr_t with PAE
 #endif
 	pushl	%esi
 	call	_C_LABEL(init386)	# wire 386 chip for unix operation
 	addl	$PDE_SIZE,%esp		# pop paddr_t
 	call 	_C_LABEL(main)
 #endif /* XEN */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.749 2014/02/18 01:00:57 christos Exp $	*/
+/*	$NetBSD: machdep.c,v 1.750 2014/02/20 18:19:10 dsl Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
  *     The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum, by Jason R. Thorpe of the Numerical Aerospace
  * Simulation Facility NASA Ames Research Center, by Julio M. Merino Vidal,
  * and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -57,27 +57,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)machdep.c	7.4 (Berkeley) 6/3/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.749 2014/02/18 01:00:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.750 2014/02/20 18:19:10 dsl Exp $");
 #include "opt_beep.h"
 #include "opt_compat_ibcs2.h"
 #include "opt_compat_freebsd.h"
 #include "opt_compat_netbsd.h"
 #include "opt_compat_svr4.h"
 #include "opt_cpureset_delay.h"
 #include "opt_ddb.h"
 #include "opt_ipkdb.h"
 #include "opt_kgdb.h"
 #include "opt_mtrr.h"
 #include "opt_modular.h"
 #include "opt_multiboot.h"
 @@ -132,26 +132,27 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
 #include <machine/cpufunc.h>
 #include <machine/cpuvar.h>
 #include <machine/gdt.h>
 #include <machine/intr.h>
 #include <machine/kcore.h>
 #include <machine/pio.h>
 #include <machine/psl.h>
 #include <machine/reg.h>
 #include <machine/specialreg.h>
 #include <machine/bootinfo.h>
 #include <machine/mtrr.h>
 #include <x86/x86/tsc.h>
 #include <x86/fpu.h>
 #include <x86/machdep.h>
 #include <machine/multiboot.h>
 #ifdef XEN
 #include <xen/evtchn.h>
 #include <xen/xen.h>
 #include <xen/hypervisor.h>
 /* #define	XENDEBUG */
 /* #define	XENDEBUG_LOW */
 #ifdef XENDEBUG
 #define	XENPRINTF(x) printf x
 @@ -490,27 +491,27 @@ cpu_startup(void)
  * Set up proc0's TSS and LDT.
  */
 void
 i386_proc0_tss_ldt_init(void)
+{
 	struct lwp *l;
 	struct pcb *pcb __diagused;
 	l = &lwp0;
 	pcb = lwp_getpcb(l);
 	pmap_kernel()->pm_ldt_sel = GSEL(GLDT_SEL, SEL_KPL);
 	pcb->pcb_cr0 = rcr0() & ~CR0_TS;
-	pcb->pcb_esp0 = uvm_lwp_getuarea(l) + KSTACK_SIZE - 16;
+	pcb->pcb_esp0 = uvm_lwp_getuarea(l) + USPACE - 16;
 	pcb->pcb_iopl = SEL_KPL;
 	l->l_md.md_regs = (struct trapframe *)pcb->pcb_esp0 - 1;
 	memcpy(&pcb->pcb_fsd, &gdt[GUDATA_SEL], sizeof(pcb->pcb_fsd));
 	memcpy(&pcb->pcb_gsd, &gdt[GUDATA_SEL], sizeof(pcb->pcb_gsd));
 #ifndef XEN
 	lldt(pmap_kernel()->pm_ldt_sel);
 #else
 	HYPERVISOR_fpu_taskswitch(1);
 	XENPRINTF(("lwp tss sp %p ss %04x/%04x\n",
 	    (void *)pcb->pcb_esp0,
 	    GSEL(GDATA_SEL, SEL_KPL),
 	    IDXSEL(GSEL(GDATA_SEL, SEL_KPL))));

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pcb.h,v 1.52 2014/02/12 23:24:09 dsl Exp $	*/
+/*	$NetBSD: pcb.h,v 1.53 2014/02/20 18:19:10 dsl Exp $	*/
 /*-
  * Copyright (c) 1998, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -64,44 +64,45 @@
  */
 /*
  * Intel 386 process control block
  */
 #ifndef _I386_PCB_H_
 #define _I386_PCB_H_
 #if defined(_KERNEL_OPT)
 #include "opt_multiprocessor.h"
 #endif
 #include <sys/signal.h>
 #include <machine/segments.h>
-#include <machine/tss.h>
+#include <x86/cpu_extended_state.h>
 #include <x86/fpu.h>
 #include <i386/sysarch.h>
 struct pcb {
 	int	pcb_esp0;		/* ring0 esp */
 	int	pcb_esp;		/* kernel esp */
 	int	pcb_ebp;		/* kernel ebp */
 	int	pcb_unused;		/* unused */
 	int	pcb_cr0;		/* saved image of CR0 */
 	int	pcb_cr2;		/* page fault address (CR2) */
 	int	pcb_cr3;		/* page directory pointer */
 	int	pcb_iopl;		/* i/o privilege level */
 	/* floating point state for FPU */
 	union	savefpu pcb_savefpu __aligned(16);
 	struct segment_descriptor pcb_fsd;	/* %fs descriptor */
 	struct segment_descriptor pcb_gsd; 	/* %gs descriptor */
-	void *	pcb_onfault;		/* copyin/out fault recovery */
+	void 	*pcb_onfault;		/* copyin/out fault recovery */
 	int	vm86_eflags;		/* virtual eflags for vm86 mode */
 	int	vm86_flagmask;		/* flag mask for vm86 mode */
 	void	*vm86_userp;		/* XXX performance hack */
 	struct cpu_info *pcb_fpcpu;	/* cpu holding our fp state. */
 	char	*pcb_iomap;		/* I/O permission bitmap */
 	int	not_used[15];
 	/* floating point state */
 	struct cpu_info	*pcb_fpcpu;	/* cpu holding our fp state. */
 	union savefpu	pcb_savefpu __aligned(64);
 	/* **** DO NOT ADD ANYTHING HERE **** */
 };
 /* This doesn't really matter, but there is a lot of implied padding */
 __CTASSERT(sizeof(struct pcb) - sizeof (union savefpu) == 128);
 #endif /* _I386_PCB_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: proc.h,v 1.41 2014/02/15 10:11:15 dsl Exp $	*/
+/*	$NetBSD: proc.h,v 1.42 2014/02/20 18:19:10 dsl Exp $	*/
 /*
  * Copyright (c) 1991 Regents of the University of California.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -53,20 +53,14 @@ struct mdlwp {
 /* md_flags */
 #define	MDL_IOPL	0x0002	/* XEN: i/o privilege */
 struct mdproc {
 	int	md_flags;
 	void	(*md_syscall)(struct trapframe *);
 					/* Syscall handling function */
 };
 /* md_flags */
 #define MDP_USEDMTRR	0x0002	/* has set volatile MTRRs */
 /* Kernel stack parameters. */
 #define	UAREA_PCB_OFFSET	(USPACE - ALIGN(sizeof(struct pcb)))
 #define	KSTACK_LOWEST_ADDR(l)	\
     ((void *)((vaddr_t)(l)->l_addr - UAREA_PCB_OFFSET))
 #define	KSTACK_SIZE		UAREA_PCB_OFFSET
 #endif /* _I386_PROC_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vm_machdep.c,v 1.22 2014/02/15 10:11:15 dsl Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.23 2014/02/20 18:19:10 dsl Exp $	*/
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department, and William Jolitz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -70,49 +70,52 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  */
 /*
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.22 2014/02/15 10:11:15 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.23 2014/02/20 18:19:10 dsl Exp $");
 #include "opt_mtrr.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/buf.h>
 #include <sys/core.h>
 #include <sys/exec.h>
 #include <sys/ptrace.h>
 #include <uvm/uvm.h>
 #include <machine/cpu.h>
 #include <machine/gdt.h>
 #include <machine/reg.h>
 #include <machine/specialreg.h>
 #ifdef MTRR
 #include <machine/mtrr.h>
 #endif
 #include <x86/fpu.h>
 void
 cpu_proc_fork(struct proc *p1, struct proc *p2)
+{
 	p2->p_md.md_flags = p1->p_md.md_flags;
+}
 /*
  * cpu_lwp_fork: finish a new LWP (l2) operation.
+ *
  * First LWP (l1) is the process being forked.  If it is &lwp0, then we
  * are creating a kthread, where return path and argument are specified
  * with `func' and `arg'.
 @@ -159,30 +162,30 @@ cpu_lwp_fork(struct lwp *l1, struct lwp
 	/*
 	 * Set the kernel stack address (from the address to uarea) and
 	 * trapframe address for child.
+	 *
 	 * Rig kernel stack so that it would start out in lwp_trampoline()
 	 * and call child_return() with l2 as an argument.  This causes the
 	 * newly-created child process to go directly to user level with a
 	 * parent return value of 0 from fork(), while the parent process
 	 * returns normally.
 	 */
 	uv = uvm_lwp_getuarea(l2);
 #ifdef __x86_64__
-	pcb2->pcb_rsp0 = (uv + KSTACK_SIZE - 16) & ~0xf;
+	pcb2->pcb_rsp0 = (uv + USPACE - 16) & ~0xf;
 	tf = (struct trapframe *)pcb2->pcb_rsp0 - 1;
 #else
-	pcb2->pcb_esp0 = (uv + KSTACK_SIZE - 16);
+	pcb2->pcb_esp0 = (uv + USPACE - 16);
 	tf = (struct trapframe *)pcb2->pcb_esp0 - 1;
 	pcb2->pcb_iomap = NULL;
 #endif
 	l2->l_md.md_regs = tf;
 	/*
 	 * Copy the trapframe from parent, so that return to userspace
 	 * will be to right address, with correct registers.
 	 */
 	memcpy(tf, l1->l_md.md_regs, sizeof(struct trapframe));
 	/* Child LWP might get aston() before returning to userspace. */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: param.h,v 1.440 2014/02/07 15:29:23 hannken Exp $	*/
+/*	$NetBSD: param.h,v 1.441 2014/02/20 18:19:10 dsl Exp $	*/
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
  * All or some portions of this file are derived from material licensed
  * to the University of California by American Telephone and Telegraph
  * Co. or Unix System Laboratories, Inc. and are reproduced herein with
  * the permission of UNIX System Laboratories, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -53,27 +53,27 @@
  *	m = minor version; a minor number of 99 indicates current.
  *	r = 0 (*)
  *	p = patchlevel
+ *
  * When new releases are made, src/gnu/usr.bin/groff/tmac/mdoc.local
  * needs to be updated and the changes sent back to the groff maintainers.
+ *
  * (*)	Up to 2.0I "release" used to be "",A-Z,Z[A-Z] but numeric
  *	    	e.g. NetBSD-1.2D  = 102040000 ('D' == 4)
  *	NetBSD-2.0H 	(200080000) was changed on 20041001 to:
  *	2.99.9		(299000900)
  */
-#define	__NetBSD_Version__	699003100	/* NetBSD 6.99.31 */
+#define	__NetBSD_Version__	699003200	/* NetBSD 6.99.32 */
 #define __NetBSD_Prereq__(M,m,p) (((((M) * 100000000) + \
     (m) * 1000000) + (p) * 100) <= __NetBSD_Version__)
 /*
  * Historical NetBSD #define
+ *
  * NetBSD 1.4 was the last release for which this value was incremented.
  * The value is now permanently fixed at 199905. It will never be
  * changed again.
+ *
  * New code must use __NetBSD_Version__ instead, and should not even
  * count on NetBSD being defined.