CVS commit: src/share/man/man9

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu May 17 07:28:29 UTC 2012

Modified Files:
src/share/man/man9: usbdi.9

Log Message:
Remove trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/share/man/man9/usbdi.9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man9/usbdi.9
diff -u src/share/man/man9/usbdi.9:1.14 src/share/man/man9/usbdi.9:1.15
--- src/share/man/man9/usbdi.9:1.14	Thu May 17 02:58:14 2012
+++ src/share/man/man9/usbdi.9	Thu May 17 07:28:29 2012
@@ -1,4 +1,4 @@
-.\	$NetBSD: usbdi.9,v 1.14 2012/05/17 02:58:14 mrg Exp $
+.\	$NetBSD: usbdi.9,v 1.15 2012/05/17 07:28:29 wiz Exp $
 .\
 .\ Copyright (c) 2012 Matthew R. Green
 .\ All rights reserved.
@@ -317,13 +317,13 @@ functions are used to transfer data in e
 bulk fashion, and are front-ends to the
 .Fn usbd_setup_xfer ,
 .Fn usbd_transfer
-and 
+and
 .Fn usbd_get_xfer_status ,
 as well as associated error handling.
 .\ XXX describe args to usbd_get_xfer_status
 Transfers are associated with a pipe at their creation time.
 Transfers are aborted via this pipe with
-.Fn usbd_abort_pipe 
+.Fn usbd_abort_pipe
 and
 .Fn usbd_abort_default_pipe .
 The
@@ -405,14 +405,14 @@ macro can be used to match any USB produ
 .\  uint8_t flags usbd_pipe_handle *pipe \
 .\  usbd_private_handle priv void *buffer \
 .\  uint32_t length usbd_callback
-.\ 
+.\
 .\ .Fn usbd_interface2endpoint_descriptor usbd_interface_handle iface \
 .\  uint8_t address
 .\ .Fn usbd_endpoint_count usbd_interface_handle dev uint8_t *count
 .\ .Fn usbd_interface_count usbd_device_handle dev uint8_t *count
 .\ .Fn usbd_interface2device_handle usbd_interface_handle iface usbd_device_handle *dev
 .\ .Fn usbd_device2interface_handle usbd_device_handle dev uint8_t ifaceno usbd_interface_handle *iface
-.\ 
+.\
 .\ .Fn usbd_alloc_buffer usbd_xfer_handle req uint32_t size
 .\ .Fn usbd_free_buffer usbd_xfer_handle req
 .\ .Fn usbd_get_buffer usbd_xfer_handle xfer
@@ -435,13 +435,13 @@ macro can be used to match any USB produ
 .\  int endptidx
 .\ .Fn usbd_dopoll usbd_interface_handle iface
 .\ .Fn usbd_set_polling usbd_device_handle iface int val
-.\ 
+.\
 .\ .Fn usbd_add_dev_event int type usbd_device_handle iface
 .\ .Fn usbd_add_drv_event int type usbd_device_handle iface device_t dv
-.\ 
+.\
 .\ .Fn usbd_devinfo_alloc usbd_device_handle iface int showclass
 .\ .Fn usbd_devinfo_free char *str
-.\ 
+.\
 .\ .Fn usbd_get_quirks usbd_device_handle iface
 .\ .Fn usbd_get_endpoint_descriptor usbd_interface_handle dev \
 .\  u_int8_t address

CVS commit: src/sys/common/pmap/tlb

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Thu May 17 16:20:19 UTC 2012

Modified Files:
src/sys/common/pmap/tlb: pmap.c pmap.h

Log Message:
Add support for PMAP_GROWKERNEL


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/common/pmap/tlb/pmap.c
cvs rdiff -u -r1.11 -r1.12 src/sys/common/pmap/tlb/pmap.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/common/pmap/tlb/pmap.c
diff -u src/sys/common/pmap/tlb/pmap.c:1.12 src/sys/common/pmap/tlb/pmap.c:1.13
--- src/sys/common/pmap/tlb/pmap.c:1.12	Wed Jan 18 07:17:09 2012
+++ src/sys/common/pmap/tlb/pmap.c	Thu May 17 16:20:19 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.12 2012/01/18 07:17:09 skrll Exp $	*/
+/*	$NetBSD: pmap.c,v 1.13 2012/05/17 16:20:19 matt Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.12 2012/01/18 07:17:09 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.13 2012/05/17 16:20:19 matt Exp $);
 
 /*
  *	Manages physical address maps.
@@ -220,15 +220,6 @@ struct pmap * const kernel_pmap_ptr = k
 
 struct pmap_limits pmap_limits;
 
-#ifdef PMAP_POOLPAGE_DEBUG
-struct poolpage_info {
-	vaddr_t base;
-	vaddr_t size;
-	vaddr_t hint;
-	pt_entry_t *sysmap;
-} poolpage;
-#endif
-
 #ifdef UVMHIST
 static struct kern_history_ent pmapexechistbuf[1];
 static struct kern_history_ent pmaphistbuf[1];
@@ -348,8 +339,34 @@ void
 pmap_virtual_space(vaddr_t *vstartp, vaddr_t *vendp)
 {
 
-	*vstartp = VM_MIN_KERNEL_ADDRESS;	/* kernel is in K0SEG */
-	*vendp = trunc_page(pmap_limits.virtual_end);	/* XXX need pmap_growkernel() */
+	*vstartp = VM_MIN_KERNEL_ADDRESS;
+	*vendp = VM_MAX_KERNEL_ADDRESS;
+}
+
+vaddr_t
+pmap_growkernel(vaddr_t maxkvaddr)
+{
+	vaddr_t virtual_end = pmap_limits.virtual_end; 
+	maxkvaddr = pmap_round_seg(maxkvaddr) - 1;
+
+	/*
+	 * Reserve PTEs for the new KVA space.
+	 */
+	for (; virtual_end  maxkvaddr; virtual_end += NBSEG) {
+		pmap_pte_reserve(pmap_kernel(), virtual_end, 0);
+	}
+
+	/*
+	 * Don't exceed VM_MAX_KERNEL_ADDRESS!
+	 */
+	if (virtual_end == 0 || virtual_end  VM_MAX_KERNEL_ADDRESS)
+		virtual_end = VM_MAX_KERNEL_ADDRESS;
+
+	/*
+	 * Update new end.
+	 */
+	pmap_limits.virtual_end = virtual_end;
+	return virtual_end;
 }
 
 /*
@@ -414,7 +431,7 @@ pmap_steal_memory(vsize_t size, vaddr_t 
 sizeof(*seg) * (vm_nphysseg - bank));
 		}
 
-		va = pmap_md_direct_map_paddr(pa);
+		va = pmap_md_map_poolpage(pa, size);
 		memset((void *)va, 0, size);
 		return va;
 	}
@@ -1828,7 +1845,7 @@ pmap_map_poolpage(paddr_t pa)
 	struct vm_page_md * const mdpg = VM_PAGE_TO_MD(pg);
 	pmap_page_set_attributes(mdpg, VM_PAGEMD_POOLPAGE);
 
-	const vaddr_t va = pmap_md_direct_map_paddr(pa);
+	const vaddr_t va = pmap_md_map_poolpage(pa, NBPG);
 	pmap_md_vca_add(pg, va, NULL);
 	return va;
 }
@@ -1844,6 +1861,7 @@ pmap_unmap_poolpage(vaddr_t va)
 	KASSERT(pg);
 	struct vm_page_md * const mdpg = VM_PAGE_TO_MD(pg);
 	pmap_page_clear_attributes(mdpg, VM_PAGEMD_POOLPAGE);
+	pmap_md_unmap_poolpage(va, NBPG);
 	pmap_md_vca_remove(pg, va);
 
 	return pa;

Index: src/sys/common/pmap/tlb/pmap.h
diff -u src/sys/common/pmap/tlb/pmap.h:1.11 src/sys/common/pmap/tlb/pmap.h:1.12
--- src/sys/common/pmap/tlb/pmap.h:1.11	Thu Oct 13 19:50:39 2011
+++ src/sys/common/pmap/tlb/pmap.h	Thu May 17 16:20:19 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.11 2011/10/13 19:50:39 matt Exp $	*/
+/*	$NetBSD: pmap.h,v 1.12 2012/05/17 16:20:19 matt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -253,6 +253,7 @@ void	pmap_tlb_asid_check(void);
 uint16_t pmap_pvlist_lock(struct vm_page_md *, bool);
 
 #define	PMAP_STEAL_MEMORY	/* enable pmap_steal_memory() */
+#define	PMAP_GROWKERNEL		/* enable pmap_growkernel() */
 
 /*
  * Alternate mapping hooks for pool pages.  Avoids thrashing the TLB.

CVS commit: src/sys/arch/powerpc/include

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Thu May 17 16:21:46 UTC 2012

Modified Files:
src/sys/arch/powerpc/include: userret.h

Log Message:
Add an KASSERT to check that PSL_PR is always set.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/powerpc/include/userret.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/powerpc/include/userret.h
diff -u src/sys/arch/powerpc/include/userret.h:1.22 src/sys/arch/powerpc/include/userret.h:1.23
--- src/sys/arch/powerpc/include/userret.h:1.22	Tue Sep 27 01:02:36 2011
+++ src/sys/arch/powerpc/include/userret.h	Thu May 17 16:21:45 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: userret.h,v 1.22 2011/09/27 01:02:36 jym Exp $	*/
+/*	$NetBSD: userret.h,v 1.23 2012/05/17 16:21:45 matt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -57,6 +57,10 @@ userret(struct lwp *l, struct trapframe 
 	/* Invoke MI userret code */
 	mi_userret(l);
 
+	KASSERTMSG((tf-tf_srr1  PSL_PR) != 0,
+	tf=%p: srr1 (%#lx): PSL_PR isn't set!,
+	tf, tf-tf_srr1);
+
 	tf-tf_srr1 = PSL_USERSRR1;	/* clear SRR1 status bits */
 
 #ifdef ALTIVEC

CVS commit: src/sys/arch/powerpc/booke

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Thu May 17 16:22:38 UTC 2012

Modified Files:
src/sys/arch/powerpc/booke: trap.c

Log Message:
Allow user addresses = 0x8000


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/powerpc/booke/trap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/powerpc/booke/trap.c
diff -u src/sys/arch/powerpc/booke/trap.c:1.14 src/sys/arch/powerpc/booke/trap.c:1.15
--- src/sys/arch/powerpc/booke/trap.c:1.14	Sun Feb 19 21:06:22 2012
+++ src/sys/arch/powerpc/booke/trap.c	Thu May 17 16:22:38 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.14 2012/02/19 21:06:22 rmind Exp $	*/
+/*	$NetBSD: trap.c,v 1.15 2012/05/17 16:22:38 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -38,7 +38,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: trap.c,v 1.14 2012/02/19 21:06:22 rmind Exp $);
+__KERNEL_RCSID(1, $NetBSD: trap.c,v 1.15 2012/05/17 16:22:38 matt Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -699,7 +699,8 @@ trap(enum ppc_booke_exceptions trap_code
 	}
 #endif
 
-	if (usertrap  (tf-tf_fixreg[1]  0x8000)) {
+	if ((VM_MAX_ADDRESS  0x8000) == 0
+	 usertrap  (tf-tf_fixreg[1]  0x8000)) {
 		printf(%s(entry): pid %d.%d (%s): %s invalid sp %#lx (sprg1=%#lx)\n,
 		__func__, p-p_pid, l-l_lid, p-p_comm,
 		trap_names[trap_code], tf-tf_fixreg[1], mfspr(SPR_SPRG1));
@@ -778,7 +779,8 @@ trap(enum ppc_booke_exceptions trap_code
 	case T_AST:
 		KASSERT(usertrap);
 		cpu_ast(l, ci);
-		if (tf-tf_fixreg[1]  0x8000) {
+		if ((VM_MAX_ADDRESS  0x8000) == 0
+		(tf-tf_fixreg[1]  0x8000)) {
 			printf(%s(ast-exit): pid %d.%d (%s): invalid sp %#lx\n,
 			__func__, p-p_pid, l-l_lid, p-p_comm,
 			tf-tf_fixreg[1]);

CVS commit: src/sys/arch/powerpc/booke/dev

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Thu May 17 16:24:09 UTC 2012

Modified Files:
src/sys/arch/powerpc/booke/dev: pq3gpio.c

Log Message:
The P2020 doesn't have GPIO in the same place as othe 85xx.  Deal with it.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/booke/dev/pq3gpio.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/powerpc/booke/dev/pq3gpio.c
diff -u src/sys/arch/powerpc/booke/dev/pq3gpio.c:1.5 src/sys/arch/powerpc/booke/dev/pq3gpio.c:1.6
--- src/sys/arch/powerpc/booke/dev/pq3gpio.c:1.5	Thu Mar 29 14:47:09 2012
+++ src/sys/arch/powerpc/booke/dev/pq3gpio.c	Thu May 17 16:24:09 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: pq3gpio.c,v 1.5 2012/03/29 14:47:09 matt Exp $	*/
+/*	$NetBSD: pq3gpio.c,v 1.6 2012/05/17 16:24:09 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -41,7 +41,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(0, $NetBSD: pq3gpio.c,v 1.5 2012/03/29 14:47:09 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: pq3gpio.c,v 1.6 2012/05/17 16:24:09 matt Exp $);
 
 #include sys/param.h
 #include sys/cpu.h
@@ -64,10 +64,6 @@ __KERNEL_RCSID(0, $NetBSD: pq3gpio.c,v 
 #include powerpc/booke/e500reg.h
 
 struct pq3gpio_group {
-#if 0
-	SIMPLEQ_ENTRY(pq3gpio_group) gc_link;
-	struct pq3gpio_softc *gc_softc;
-#endif
 	struct gpio_chipset_tag gc_tag;
 	gpio_pin_t gc_pins[32];
 	bus_space_tag_t gc_bst;
@@ -106,27 +102,54 @@ pq3gpio_pin_write(void *v, int num, int 
 	}
 }
 
+#if defined(MPC8548) || defined(MPC8555) || defined(MPC8544)
+static void
+pq3gpio_null_pin_ctl(void *v, int num, int ctl)
+{
+}
+#endif
+
+#if defined(MPC8536) || defined(P2020)
+/*
+ * MPC8536 / P20x0 have controllable input/output pins
+ */
 static void
 pq3gpio_pin_ctl(void *v, int num, int ctl)
 {
 	struct pq3gpio_group * const gc = v;
 	const u_int mask = 1  (gc-gc_pins[num].pin_num ^ 31);
-uint32_t old, new; 
   
-old = bus_space_read_4(gc-gc_bst, gc-gc_bsh, GPDIR);
-new = old;
-switch (ctl  (GPIO_PIN_INPUT|GPIO_PIN_OUTPUT)) {
-case GPIO_PIN_OUTPUT:new |= mask; break;
-case GPIO_PIN_INPUT:   new = ~mask; break;
-default:return;
-}
-if (old != new)
-		bus_space_write_4(gc-gc_bst, gc-gc_bsh, GPDIR, new);
+	uint32_t old_dir = bus_space_read_4(gc-gc_bst, gc-gc_bsh, GPDIR);
+	uint32_t new_dir = old_dir;
+	switch (ctl  (GPIO_PIN_INPUT|GPIO_PIN_OUTPUT)) {
+	case GPIO_PIN_OUTPUT:	new_dir |= mask; break;
+	case GPIO_PIN_INPUT:	new_dir = ~mask; break;
+	default:		return;
+	}
+	if (old_dir != new_dir)
+		bus_space_write_4(gc-gc_bst, gc-gc_bsh, GPDIR, new_dir);
+
+	/*
+	 * Now handle opendrain
+	 */
+	uint32_t old_odr = bus_space_read_4(gc-gc_bst, gc-gc_bsh, GPODR);
+	uint32_t new_odr = old_odr;
+
+	if (ctl  GPIO_PIN_OPENDRAIN) {
+		new_odr |= mask;
+	} else {
+		new_odr = ~mask;
+	}
+
+	if (old_odr != new_odr)
+		bus_space_write_4(gc-gc_bst, gc-gc_bsh, GPODR, new_odr);
 }
+#endif
 
 static void
 pq3gpio_group_create(device_t self, bus_space_tag_t bst, bus_space_handle_t bsh,
-	bus_size_t reg, uint32_t pinmask, int pincaps)
+	bus_size_t reg, uint32_t pinmask, int pincaps,
+	void (*pin_ctl)(void *, int, int))
 {
 	struct pq3gpio_group * const gc = kmem_zalloc(sizeof(*gc), KM_SLEEP);
 
@@ -188,10 +211,10 @@ pq3gpio_mpc8536_attach(device_t self, bu
 		[15] = ilog2(PMUXCR_DMA1),
 	};
 	
-	uint32_t pinmask = ~0;	/* assume all bits are valid */
+	uint32_t pinmask = 0x;	/* assume all bits are valid */
 	uint32_t gpiomask = __BIT(31);
-	size_t pincnt = 32;
-	const uint32_t pmuxcr = bus_space_read_4(bst, bsh, PMUXCR);
+	size_t pincnt = 16;
+	const uint32_t pmuxcr = cpu_read_4(GLOBAL_BASE + PMUXCR);
 	for (size_t i = 0; i  __arraycount(gpio2pmuxcr_map);
 	 i++, gpiomask = 1) {
 		if (pmuxcr  __BIT(gpio2pmuxcr_map[i])) {
@@ -203,10 +226,11 @@ pq3gpio_mpc8536_attach(device_t self, bu
 	/*
 	 * Create GPIO pin groups
 	 */
-	aprint_normal_dev(self, %zu input pins, %zu output pins\n,
+	aprint_normal_dev(self, %zu input/output/opendrain pins\n,
 	pincnt, pincnt);
-	pq3gpio_group_create(self, bst, bsh, GPINDR, pinmask, GPIO_PIN_INPUT);
-	pq3gpio_group_create(self, bst, bsh, GPOUTDR, pinmask, GPIO_PIN_OUTPUT);
+	pq3gpio_group_create(self, bst, bsh, GPDAT, pinmask,
+	GPIO_PIN_INPUT | GPIO_PIN_OUTPUT | GPIO_PIN_OPENDRAIN,
+	pq3gpio_pin_ctl);
 }
 #endif /* MPC8536 */
 
@@ -227,8 +251,10 @@ pq3gpio_mpc8544_attach(device_t self, bu
 	/*
 	 * Create GPIO pin groups
 	 */
-	pq3gpio_group_create(self, bst, bsh, GPINDR, 0xff00, GPIO_PIN_INPUT);
-	pq3gpio_group_create(self, bst, bsh, GPOUTDR, 0xff00, GPIO_PIN_OUTPUT);
+	pq3gpio_group_create(self, bst, bsh, GPINDR, 0xff00,
+	GPIO_PIN_INPUT, pq3gpio_null_pin_ctl);
+	pq3gpio_group_create(self, bst, bsh, GPOUTDR, 0xff00,
+	GPIO_PIN_OUTPUT, pq3gpio_null_pin_ctl);
 }
 #endif /* 

CVS commit: [netbsd-6] src/sys/arch/powerpc/powerpc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu May 17 17:49:50 UTC 2012

Modified Files:
src/sys/arch/powerpc/powerpc [netbsd-6]: db_disasm.c

Log Message:
Pull up following revision(s) (requested by matt in ticket #244):
sys/arch/powerpc/powerpc/db_disasm.c: revision 1.27
Decode isel{lt,gt,eq}


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.18.1 src/sys/arch/powerpc/powerpc/db_disasm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/powerpc/powerpc/db_disasm.c
diff -u src/sys/arch/powerpc/powerpc/db_disasm.c:1.26 src/sys/arch/powerpc/powerpc/db_disasm.c:1.26.18.1
--- src/sys/arch/powerpc/powerpc/db_disasm.c:1.26	Thu Jan 28 19:01:32 2010
+++ src/sys/arch/powerpc/powerpc/db_disasm.c	Thu May 17 17:49:49 2012
@@ -1,8 +1,8 @@
-/*	$NetBSD: db_disasm.c,v 1.26 2010/01/28 19:01:32 phx Exp $	*/
+/*	$NetBSD: db_disasm.c,v 1.26.18.1 2012/05/17 17:49:49 riz Exp $	*/
 /*	$OpenBSD: db_disasm.c,v 1.2 1996/12/28 06:21:48 rahnds Exp $	*/
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_disasm.c,v 1.26 2010/01/28 19:01:32 phx Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_disasm.c,v 1.26.18.1 2012/05/17 17:49:49 riz Exp $);
 
 #include sys/param.h
 #include sys/proc.h
@@ -215,6 +215,9 @@ const struct opcode opcodes_1f[] = {
 	{ mulhdu,	0xfc0007fe, 0x7c12, Op_D | Op_A | Op_B | Op_Rc },
 	{ addc,	0xfc0003fe, 0x7c14, Op_D | Op_A | Op_B | Op_OE | Op_Rc },
 	{ mulhwu,	0xfc0007fe, 0x7c16, Op_D | Op_A | Op_B | Op_Rc },
+	{ isellt,	0xfc0007ff, 0x7c1e, Op_D | Op_A | Op_B },
+	{ iselgt,	0xfc0007ff, 0x7c5e, Op_D | Op_A | Op_B },
+	{ iseleq,	0xfc0007ff, 0x7c9e, Op_D | Op_A | Op_B },
 
 	{ mfcr,	0xfc0007fe, 0x7c26, Op_D },
 	{ lwarx,	0xfc0007fe, 0x7c28, Op_D | Op_A | Op_B },

CVS commit: [netbsd-6] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu May 17 17:53:02 UTC 2012

Modified Files:
src/doc [netbsd-6]: CHANGES-6.0

Log Message:
Ticket 244.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.88 -r1.1.2.89 src/doc/CHANGES-6.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-6.0
diff -u src/doc/CHANGES-6.0:1.1.2.88 src/doc/CHANGES-6.0:1.1.2.89
--- src/doc/CHANGES-6.0:1.1.2.88	Wed May  9 22:50:52 2012
+++ src/doc/CHANGES-6.0	Thu May 17 17:53:01 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0,v 1.1.2.88 2012/05/09 22:50:52 riz Exp $
+# $NetBSD: CHANGES-6.0,v 1.1.2.89 2012/05/17 17:53:01 riz Exp $
 
 A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012
 until the 6.0 release:
@@ -2279,3 +2279,8 @@ sys/arch/powerpc/booke/dev/pq3gpio.c		1.
 	Fix P2020 GPIO support.
 	[matt, ticket #243]
 
+sys/arch/powerpc/powerpc/db_disasm.c		1.27
+
+	Decode isel{lt,gt,eq} when disassembling PPC code.
+	[matt, ticket #244]
+

CVS commit: [netbsd-6] src

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu May 17 18:02:31 UTC 2012

Modified Files:
src/external/gpl3/binutils/lib/libbfd [netbsd-6]: Makefile
src/external/gpl3/gdb [netbsd-6]: Makefile.inc
src/share/mk [netbsd-6]: bsd.own.mk sys.mk

Log Message:
Apply patches (requested by martin in ticket #153):

share/mk/bsd.own.mk patch
share/mk/sys.mk patch
external/gpl3/gdb/Makefile.inc  patch
external/gpl3/binutils/lib/libbfd/Makefile  patch

Switch the vax port back to GCC 4.1.
[martin, ticket #153]


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.4.1 src/external/gpl3/binutils/lib/libbfd/Makefile
cvs rdiff -u -r1.4 -r1.4.2.1 src/external/gpl3/gdb/Makefile.inc
cvs rdiff -u -r1.696.2.1 -r1.696.2.2 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.108 -r1.108.2.1 src/share/mk/sys.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/binutils/lib/libbfd/Makefile
diff -u src/external/gpl3/binutils/lib/libbfd/Makefile:1.6 src/external/gpl3/binutils/lib/libbfd/Makefile:1.6.4.1
--- src/external/gpl3/binutils/lib/libbfd/Makefile:1.6	Sun Sep 25 04:32:46 2011
+++ src/external/gpl3/binutils/lib/libbfd/Makefile	Thu May 17 18:02:30 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2011/09/25 04:32:46 christos Exp $
+#	$NetBSD: Makefile,v 1.6.4.1 2012/05/17 18:02:30 riz Exp $
 
 NOLINKLIB=	# defined
 NOLINT=		# defined
@@ -35,6 +35,10 @@ CPPFLAGS+=	-I${.CURDIR}/arch/${BFD_MACHI
 		-I${DIST}/bfd ${GCPPFLAGS:M-D*} ${GCPPFLAGS:M-I*:N-I.*} \
 		-DDEBUGDIR=\${DEBUGDIR}\
 
+.if (${MACHINE_ARCH} == vax)
+CPPFLAGS.elf.c +=	-O0
+.endif
+
 GSRCS=		${G_libbfd_la_OBJECTS:libbfd.lo=lib_bfd.lo} \
 		${G_libbfd_la_DEPENDENCIES:M*.lo}
 SRCS=		${GSRCS:.lo=.c}

Index: src/external/gpl3/gdb/Makefile.inc
diff -u src/external/gpl3/gdb/Makefile.inc:1.4 src/external/gpl3/gdb/Makefile.inc:1.4.2.1
--- src/external/gpl3/gdb/Makefile.inc:1.4	Sun Feb  5 17:47:30 2012
+++ src/external/gpl3/gdb/Makefile.inc	Thu May 17 18:02:31 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2012/02/05 17:47:30 matt Exp $
+# $NetBSD: Makefile.inc,v 1.4.2.1 2012/05/17 18:02:31 riz Exp $
 
 USE_LIBEDIT=no
 USE_TUI=yes
@@ -10,8 +10,4 @@ CWARNFLAGS.clang+=	-Wno-unused-value -Wn
 			-Wno-format-security \
 			-Wno-tautological-compare -Wno-format-extra-args
 
-.if ${MACHINE} == vax
-CWARNFLAGS.gcc+=	-Wno-overflow
-.endif
-
 DIST=		${NETBSDSRCDIR}/external/gpl3/gdb/dist

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.696.2.1 src/share/mk/bsd.own.mk:1.696.2.2
--- src/share/mk/bsd.own.mk:1.696.2.1	Sat Feb 18 18:05:05 2012
+++ src/share/mk/bsd.own.mk	Thu May 17 18:02:30 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.696.2.1 2012/02/18 18:05:05 riz Exp $
+#	$NetBSD: bsd.own.mk,v 1.696.2.2 2012/05/17 18:02:30 riz Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -47,8 +47,14 @@ NEED_OWN_INSTALL_TARGET?=	yes
 TOOLCHAIN_MISSING?=	no
 
 #
-# Everyone uses GCC4.5
+# Platforms still using GCC 4.1
+#
+.if ${MACHINE_CPU}  == vax
+HAVE_GCC?=4
+.else
+# Otherwise, default to GCC4.5
 HAVE_GCC?=45
+.endif
 
 .if \
 ${MACHINE_ARCH} == i386 || \

Index: src/share/mk/sys.mk
diff -u src/share/mk/sys.mk:1.108 src/share/mk/sys.mk:1.108.2.1
--- src/share/mk/sys.mk:1.108	Fri Feb 10 05:57:42 2012
+++ src/share/mk/sys.mk	Thu May 17 18:02:30 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: sys.mk,v 1.108 2012/02/10 05:57:42 matt Exp $
+#	$NetBSD: sys.mk,v 1.108.2.1 2012/05/17 18:02:30 riz Exp $
 #	@(#)sys.mk	8.2 (Berkeley) 3/21/94
 
 unix?=		We run NetBSD.
@@ -26,8 +26,8 @@ DBG?=	-Os -freorder-blocks
 .elif ${MACHINE_ARCH} == m68k || ${MACHINE_ARCH} == m68000
 # see src/doc/HACKS for details
 DBG?=	-Os
-#.elif ${MACHINE_ARCH} == vax
-#DBG?=	-O1 -fgcse -fstrength-reduce -fgcse-after-reload
+.elif ${MACHINE_ARCH} == vax
+DBG?=	-O1 -fgcse -fstrength-reduce -fgcse-after-reload
 .else
 DBG?=	-O2
 .endif

CVS commit: [netbsd-6] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu May 17 18:02:49 UTC 2012

Modified Files:
src/doc [netbsd-6]: CHANGES-6.0

Log Message:
Ticket 153.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.89 -r1.1.2.90 src/doc/CHANGES-6.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-6.0
diff -u src/doc/CHANGES-6.0:1.1.2.89 src/doc/CHANGES-6.0:1.1.2.90
--- src/doc/CHANGES-6.0:1.1.2.89	Thu May 17 17:53:01 2012
+++ src/doc/CHANGES-6.0	Thu May 17 18:02:49 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0,v 1.1.2.89 2012/05/17 17:53:01 riz Exp $
+# $NetBSD: CHANGES-6.0,v 1.1.2.90 2012/05/17 18:02:49 riz Exp $
 
 A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012
 until the 6.0 release:
@@ -2284,3 +2284,11 @@ sys/arch/powerpc/powerpc/db_disasm.c		1.
 	Decode isel{lt,gt,eq} when disassembling PPC code.
 	[matt, ticket #244]
 
+share/mk/bsd.own.mkpatch
+share/mk/sys.mk	patch
+external/gpl3/gdb/Makefile.inc			patch
+external/gpl3/binutils/lib/libbfd/Makefile	patch
+
+	Switch the vax port back to GCC 4.1.
+	[martin, ticket #153]
+

CVS commit: [netbsd-6] src/sys/arch/powerpc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu May 17 18:09:45 UTC 2012

Modified Files:
src/sys/arch/powerpc/booke/dev [netbsd-6]: pq3etsec.c
src/sys/arch/powerpc/include/booke [netbsd-6]: etsecreg.h

Log Message:
Pull up following revision(s) (requested by matt in ticket #245):
sys/arch/powerpc/booke/dev/pq3etsec.c: revision 1.13
sys/arch/powerpc/include/booke/etsecreg.h: revision 1.4
sys/arch/powerpc/booke/dev/pq3etsec.c: revision 1.11
sys/arch/powerpc/booke/dev/pq3etsec.c: revision 1.12
Read maccfg1/maccfg2/ecntrl so we can preserve bits we don't change (like
GMII mode).
Don't use the current value of maccfg2.
Preserve some MACCFG2 bits


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.8.1 src/sys/arch/powerpc/booke/dev/pq3etsec.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/powerpc/include/booke/etsecreg.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/powerpc/booke/dev/pq3etsec.c
diff -u src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.9 src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.9.8.1
--- src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.9	Thu Oct 13 19:53:30 2011
+++ src/sys/arch/powerpc/booke/dev/pq3etsec.c	Thu May 17 18:09:44 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: pq3etsec.c,v 1.9 2011/10/13 19:53:30 matt Exp $	*/
+/*	$NetBSD: pq3etsec.c,v 1.9.8.1 2012/05/17 18:09:44 riz Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -38,7 +38,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(0, $NetBSD: pq3etsec.c,v 1.9 2011/10/13 19:53:30 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: pq3etsec.c,v 1.9.8.1 2012/05/17 18:09:44 riz Exp $);
 
 #include sys/param.h
 #include sys/cpu.h
@@ -501,7 +501,9 @@ pq3etsec_attach(device_t parent, device_
 	sc-sc_macstnaddr2 = etsec_read(sc, MACSTNADDR2);
 	sc-sc_macstnaddr1 = etsec_read(sc, MACSTNADDR1);
 	sc-sc_rctrl = RCTRL_DEFAULT;
-	sc-sc_maccfg2 = MACCFG2_DEFAULT;
+	sc-sc_ecntrl = etsec_read(sc, ECNTRL);
+	sc-sc_maccfg1 = etsec_read(sc, MACCFG1);
+	sc-sc_maccfg2 = etsec_read(sc, MACCFG2) | MACCFG2_DEFAULT;
 
 	if (sc-sc_macstnaddr1 == 0  sc-sc_macstnaddr2 == 0) {
 		size_t len;

Index: src/sys/arch/powerpc/include/booke/etsecreg.h
diff -u src/sys/arch/powerpc/include/booke/etsecreg.h:1.3 src/sys/arch/powerpc/include/booke/etsecreg.h:1.3.8.1
--- src/sys/arch/powerpc/include/booke/etsecreg.h:1.3	Thu Jun  9 19:11:06 2011
+++ src/sys/arch/powerpc/include/booke/etsecreg.h	Thu May 17 18:09:44 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: etsecreg.h,v 1.3 2011/06/09 19:11:06 matt Exp $	*/
+/*	$NetBSD: etsecreg.h,v 1.3.8.1 2012/05/17 18:09:44 riz Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -371,7 +371,7 @@ struct rxfcb {
 #define	MACCFG2_PADCRC	__PPCBIT(29)
 #define	MACCFG2_CRCEN	__PPCBIT(30)
 #define	MACCFG2_FD	__PPCBIT(31)
-#define	MACCFG2_DEFAULT	(MACCFG2_FD|MACCFG2_PADCRC|MACCFG2_IFMODE_GMII|MACCFG2_PRELEN_DEFAULT)
+#define	MACCFG2_DEFAULT	(MACCFG2_FD|MACCFG2_PADCRC|MACCFG2_PRELEN_DEFAULT)
 #define IPGIFG		0x508 /* Inter-packet/inter-frame gap register */
 #define HAFDUP		0x50C /* Half-duplex control */
 #define MAXFRM		0x510 /* Maximum frame length */

CVS commit: [netbsd-6] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu May 17 18:10:20 UTC 2012

Modified Files:
src/doc [netbsd-6]: CHANGES-6.0

Log Message:
Ticket 245.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.90 -r1.1.2.91 src/doc/CHANGES-6.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-6.0
diff -u src/doc/CHANGES-6.0:1.1.2.90 src/doc/CHANGES-6.0:1.1.2.91
--- src/doc/CHANGES-6.0:1.1.2.90	Thu May 17 18:02:49 2012
+++ src/doc/CHANGES-6.0	Thu May 17 18:10:20 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0,v 1.1.2.90 2012/05/17 18:02:49 riz Exp $
+# $NetBSD: CHANGES-6.0,v 1.1.2.91 2012/05/17 18:10:20 riz Exp $
 
 A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012
 until the 6.0 release:
@@ -2292,3 +2292,9 @@ external/gpl3/binutils/lib/libbfd/Makefi
 	Switch the vax port back to GCC 4.1.
 	[martin, ticket #153]
 
+sys/arch/powerpc/booke/dev/pq3etsec.c		1.11-1.13
+sys/arch/powerpc/include/booke/etsecreg.h	1.4
+
+	Apply some PowerPC tsec fixes.
+	[matt, ticket #245]
+

CVS commit: [netbsd-6] src/sys/kern

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu May 17 18:12:13 UTC 2012

Modified Files:
src/sys/kern [netbsd-6]: vfs_syscalls.c

Log Message:
Pull up following revision(s) (requested by rmind in ticket #246):
sys/kern/vfs_syscalls.c: revision 1.455
do_open: move pathbuf destruction to the callers, thus simplify and fix a
memory leak on error path.


To generate a diff of this commit:
cvs rdiff -u -r1.449 -r1.449.2.1 src/sys/kern/vfs_syscalls.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/kern/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.449 src/sys/kern/vfs_syscalls.c:1.449.2.1
--- src/sys/kern/vfs_syscalls.c:1.449	Sun Feb 12 13:12:45 2012
+++ src/sys/kern/vfs_syscalls.c	Thu May 17 18:12:12 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_syscalls.c,v 1.449 2012/02/12 13:12:45 martin Exp $	*/
+/*	$NetBSD: vfs_syscalls.c,v 1.449.2.1 2012/05/17 18:12:12 riz Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_syscalls.c,v 1.449 2012/02/12 13:12:45 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_syscalls.c,v 1.449.2.1 2012/05/17 18:12:12 riz Exp $);
 
 #ifdef _KERNEL_OPT
 #include opt_fileassoc.h
@@ -1485,9 +1485,9 @@ do_open(lwp_t *l, struct pathbuf *pb, in
 		return EINVAL;
 
 	if ((error = fd_allocfile(fp, indx)) != 0) {
-		pathbuf_destroy(pb);
 		return error;
 	}
+
 	/* We're going to read cwdi-cwdi_cmask unlocked here. */
 	cmode = ((open_mode ~ cwdi-cwdi_cmask)  ALLPERMS) ~ S_ISTXT;
 	NDINIT(nd, LOOKUP, FOLLOW | TRYEMULROOT, pb);
@@ -1499,18 +1499,15 @@ do_open(lwp_t *l, struct pathbuf *pb, in
 		(error =
 			fd_dupopen(l-l_dupfd, indx, flags, error)) == 0) {
 			*fd = indx;
-			pathbuf_destroy(pb);
-			return (0);
+			return 0;
 		}
 		if (error == ERESTART)
 			error = EINTR;
-		pathbuf_destroy(pb);
 		return error;
 	}
 
 	l-l_dupfd = 0;
 	vp = nd.ni_vp;
-	pathbuf_destroy(pb);
 
 	if ((error = open_setfp(l, fp, vp, indx, flags)))
 		return error;
@@ -1525,7 +1522,7 @@ int
 fd_open(const char *path, int open_flags, int open_mode, int *fd)
 {
 	struct pathbuf *pb;
-	int oflags;
+	int error, oflags;
 
 	oflags = FFLAGS(open_flags);
 	if ((oflags  (FREAD | FWRITE)) == 0)
@@ -1535,7 +1532,10 @@ fd_open(const char *path, int open_flags
 	if (pb == NULL)
 		return ENOMEM;
 
-	return do_open(curlwp, pb, open_flags, open_mode, fd);
+	error = do_open(curlwp, pb, open_flags, open_mode, fd);
+	pathbuf_destroy(pb);
+
+	return error;
 }
 
 /*
@@ -1555,18 +1555,17 @@ sys_open(struct lwp *l, const struct sys
 
 	flags = FFLAGS(SCARG(uap, flags));
 	if ((flags  (FREAD | FWRITE)) == 0)
-		return (EINVAL);
+		return EINVAL;
 
 	error = pathbuf_copyin(SCARG(uap, path), pb);
 	if (error)
 		return error;
 
 	error = do_open(l, pb, SCARG(uap, flags), SCARG(uap, mode), result);
-	if (error)
-		return error;
+	pathbuf_destroy(pb);
 
 	*retval = result;
-	return 0;
+	return error;
 }
 
 int

CVS commit: [netbsd-6] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu May 17 18:12:50 UTC 2012

Modified Files:
src/doc [netbsd-6]: CHANGES-6.0

Log Message:
Ticket 246.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.91 -r1.1.2.92 src/doc/CHANGES-6.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-6.0
diff -u src/doc/CHANGES-6.0:1.1.2.91 src/doc/CHANGES-6.0:1.1.2.92
--- src/doc/CHANGES-6.0:1.1.2.91	Thu May 17 18:10:20 2012
+++ src/doc/CHANGES-6.0	Thu May 17 18:12:50 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0,v 1.1.2.91 2012/05/17 18:10:20 riz Exp $
+# $NetBSD: CHANGES-6.0,v 1.1.2.92 2012/05/17 18:12:50 riz Exp $
 
 A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012
 until the 6.0 release:
@@ -2298,3 +2298,8 @@ sys/arch/powerpc/include/booke/etsecreg.
 	Apply some PowerPC tsec fixes.
 	[matt, ticket #245]
 
+sys/kern/vfs_syscalls.c1.455
+
+	Fix memory leak in do_open() error path.
+	[rmind, ticket #246]
+

CVS commit: [netbsd-6] src/sys/arch/x86/x86

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu May 17 18:17:33 UTC 2012

Modified Files:
src/sys/arch/x86/x86 [netbsd-6]: cpu_ucode_amd.c

Log Message:
Pull up following revision(s) (requested by cegger in ticket #248):
sys/arch/x86/x86/cpu_ucode_amd.c: revision 1.2
fix crash when booting with -x.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.2.1 src/sys/arch/x86/x86/cpu_ucode_amd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x86/x86/cpu_ucode_amd.c
diff -u src/sys/arch/x86/x86/cpu_ucode_amd.c:1.1 src/sys/arch/x86/x86/cpu_ucode_amd.c:1.1.2.1
--- src/sys/arch/x86/x86/cpu_ucode_amd.c:1.1	Fri Jan 13 16:05:15 2012
+++ src/sys/arch/x86/x86/cpu_ucode_amd.c	Thu May 17 18:17:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_ucode_amd.c,v 1.1 2012/01/13 16:05:15 cegger Exp $ */
+/* $NetBSD: cpu_ucode_amd.c,v 1.1.2.1 2012/05/17 18:17:32 riz Exp $ */
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu_ucode_amd.c,v 1.1 2012/01/13 16:05:15 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu_ucode_amd.c,v 1.1.2.1 2012/05/17 18:17:32 riz Exp $);
 
 #include opt_xen.h
 #include opt_cpu_ucode.h
@@ -150,12 +150,14 @@ cpu_apply_cb(void *arg0, void *arg1)
 	struct microcode_amd mc_amd;
 	struct mc_buf mc;
 	device_t dev;
+	int s;
 
 	memcpy(mc, arg1, sizeof(mc));
 	mc_amd.mpb = mc.mc_amd-mpb;
 	mc_amd.mpb_size = mc.mc_amd-mpb_size;
 
 	dev = curcpu()-ci_dev;
+	s = splhigh();
 
 	do {
 		uint64_t patchlevel;
@@ -168,7 +170,7 @@ cpu_apply_cb(void *arg0, void *arg1)
 
 		hdr = (struct microcode_amd_header *)mc_amd.mpb;
 		if (hdr-ah_processor_rev_id != mc.mc_equiv_cpuid) {
-			aprint_debug_dev(dev, ucode: patch does not
+			aprint_debug_dev(dev, ucode: patch does not 
 			match this cpu 
 			(patch is for cpu id %x, cpu id is %x)\n,
 			hdr-ah_processor_rev_id, mc.mc_equiv_cpuid);
@@ -196,6 +198,16 @@ cpu_apply_cb(void *arg0, void *arg1)
 		}
 
 next:
+		/* Check for race:
+		 * When we booted with -x a cpu might already finished
+		 * (why doesn't xc_wait() wait for *all* cpus?)
+		 * and sc-sc_blob is already freed.
+		 * In this case the calculation below touches
+		 * non-allocated memory and results in a crash.
+		 */
+		if (sc-sc_blob == NULL)
+			break;
+
 		mc.mc_buf += mc.mc_mpbuf-mpb_len +
 		sizeof(mc.mc_mpbuf-mpb_type) +
 		sizeof(mc.mc_mpbuf-mpb_len);
@@ -211,6 +223,7 @@ next:
 out:
 	if (error)
 		((struct mc_buf *)(arg1))-mc_error = error;
+	splx(s);
 }
 
 int
@@ -277,7 +290,7 @@ cpu_ucode_amd_apply(struct cpu_ucode_sof
 
 	/* Apply it on all cpus */
 	mc.mc_error = 0;
-	where = xc_broadcast(XC_HIGHPRI, cpu_apply_cb, sc, mc);
+	where = xc_broadcast(0, cpu_apply_cb, sc, mc);
 
 	/* Wait for completion */
 	xc_wait(where);

CVS commit: [netbsd-6] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu May 17 18:18:16 UTC 2012

Modified Files:
src/doc [netbsd-6]: CHANGES-6.0

Log Message:
Ticket 248.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.92 -r1.1.2.93 src/doc/CHANGES-6.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-6.0
diff -u src/doc/CHANGES-6.0:1.1.2.92 src/doc/CHANGES-6.0:1.1.2.93
--- src/doc/CHANGES-6.0:1.1.2.92	Thu May 17 18:12:50 2012
+++ src/doc/CHANGES-6.0	Thu May 17 18:18:16 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0,v 1.1.2.92 2012/05/17 18:12:50 riz Exp $
+# $NetBSD: CHANGES-6.0,v 1.1.2.93 2012/05/17 18:18:16 riz Exp $
 
 A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012
 until the 6.0 release:
@@ -2303,3 +2303,8 @@ sys/kern/vfs_syscalls.c1.455
 	Fix memory leak in do_open() error path.
 	[rmind, ticket #246]
 
+sys/arch/x86/x86/cpu_ucode_amd.c		1.2 via patch
+
+	Fix crash when booting with -x.
+	[cegger, ticket #248]
+

CVS commit: [netbsd-6] src/lib/libusbhid

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu May 17 18:20:27 UTC 2012

Modified Files:
src/lib/libusbhid [netbsd-6]: usb_hid_usages

Log Message:
Pull up following revision(s) (requested by khorben in ticket #249):
lib/libusbhid/usb_hid_usages: revision 1.6
Extended usb_hid_usages, with help from the equivalent file from FreeBSD.
Favored NetBSD upon conflicts, except for a typo and consistency.
ok riz@


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.2.1 src/lib/libusbhid/usb_hid_usages

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libusbhid/usb_hid_usages
diff -u src/lib/libusbhid/usb_hid_usages:1.5 src/lib/libusbhid/usb_hid_usages:1.5.2.1
--- src/lib/libusbhid/usb_hid_usages:1.5	Tue Jan 17 03:49:20 2012
+++ src/lib/libusbhid/usb_hid_usages	Thu May 17 18:20:26 2012
@@ -1,4 +1,4 @@
-# $NetBSD: usb_hid_usages,v 1.5 2012/01/17 03:49:20 christos Exp $
+# $NetBSD: usb_hid_usages,v 1.5.2.1 2012/05/17 18:20:26 riz Exp $
 #
 # USB HID usage table
 # Syntax:
@@ -19,6 +19,7 @@
 	0x06	Keyboard
 	0x07	Keypad
 	0x08	Multi-axis Controller
+	0x09	Tablet PC System Controls
 	0x30	X
 	0x31	Y
 	0x32	Z
@@ -32,6 +33,8 @@
 	0x3A	Counted Buffer
 	0x3B	Byte Count
 	0x3C	Motion Wakeup
+	0x3D	Start
+	0x3E	Select
 	0x40	Vx
 	0x41	Vy
 	0x42	Vz
@@ -39,6 +42,8 @@
 	0x44	Vbry
 	0x45	Vbrx
 	0x46	Vno
+	0x47	Feature Notification
+	0x48	Resolution Multiplier
 	0x80	System Control
 	0x81	System Power Down
 	0x82	System Sleep
@@ -53,10 +58,29 @@
 	0x8B	System Menu Left
 	0x8C	System Menu Up
 	0x8D	System Menu Down
+	0x8E	System Cold Restart
+	0x8F	System Warm Restart
 	0x90	D-pad Up
 	0x91	D-pad Down
 	0x92	D-pad Right
 	0x93	D-pad Left
+	0xA0	System Dock
+	0xA1	System Undock
+	0xA2	System Setup
+	0xA3	System Break
+	0xA4	System Debugger Break
+	0xA5	Application Break
+	0xA6	Application Debugger Break
+	0xA7	System Speaker Mute
+	0xA8	System Hibernate
+	0xB0	System Display Invert
+	0xB1	System Display Internal
+	0xB2	System Display External
+	0xB3	System Display Both
+	0xB4	System Display Dual
+	0xB5	System Display Toggle Int/Ext
+	0xB6	System Display Swap Primary/Secondary
+	0xB7	System Display LCD Autoscale
 
 2	Simulation Controls
 	0x00	Undefined
@@ -542,6 +566,7 @@
 	0x2E	Ring Select
 	0x2F	Phone Mute
 	0x30	Caller ID
+	0x31	Send
 	0x50	Speed Dial
 	0x51	Store Number
 	0x52	Recall Number
@@ -564,6 +589,8 @@
 	0x9A	Confirmation Tone 1
 	0x9B	Confirmation Tone 2
 	0x9C	Tones Off
+	0x9D	Outside Ringback
+	0x9E	Ringer
 	0xB0	Phone Key 0
 	0xB1	Phone Key 1
 	0xB2	Phone Key 2
@@ -586,6 +613,9 @@
 	0x01	Consumer Control
 	0x02	Numeric Key Pad
 	0x03	Programmable Buttons
+	0x04	Microphone
+	0x05	Headphone
+	0x06	Graphic Equalizer
 	0x20	+10
 	0x21	+100
 	0x22	AM/PM
@@ -676,7 +706,9 @@
 	0xC9	Show Counter
 	0xCA	Tracking Increment
 	0xCB	Tracking Decrement
-	0xCD	Pause/Play
+	0xCC	Stop/Eject
+	0xCD	Play/Pause
+	0xCE	Play/Skip
 	0xE0	Volume
 	0xE1	Balance
 	0xE2	Mute
@@ -703,6 +735,11 @@
 	0x106	Security Enable
 	0x107	Fire Alarm
 	0x108	Police Alarm
+	0x109	Proximity
+	0x10A	Motion
+	0x10B	Duress Alarm
+	0x10C	Holdup Alarm
+	0x10D	Medical Alarm
 	0x150	Balance Right
 	0x151	Balance Left
 	0x152	Bass Increment
@@ -763,10 +800,39 @@
 	0x1A3	AL Next Task/Application
 	0x1A4	AL Previous Task/Application
 	0x1A5	AL Preemptive Halt Task/Application
+	0x1A6	AL Integrated Help Center
 	0x1A7	AL My Documents
+	0x1A8	AL Thesaurus
+	0x1A9	AL Dictionary
+	0x1AA	AL Desktop
 	0x1AB	AC Spell
+	0x1AC	AL Grammar Check
+	0x1AD	AL Wireless Status
+	0x1AE	AL Keyboard Layout
+	0x1AF	AL Virus Protection
+	0x1B0	AL Encryption
+	0x1B1	AL Screen Saver
+	0x1B2	AL Alarms
+	0x1B3	AL Clock
+	0x1B4	AL File Browser
+	0x1B5	AL Power Status
 	0x1B6	AL My Pictures
 	0x1B7	AL My Music
+	0x1B8	AL Movie Browser
+	0x1B9	AL Digital Rights Manager
+	0x1BA	AL Digital Wallet
+	0x1BC	AL Instant Messaging
+	0x1BD	AL OEM Feature/Tips/Tutorial Browser
+	0x1BE	AL OEM Help
+	0x1BF	AL Online Community
+	0x1C0	AL Entertainment Content Browser
+	0x1C1	AL Online Shopping Browser
+	0x1C2	AL SmartCard Information/Help
+	0x1C3	AL Market Monitor/Finance Browser
+	0x1C4	AL Customized Corporate News Browser
+	0x1C5	AL Online Activity Browser
+	0x1C6	AL Research/Search Browser
+	0x1C7	AL Audio Player
 	0x200	Generic GUI Application Controls
 	0x201	AC New
 	0x202	AC Open
@@ -812,10 +878,102 @@
 	0x23A	AC Tile Horizontally
 	0x23B	AC Tile Vertically
 	0x23C	AC Format
+	0x23D	AC Edit
+	0x23E	AC Bold
+	0x23F	AC Italics
+	0x240	AC Underline
+	0x241	AC Strikethrough
+	0x242	AC Subscript
+	0x243	AC Superscript
+	0x244	AC All Caps
+	0x245	AC Rotate
+	0x246	AC Resize
+	0x247	AC Flip Horizontal
+	0x248	AC Flip Vertical
+	0x249	AC Mirror Horizontal
+	0x24A	AC Mirror Vertical
+	0x24B	AC Font Select
+	0x24C	AC Font Color
+	0x24D	AC Font Size
+	0x24E	AC Justify Left
+	0x24F	AC Justify Center H
+	0x250	AC Justify Right
+	0x251	AC Justify Block H
+	0x252	AC Justify Top
+	

CVS commit: [netbsd-6] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu May 17 18:21:08 UTC 2012

Modified Files:
src/doc [netbsd-6]: CHANGES-6.0

Log Message:
Ticket 249.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.93 -r1.1.2.94 src/doc/CHANGES-6.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-6.0
diff -u src/doc/CHANGES-6.0:1.1.2.93 src/doc/CHANGES-6.0:1.1.2.94
--- src/doc/CHANGES-6.0:1.1.2.93	Thu May 17 18:18:16 2012
+++ src/doc/CHANGES-6.0	Thu May 17 18:21:07 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0,v 1.1.2.93 2012/05/17 18:18:16 riz Exp $
+# $NetBSD: CHANGES-6.0,v 1.1.2.94 2012/05/17 18:21:07 riz Exp $
 
 A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012
 until the 6.0 release:
@@ -2308,3 +2308,8 @@ sys/arch/x86/x86/cpu_ucode_amd.c		1.2 vi
 	Fix crash when booting with -x.
 	[cegger, ticket #248]
 
+lib/libusbhid/usb_hid_usages			1.6
+
+	Expand the usb_hid_usages, with help from FreeBSD.
+	[khorben, ticket #249]
+

CVS commit: [netbsd-6] src/sys/arch/powerpc/conf

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu May 17 18:22:27 UTC 2012

Modified Files:
src/sys/arch/powerpc/conf [netbsd-6]: Makefile.powerpc

Log Message:
Pull up following revision(s) (requested by matt in ticket #250):
sys/arch/powerpc/conf/Makefile.powerpc: revision 1.50
For BookE kernels, use -mmultiple and -misel and enable -fstack-protector


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.49.2.1 src/sys/arch/powerpc/conf/Makefile.powerpc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/powerpc/conf/Makefile.powerpc
diff -u src/sys/arch/powerpc/conf/Makefile.powerpc:1.49 src/sys/arch/powerpc/conf/Makefile.powerpc:1.49.2.1
--- src/sys/arch/powerpc/conf/Makefile.powerpc:1.49	Wed Feb  1 21:46:02 2012
+++ src/sys/arch/powerpc/conf/Makefile.powerpc	Thu May 17 18:22:27 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.powerpc,v 1.49 2012/02/01 21:46:02 matt Exp $
+#	$NetBSD: Makefile.powerpc,v 1.49.2.1 2012/05/17 18:22:27 riz Exp $
 #
 # Makefile for NetBSD
 #
@@ -43,6 +43,11 @@ CWARNFLAGS+=	-Wreturn-type
 CFLAGS+=	-mno-strict-align
 CFLAGS+=	-Wa,-maltivec
 .endif
+.if ${PPCDIR} == booke
+DEFCOPTS=	-O2
+CFLAGS+=	-fstack-protector
+CFLAGS+=	-mmultiple -misel
+.endif
 CFLAGS+=	-msdata=none
 CFLAGS+=	-msoft-float ${CCPUOPTS}
 AFLAGS+=	${AOPTS} -D_NOREGNAMES

CVS commit: [netbsd-6] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu May 17 18:23:06 UTC 2012

Modified Files:
src/doc [netbsd-6]: CHANGES-6.0

Log Message:
Ticket 250.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.94 -r1.1.2.95 src/doc/CHANGES-6.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-6.0
diff -u src/doc/CHANGES-6.0:1.1.2.94 src/doc/CHANGES-6.0:1.1.2.95
--- src/doc/CHANGES-6.0:1.1.2.94	Thu May 17 18:21:07 2012
+++ src/doc/CHANGES-6.0	Thu May 17 18:23:06 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0,v 1.1.2.94 2012/05/17 18:21:07 riz Exp $
+# $NetBSD: CHANGES-6.0,v 1.1.2.95 2012/05/17 18:23:06 riz Exp $
 
 A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012
 until the 6.0 release:
@@ -2313,3 +2313,9 @@ lib/libusbhid/usb_hid_usages			1.6
 	Expand the usb_hid_usages, with help from FreeBSD.
 	[khorben, ticket #249]
 
+sys/arch/powerpc/conf/Makefile.powerpc		1.50
+
+	For BookE kernels, use -mmultiple and -misel and enable
+	-fstack-protector .
+	[matt, ticket #250]
+

CVS commit: [netbsd-6] src/sys/arch/powerpc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu May 17 18:24:27 UTC 2012

Modified Files:
src/sys/arch/powerpc/include [netbsd-6]: cpu.h
src/sys/arch/powerpc/powerpc [netbsd-6]: powerpc_machdep.c

Log Message:
Pull up following revision(s) (requested by matt in ticket #251):
sys/arch/powerpc/powerpc/powerpc_machdep.c: revision 1.64
sys/arch/powerpc/include/cpu.h: revision 1.90
Add CPU_EXECPROT sysctl so that atf can enable exec permission tests for
PPC Booke.


To generate a diff of this commit:
cvs rdiff -u -r1.89.2.1 -r1.89.2.2 src/sys/arch/powerpc/include/cpu.h
cvs rdiff -u -r1.62 -r1.62.2.1 src/sys/arch/powerpc/powerpc/powerpc_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/powerpc/include/cpu.h
diff -u src/sys/arch/powerpc/include/cpu.h:1.89.2.1 src/sys/arch/powerpc/include/cpu.h:1.89.2.2
--- src/sys/arch/powerpc/include/cpu.h:1.89.2.1	Wed May  9 22:47:03 2012
+++ src/sys/arch/powerpc/include/cpu.h	Thu May 17 18:24:27 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.89.2.1 2012/05/09 22:47:03 riz Exp $	*/
+/*	$NetBSD: cpu.h,v 1.89.2.2 2012/05/17 18:24:27 riz Exp $	*/
 
 /*
  * Copyright (C) 1999 Wolfgang Solfrank.
@@ -448,6 +448,7 @@ void	__syncicache(void *, size_t);
 #define	CPU_POWERSAVE		8	/* int: use CPU powersave mode */
 #define	CPU_BOOTED_DEVICE	9	/* string: device we booted from */
 #define	CPU_BOOTED_KERNEL	10	/* string: kernel we booted */
-#define	CPU_MAXID		11	/* number of valid machdep ids */
+#define	CPU_EXECPROT		11	/* bool: PROT_EXEC works */
+#define	CPU_MAXID		12	/* number of valid machdep ids */
 
 #endif	/* _POWERPC_CPU_H_ */

Index: src/sys/arch/powerpc/powerpc/powerpc_machdep.c
diff -u src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.62 src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.62.2.1
--- src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.62	Sat Feb 11 23:16:16 2012
+++ src/sys/arch/powerpc/powerpc/powerpc_machdep.c	Thu May 17 18:24:27 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: powerpc_machdep.c,v 1.62 2012/02/11 23:16:16 martin Exp $	*/
+/*	$NetBSD: powerpc_machdep.c,v 1.62.2.1 2012/05/17 18:24:27 riz Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: powerpc_machdep.c,v 1.62 2012/02/11 23:16:16 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: powerpc_machdep.c,v 1.62.2.1 2012/05/17 18:24:27 riz Exp $);
 
 #include opt_altivec.h
 #include opt_modular.h
@@ -250,6 +250,13 @@ SYSCTL_SETUP(sysctl_machdep_setup, sysc
 		   NULL, cpu_altivec, NULL, 0,
 		   CTL_MACHDEP, CPU_ALTIVEC, CTL_EOL);
 #endif
+#ifdef PPC_BOOKE
+	sysctl_createv(clog, 0, NULL, NULL,
+		   CTLFLAG_PERMANENT|CTLFLAG_IMMEDIATE,
+		   CTLTYPE_INT, execprot, NULL,
+		   NULL, 1, NULL, 0,
+		   CTL_MACHDEP, CPU_EXECPROT, CTL_EOL);
+#endif
 	sysctl_createv(clog, 0, NULL, NULL,
 		   CTLFLAG_PERMANENT,
 		   CTLTYPE_STRING, model, NULL,

CVS commit: [netbsd-6] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu May 17 18:25:15 UTC 2012

Modified Files:
src/doc [netbsd-6]: CHANGES-6.0

Log Message:
Ticket 251.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.95 -r1.1.2.96 src/doc/CHANGES-6.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-6.0
diff -u src/doc/CHANGES-6.0:1.1.2.95 src/doc/CHANGES-6.0:1.1.2.96
--- src/doc/CHANGES-6.0:1.1.2.95	Thu May 17 18:23:06 2012
+++ src/doc/CHANGES-6.0	Thu May 17 18:25:15 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0,v 1.1.2.95 2012/05/17 18:23:06 riz Exp $
+# $NetBSD: CHANGES-6.0,v 1.1.2.96 2012/05/17 18:25:15 riz Exp $
 
 A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012
 until the 6.0 release:
@@ -2319,3 +2319,9 @@ sys/arch/powerpc/conf/Makefile.powerpc		
 	-fstack-protector .
 	[matt, ticket #250]
 
+sys/arch/powerpc/include/cpu.h			1.90
+sys/arch/powerpc/powerpc/powerpc_machdep.c	1.64
+
+	Add CPU_EXECPROT sysctl for PowerPC.
+	[matt, ticket #251]
+

CVS commit: [netbsd-6] src/tests/lib/libc/arch/powerpc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu May 17 18:26:33 UTC 2012

Modified Files:
src/tests/lib/libc/arch/powerpc [netbsd-6]: exec_prot_support.c
return_one.S

Log Message:
Pull up following revision(s) (requested by matt in ticket #252):
tests/lib/libc/arch/powerpc/exec_prot_support.c: revision 1.2
tests/lib/libc/arch/powerpc/return_one.S: revision 1.2
Allow testing of exec pages on PowerPC BookE.
Make return_one actually do the right thing.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.4.1 \
src/tests/lib/libc/arch/powerpc/exec_prot_support.c \
src/tests/lib/libc/arch/powerpc/return_one.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/lib/libc/arch/powerpc/exec_prot_support.c
diff -u src/tests/lib/libc/arch/powerpc/exec_prot_support.c:1.1 src/tests/lib/libc/arch/powerpc/exec_prot_support.c:1.1.4.1
--- src/tests/lib/libc/arch/powerpc/exec_prot_support.c:1.1	Mon Jul 18 23:16:10 2011
+++ src/tests/lib/libc/arch/powerpc/exec_prot_support.c	Thu May 17 18:26:32 2012
@@ -1,11 +1,11 @@
-/*  $NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:10 jym Exp $ */
+/*  $NetBSD: exec_prot_support.c,v 1.1.4.1 2012/05/17 18:26:32 riz Exp $ */
 
 /*-
- * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
- * by Jean-Yves Migeon.
+ * by Matt Thomas of 3am Software Foundry.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,12 +30,23 @@
  */
 
 #include sys/cdefs.h
-__RCSID($NetBSD: exec_prot_support.c,v 1.1 2011/07/18 23:16:10 jym Exp $);
+__RCSID($NetBSD: exec_prot_support.c,v 1.1.4.1 2012/05/17 18:26:32 riz Exp $);
 
 #include ../../common/exec_prot.h
 
+#include sys/sysctl.h
+
 int
 exec_prot_support(void)
 {
-	return NOTIMPL;
+	int execprot = 0;
+	size_t len = sizeof(execprot);
+
+	if (sysctlbyname(machdep.execprot, execprot, len, NULL, 0)  0)
+		return NOTIMPL;
+
+	if (execprot)
+		return PERPAGE_XP;
+
+	return NO_XP;
 }
Index: src/tests/lib/libc/arch/powerpc/return_one.S
diff -u src/tests/lib/libc/arch/powerpc/return_one.S:1.1 src/tests/lib/libc/arch/powerpc/return_one.S:1.1.4.1
--- src/tests/lib/libc/arch/powerpc/return_one.S:1.1	Mon Jul 18 23:16:10 2011
+++ src/tests/lib/libc/arch/powerpc/return_one.S	Thu May 17 18:26:32 2012
@@ -1,8 +1,11 @@
-/*	$NetBSD: return_one.S,v 1.1 2011/07/18 23:16:10 jym Exp $ */
+/*	$NetBSD: return_one.S,v 1.1.4.1 2012/05/17 18:26:32 riz Exp $ */
 
 #include machine/asm.h
 
-.globl	return_one, return_one_end;
+.globl	return_one, return_one_end
 
-return_one: return_one_end:
-	nop
+_ENTRY(return_one)
+	li	%r3, 1
+	blr
+return_one_end:
+END(return_one)

CVS commit: [netbsd-6] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu May 17 18:26:55 UTC 2012

Modified Files:
src/doc [netbsd-6]: CHANGES-6.0

Log Message:
Ticket 252.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.96 -r1.1.2.97 src/doc/CHANGES-6.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-6.0
diff -u src/doc/CHANGES-6.0:1.1.2.96 src/doc/CHANGES-6.0:1.1.2.97
--- src/doc/CHANGES-6.0:1.1.2.96	Thu May 17 18:25:15 2012
+++ src/doc/CHANGES-6.0	Thu May 17 18:26:55 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0,v 1.1.2.96 2012/05/17 18:25:15 riz Exp $
+# $NetBSD: CHANGES-6.0,v 1.1.2.97 2012/05/17 18:26:55 riz Exp $
 
 A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012
 until the 6.0 release:
@@ -2325,3 +2325,9 @@ sys/arch/powerpc/powerpc/powerpc_machdep
 	Add CPU_EXECPROT sysctl for PowerPC.
 	[matt, ticket #251]
 
+tests/lib/libc/arch/powerpc/exec_prot_support.c	1.2
+tests/lib/libc/arch/powerpc/return_one.S	1.2
+
+	Allow testing of exec pages on PowerPC BookE.
+	[matt, ticket #252]
+

CVS commit: [netbsd-6] src/sys/arch/powerpc/booke

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu May 17 18:29:25 UTC 2012

Modified Files:
src/sys/arch/powerpc/booke [netbsd-6]: copyin.c

Log Message:
Pull up following revision(s) (requested by matt in ticket #253):
sys/arch/powerpc/booke/copyin.c: revision 1.5
Make sure to have copyinstr return ENAMETOOLONG if the string was too long.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/powerpc/booke/copyin.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/powerpc/booke/copyin.c
diff -u src/sys/arch/powerpc/booke/copyin.c:1.4 src/sys/arch/powerpc/booke/copyin.c:1.4.8.1
--- src/sys/arch/powerpc/booke/copyin.c:1.4	Mon Jun 20 05:20:37 2011
+++ src/sys/arch/powerpc/booke/copyin.c	Thu May 17 18:29:25 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: copyin.c,v 1.4 2011/06/20 05:20:37 matt Exp $	*/
+/*	$NetBSD: copyin.c,v 1.4.8.1 2012/05/17 18:29:25 riz Exp $	*/
 
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: copyin.c,v 1.4 2011/06/20 05:20:37 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: copyin.c,v 1.4.8.1 2012/05/17 18:29:25 riz Exp $);
 
 #include sys/param.h
 #include sys/lwp.h
@@ -314,5 +314,8 @@ copyinstr(const void *usaddr, void *kdad
 	pcb-pcb_onfault = NULL;
 	if (done)
 		*done = copylen;
-	return 0;
+	/*
+	 * If the last byte is not NUL (0), then the name is too long.
+	 */
+	return (uint8_t)data ? ENAMETOOLONG : 0;
 }

CVS commit: [netbsd-6] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu May 17 18:32:13 UTC 2012

Modified Files:
src/doc [netbsd-6]: CHANGES-6.0

Log Message:
Ticket 253.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.97 -r1.1.2.98 src/doc/CHANGES-6.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-6.0
diff -u src/doc/CHANGES-6.0:1.1.2.97 src/doc/CHANGES-6.0:1.1.2.98
--- src/doc/CHANGES-6.0:1.1.2.97	Thu May 17 18:26:55 2012
+++ src/doc/CHANGES-6.0	Thu May 17 18:32:13 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0,v 1.1.2.97 2012/05/17 18:26:55 riz Exp $
+# $NetBSD: CHANGES-6.0,v 1.1.2.98 2012/05/17 18:32:13 riz Exp $
 
 A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012
 until the 6.0 release:
@@ -2331,3 +2331,8 @@ tests/lib/libc/arch/powerpc/return_one.S
 	Allow testing of exec pages on PowerPC BookE.
 	[matt, ticket #252]
 
+sys/arch/powerpc/booke/copyin.c			1.5
+
+	Fix for BookE copyinstr.
+	[matt, ticket #253]
+

CVS commit: [netbsd-6] src/sys/arch/powerpc/include

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu May 17 18:38:54 UTC 2012

Modified Files:
src/sys/arch/powerpc/include [netbsd-6]: vmparam.h

Log Message:
Pull up following revision(s) (requested by matt in ticket #255):
sys/arch/powerpc/include/vmparam.h: revision 1.17
Export MIN_PAGE_SIZE and MAX_PAGE_SIZE for modular kernels.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.10.1 src/sys/arch/powerpc/include/vmparam.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/powerpc/include/vmparam.h
diff -u src/sys/arch/powerpc/include/vmparam.h:1.16 src/sys/arch/powerpc/include/vmparam.h:1.16.10.1
--- src/sys/arch/powerpc/include/vmparam.h:1.16	Mon Jun 20 21:45:16 2011
+++ src/sys/arch/powerpc/include/vmparam.h	Thu May 17 18:38:54 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.16 2011/06/20 21:45:16 matt Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.16.10.1 2012/05/17 18:38:54 riz Exp $	*/
 
 #ifndef _POWERPC_VMPARAM_H_
 #define _POWERPC_VMPARAM_H_
@@ -28,14 +28,17 @@
 #define	VM_DEFAULT_ADDRESS(da, sz) \
 	((VM_MAXUSER_ADDRESS - MAXSSIZ) - round_page(sz))
 
-#if defined(_MODULE)
+#if defined(_MODULE) || defined(MODULAR)
 /*
- * If we are a module, then we need with varible page sizes since BOOKE and OEA
- * use 4KB pages while IBM4XX use 16KB pages.
+ * If we are a module or a modular kernel, then we need to defined the range
+ * of our varible page sizes since BOOKE and OEA use 4KB pages while IBM4XX
+ * use 16KB pages.
  */
 #define	MIN_PAGE_SIZE	4096		/* BOOKE/OEA */
 #define	MAX_PAGE_SIZE	16384		/* IBM4XX */
+#endif
 
+#if defined(_MODULE)
 #if defined(_RUMPKERNEL)
 /*
  * Safe definitions for RUMP kernels

CVS commit: [netbsd-6] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu May 17 18:39:37 UTC 2012

Modified Files:
src/doc [netbsd-6]: CHANGES-6.0

Log Message:
Ticket 255.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.98 -r1.1.2.99 src/doc/CHANGES-6.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-6.0
diff -u src/doc/CHANGES-6.0:1.1.2.98 src/doc/CHANGES-6.0:1.1.2.99
--- src/doc/CHANGES-6.0:1.1.2.98	Thu May 17 18:32:13 2012
+++ src/doc/CHANGES-6.0	Thu May 17 18:39:37 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0,v 1.1.2.98 2012/05/17 18:32:13 riz Exp $
+# $NetBSD: CHANGES-6.0,v 1.1.2.99 2012/05/17 18:39:37 riz Exp $
 
 A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012
 until the 6.0 release:
@@ -2336,3 +2336,8 @@ sys/arch/powerpc/booke/copyin.c			1.5
 	Fix for BookE copyinstr.
 	[matt, ticket #253]
 
+sys/arch/powerpc/include/vmparam.h		1.17
+
+	Export MIN_PAGE_SIZE and MAX_PAGE_SIZE for modular PowerPC kernels.
+	[matt, ticket #255]
+

CVS commit: [netbsd-6] src/doc

[Stephen Borrill]

Module Name:src
Committed By:   sborrill
Date:   Thu May 17 18:58:12 UTC 2012

Modified Files:
src/doc [netbsd-6]: CHANGES-6.0

Log Message:
Ticket 247


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.99 -r1.1.2.100 src/doc/CHANGES-6.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-6.0
diff -u src/doc/CHANGES-6.0:1.1.2.99 src/doc/CHANGES-6.0:1.1.2.100
--- src/doc/CHANGES-6.0:1.1.2.99	Thu May 17 18:39:37 2012
+++ src/doc/CHANGES-6.0	Thu May 17 18:58:12 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0,v 1.1.2.99 2012/05/17 18:39:37 riz Exp $
+# $NetBSD: CHANGES-6.0,v 1.1.2.100 2012/05/17 18:58:12 sborrill Exp $
 
 A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012
 until the 6.0 release:
@@ -2341,3 +2341,41 @@ sys/arch/powerpc/include/vmparam.h		1.17
 	Export MIN_PAGE_SIZE and MAX_PAGE_SIZE for modular PowerPC kernels.
 	[matt, ticket #255]
 
+distrib/utils/sysinst/Makefile.inc		1.59 via patch
+distrib/utils/sysinst/checkrc.c			1.1-1.2 via patch
+distrib/utils/sysinst/configmenu.c		1.1-1.5 via patch
+distrib/utils/sysinst/defs.h			1.162 via patch
+distrib/utils/sysinst/install.c			1.46 via patch
+distrib/utils/sysinst/main.c			1.64 via patch
+distrib/utils/sysinst/mbr.c			1.90 via patch
+distrib/utils/sysinst/menus.mi			1.45-1.46 via patch
+distrib/utils/sysinst/msg.mbr.de		1.12 via patch
+distrib/utils/sysinst/msg.mbr.en		1.16-1.17 via patch
+distrib/utils/sysinst/msg.mbr.es		1.7 via patch
+distrib/utils/sysinst/msg.mbr.fr		1.18-1.19 via patch
+distrib/utils/sysinst/msg.mbr.pl		1.15-1.16 via patch
+distrib/utils/sysinst/msg.mi.de			1.62-1.67 via patch
+distrib/utils/sysinst/msg.mi.en			1.170-1.172 via patch
+distrib/utils/sysinst/msg.mi.es			1.40-1.43 via patch
+distrib/utils/sysinst/msg.mi.fr			1.120-1.126 via patch
+distrib/utils/sysinst/msg.mi.pl			1.79-1.83 via patch
+distrib/utils/sysinst/net.c			1.131-1.132 via patch
+distrib/utils/sysinst/run.c			1.70 via patch
+distrib/utils/sysinst/target.c			1.55 via patch
+distrib/utils/sysinst/util.c			1.174-1.178 via patch
+distrib/utils/sysinst/arch/evbarm/msg.md.de	1.10-1.11 via patch
+distrib/utils/sysinst/arch/evbmips/md.c		1.10 via patch
+distrib/utils/sysinst/arch/hp300/msg.md.de	1.6-1.7 via patch
+distrib/utils/sysinst/arch/hp300/msg.md.en	1.9 via patch
+distrib/utils/sysinst/arch/hp300/msg.md.es	1.5 via patch
+distrib/utils/sysinst/arch/hp300/msg.md.fr	1.8 via patch
+distrib/utils/sysinst/arch/hp300/msg.md.pl	1.8 via patch
+distrib/utils/sysinst/arch/i386/msg.md.en	1.62-1.63 via patch
+distrib/utils/sysinst/arch/i386/msg.md.es	1.14 via patch
+distrib/utils/sysinst/arch/i386/msg.md.de	1.23
+
+	Sync sysinst with -current as of 2011-05-17.
+	Add new post-install configuration menu for sysinst, and apply
+	numerous bug fixes.
+	[riz, ticket #247]
+

CVS commit: [netbsd-6] src

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu May 17 19:03:24 UTC 2012

Modified Files:
src/distrib/sets/lists/tests [netbsd-6]: module.mi
src/tests/modules [netbsd-6]: Makefile
Added Files:
src/tests/modules [netbsd-6]: t_abi_uvm.sh
src/tests/modules/k_uvm [netbsd-6]: Makefile k_uvm.c

Log Message:
Pull up following revision(s) (requested by jmmv in ticket #8):
tests/modules/t_abi_uvm.sh: revision 1.1
tests/modules/k_uvm/k_uvm.c: revision 1.1
tests/modules/k_uvm/Makefile: revision 1.1
distrib/sets/lists/tests/module.mi: revision 1.6
tests/modules/Makefile: revision 1.9
Add a test to ensure that PAGE_SIZE is available in kernel modules.
This test reproduces the error condition in PR port-macppc/46041 and
therefore it is an xfail in this particular platform.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.8.1 src/distrib/sets/lists/tests/module.mi
cvs rdiff -u -r1.8 -r1.8.8.1 src/tests/modules/Makefile
cvs rdiff -u -r0 -r1.3.2.2 src/tests/modules/t_abi_uvm.sh
cvs rdiff -u -r0 -r1.1.4.2 src/tests/modules/k_uvm/Makefile \
src/tests/modules/k_uvm/k_uvm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/tests/module.mi
diff -u src/distrib/sets/lists/tests/module.mi:1.5 src/distrib/sets/lists/tests/module.mi:1.5.8.1
--- src/distrib/sets/lists/tests/module.mi:1.5	Fri Aug 27 10:01:04 2010
+++ src/distrib/sets/lists/tests/module.mi	Thu May 17 19:03:24 2012
@@ -1,4 +1,4 @@
-# $NetBSD: module.mi,v 1.5 2010/08/27 10:01:04 pooka Exp $
+# $NetBSD: module.mi,v 1.5.8.1 2012/05/17 19:03:24 riz Exp $
 #
 # These are only made for ports doing modules.
 #
@@ -7,6 +7,9 @@
 ./usr/tests/modules/k_helper/k_helper.kmod	tests-sys-tests		atf
 ./usr/tests/modules/k_helper2			tests-sys-tests		atf
 ./usr/tests/modules/k_helper2/k_helper2.kmod	tests-sys-tests		atf
+./usr/tests/modules/k_uvm			tests-sys-tests		atf
+./usr/tests/modules/k_uvm/k_uvm.kmod		tests-sys-tests		atf
+./usr/tests/modules/t_abi_uvm			tests-sys-tests		atf
 ./usr/tests/modules/t_builtin			tests-sys-tests		atf
 ./usr/tests/modules/t_modctl			tests-sys-tests		atf
 ./usr/tests/modules/t_modload			tests-sys-tests		atf

Index: src/tests/modules/Makefile
diff -u src/tests/modules/Makefile:1.8 src/tests/modules/Makefile:1.8.8.1
--- src/tests/modules/Makefile:1.8	Fri Aug 27 09:56:40 2010
+++ src/tests/modules/Makefile	Thu May 17 19:03:23 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/08/27 09:56:40 pooka Exp $
+# $NetBSD: Makefile,v 1.8.8.1 2012/05/17 19:03:23 riz Exp $
 
 .include bsd.own.mk
 
@@ -14,9 +14,11 @@ TESTS_C+=	t_builtin
 LDADD=		-lprop
 LDADD+=		-lrumpfs_kernfs -lrumpvfs -lrump -lrumpuser -lpthread
 
-TESTS_SH=	t_modload
+TESTS_SH=	t_abi_uvm
+TESTS_SH+=	t_modload
 
 SUBDIR=		k_helper
 SUBDIR+=	k_helper2
+SUBDIR+=	k_uvm
 
 .include bsd.test.mk

Added files:

Index: src/tests/modules/t_abi_uvm.sh
diff -u /dev/null src/tests/modules/t_abi_uvm.sh:1.3.2.2
--- /dev/null	Thu May 17 19:03:24 2012
+++ src/tests/modules/t_abi_uvm.sh	Thu May 17 19:03:23 2012
@@ -0,0 +1,60 @@
+# $NetBSD: t_abi_uvm.sh,v 1.3.2.2 2012/05/17 19:03:23 riz Exp $
+#
+# Copyright (c) 2012 The NetBSD Foundation, Inc.
+# 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.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION 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.
+#
+
+atf_test_case PAGE_SIZE cleanup
+PAGE_SIZE_head() {
+	atf_set descr Ensures that modules have access to PAGE_SIZE
+	atf_set require.user root
+}
+PAGE_SIZE_body() {
+	if modload $(atf_get_srcdir)/k_uvm/k_uvm.kmod; then
+		:
+	else
+		case $(uname -m) in
+		macppc)
+			atf_expect_fail PR port-macppc/46041
+			;;
+		esac
+		atf_fail Failed to load k_uvm; 

CVS commit: [netbsd-6] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Thu May 17 19:04:13 UTC 2012

Modified Files:
src/doc [netbsd-6]: CHANGES-6.0

Log Message:
Ticket #8.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.100 -r1.1.2.101 src/doc/CHANGES-6.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-6.0
diff -u src/doc/CHANGES-6.0:1.1.2.100 src/doc/CHANGES-6.0:1.1.2.101
--- src/doc/CHANGES-6.0:1.1.2.100	Thu May 17 18:58:12 2012
+++ src/doc/CHANGES-6.0	Thu May 17 19:04:13 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0,v 1.1.2.100 2012/05/17 18:58:12 sborrill Exp $
+# $NetBSD: CHANGES-6.0,v 1.1.2.101 2012/05/17 19:04:13 riz Exp $
 
 A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012
 until the 6.0 release:
@@ -2379,3 +2379,13 @@ distrib/utils/sysinst/arch/i386/msg.md.d
 	numerous bug fixes.
 	[riz, ticket #247]
 
+distrib/sets/lists/tests/module.mi		1.6
+tests/modules/Makefile1.9
+tests/modules/k_uvm/Makefile			1.1
+tests/modules/k_uvm/k_uvm.c			1.1
+tests/modules/t_abi_uvm.sh			1.1
+
+	Add a test to ensure that PAGE_SIZE is available in kernel modules.
+	PR #46041.
+	[jmmv, ticket #8]
+

CVS commit: src/sys/arch/amd64/include

[David Laight]

Module Name:src
Committed By:   dsl
Date:   Thu May 17 19:38:54 UTC 2012

Modified Files:
src/sys/arch/amd64/include: frameasm.h

Log Message:
Let the user of INTRENTRY_L() place a label on the 'swapgs' used
  when faulting from user space.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/amd64/include/frameasm.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amd64/include/frameasm.h
diff -u src/sys/arch/amd64/include/frameasm.h:1.18 src/sys/arch/amd64/include/frameasm.h:1.19
--- src/sys/arch/amd64/include/frameasm.h:1.18	Mon May  7 21:04:09 2012
+++ src/sys/arch/amd64/include/frameasm.h	Thu May 17 19:38:53 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: frameasm.h,v 1.18 2012/05/07 21:04:09 dsl Exp $	*/
+/*	$NetBSD: frameasm.h,v 1.19 2012/05/17 19:38:53 dsl Exp $	*/
 
 #ifndef _AMD64_MACHINE_FRAMEASM_H
 #define _AMD64_MACHINE_FRAMEASM_H
@@ -73,11 +73,12 @@
 	movq	TF_RBX(%rsp),%rbx	; \
 	movq	TF_RAX(%rsp),%rax
 
-#define	INTRENTRY_L(kernel_trap) \
+#define	INTRENTRY_L(kernel_trap, usertrap) \
 	subq	$TF_REGSIZE,%rsp	; \
 	INTR_SAVE_GPRS			; \
 	testb	$SEL_UPL,TF_CS(%rsp)	; \
 	je	kernel_trap		; \
+usertrap; \
 	swapgs; \
 	movw	%gs,TF_GS(%rsp)		; \
 	movw	%fs,TF_FS(%rsp)		; \
@@ -85,7 +86,7 @@
 	movw	%ds,TF_DS(%rsp)	
 
 #define	INTRENTRY \
-	INTRENTRY_L(98f)		; \
+	INTRENTRY_L(98f,)		; \
 98:
 
 #define INTRFASTEXIT \

CVS commit: src/sys/dev/usb

[Erik Berls]

Module Name:src
Committed By:   cyber
Date:   Thu May 17 21:48:22 UTC 2012

Modified Files:
src/sys/dev/usb: usbdevs

Log Message:
add USBConnect Mercury


To generate a diff of this commit:
cvs rdiff -u -r1.613 -r1.614 src/sys/dev/usb/usbdevs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.613 src/sys/dev/usb/usbdevs:1.614
--- src/sys/dev/usb/usbdevs:1.613	Wed Apr 25 02:41:51 2012
+++ src/sys/dev/usb/usbdevs	Thu May 17 21:48:22 2012
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.613 2012/04/25 02:41:51 ichiro Exp $
+$NetBSD: usbdevs,v 1.614 2012/05/17 21:48:22 cyber Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -2557,6 +2557,7 @@ product SIERRA AC880E		0x6852	Sierra Wir
 product SIERRA AC881E		0x6853	Sierra Wireless AirCard 881E
 product SIERRA AC880U		0x6855	Sierra Wireless AirCard 880U
 product SIERRA AC881U		0x6856	Sierra Wireless AirCard 881U
+product SIERRA AC885U		0x6880	Sierra Wireless AirCard 885U
 product SIERRA USB305		0x68a3	Sierra Wireless AirCard USB 305
 
 /* Sigmatel products */

CVS commit: src/sys/dev/usb

[Erik Berls]

Module Name:src
Committed By:   cyber
Date:   Thu May 17 21:59:49 UTC 2012

Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.606 -r1.607 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.607 -r1.608 src/sys/dev/usb/usbdevs_data.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.606 src/sys/dev/usb/usbdevs.h:1.607
--- src/sys/dev/usb/usbdevs.h:1.606	Wed Apr 25 02:42:42 2012
+++ src/sys/dev/usb/usbdevs.h	Thu May 17 21:59:49 2012
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs.h,v 1.606 2012/04/25 02:42:42 ichiro Exp $	*/
+/*	$NetBSD: usbdevs.h,v 1.607 2012/05/17 21:59:49 cyber Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.613 2012/04/25 02:41:51 ichiro Exp
+ *	NetBSD: usbdevs,v 1.614 2012/05/17 21:48:22 cyber Exp
  */
 
 /*
@@ -2564,6 +2564,7 @@
 #define	USB_PRODUCT_SIERRA_AC881E	0x6853		/* Sierra Wireless AirCard 881E */
 #define	USB_PRODUCT_SIERRA_AC880U	0x6855		/* Sierra Wireless AirCard 880U */
 #define	USB_PRODUCT_SIERRA_AC881U	0x6856		/* Sierra Wireless AirCard 881U */
+#define	USB_PRODUCT_SIERRA_AC885U	0x6880		/* Sierra Wireless AirCard 885U */
 #define	USB_PRODUCT_SIERRA_USB305	0x68a3		/* Sierra Wireless AirCard USB 305 */
 
 /* Sigmatel products */

Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.607 src/sys/dev/usb/usbdevs_data.h:1.608
--- src/sys/dev/usb/usbdevs_data.h:1.607	Wed Apr 25 02:42:42 2012
+++ src/sys/dev/usb/usbdevs_data.h	Thu May 17 21:59:49 2012
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs_data.h,v 1.607 2012/04/25 02:42:42 ichiro Exp $	*/
+/*	$NetBSD: usbdevs_data.h,v 1.608 2012/05/17 21:59:49 cyber Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.613 2012/04/25 02:41:51 ichiro Exp
+ *	NetBSD: usbdevs,v 1.614 2012/05/17 21:48:22 cyber Exp
  */
 
 /*
@@ -7687,6 +7687,10 @@ const struct usb_product usb_products[] 
 	Sierra Wireless AirCard 881U,
 	},
 	{
+	USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC885U,
+	Sierra Wireless AirCard 885U,
+	},
+	{
 	USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_USB305,
 	Sierra Wireless AirCard USB 305,
 	},
@@ -8855,4 +8859,4 @@ const struct usb_product usb_products[] 
 	Prestige,
 	},
 };
-const int usb_nproducts = 1700;
+const int usb_nproducts = 1701;

CVS commit: src/usr.bin/make

[Simon J. Gerraty]

Module Name:src
Committed By:   sjg
Date:   Fri May 18 02:28:17 UTC 2012

Modified Files:
src/usr.bin/make: make_malloc.c var.c

Log Message:
Avoid nested extern declaration warnings


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/make_malloc.c
cvs rdiff -u -r1.168 -r1.169 src/usr.bin/make/var.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/make/make_malloc.c
diff -u src/usr.bin/make/make_malloc.c:1.6 src/usr.bin/make/make_malloc.c:1.7
--- src/usr.bin/make/make_malloc.c:1.6	Sat Dec 25 20:35:25 2010
+++ src/usr.bin/make/make_malloc.c	Fri May 18 02:28:16 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: make_malloc.c,v 1.6 2010/12/25 20:35:25 dholland Exp $	*/
+/*	$NetBSD: make_malloc.c,v 1.7 2012/05/18 02:28:16 sjg Exp $	*/
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 
 #ifdef MAKE_NATIVE
 #include sys/cdefs.h
-__RCSID($NetBSD: make_malloc.c,v 1.6 2010/12/25 20:35:25 dholland Exp $);
+__RCSID($NetBSD: make_malloc.c,v 1.7 2012/05/18 02:28:16 sjg Exp $);
 #endif
 
 #include stdio.h
@@ -43,11 +43,11 @@ __RCSID($NetBSD: make_malloc.c,v 1.6 20
  * enomem --
  *	die when out of memory.
  */
+extern char *progname;
+
 static void
 enomem(void)
 {
-	extern char *progname;
-
 	(void)fprintf(stderr, %s: %s.\n, progname, strerror(ENOMEM));
 	exit(2);
 }

Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.168 src/usr.bin/make/var.c:1.169
--- src/usr.bin/make/var.c:1.168	Tue Apr 24 20:26:58 2012
+++ src/usr.bin/make/var.c	Fri May 18 02:28:16 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.168 2012/04/24 20:26:58 sjg Exp $	*/
+/*	$NetBSD: var.c,v 1.169 2012/05/18 02:28:16 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: var.c,v 1.168 2012/04/24 20:26:58 sjg Exp $;
+static char rcsid[] = $NetBSD: var.c,v 1.169 2012/05/18 02:28:16 sjg Exp $;
 #else
 #include sys/cdefs.h
 #ifndef lint
 #if 0
 static char sccsid[] = @(#)var.c	8.3 (Berkeley) 3/19/94;
 #else
-__RCSID($NetBSD: var.c,v 1.168 2012/04/24 20:26:58 sjg Exp $);
+__RCSID($NetBSD: var.c,v 1.169 2012/05/18 02:28:16 sjg Exp $);
 #endif
 #endif /* not lint */
 #endif
@@ -742,6 +742,8 @@ Var_Export(char *str, int isExport)
 /*
  * This is called when .unexport[-env] is seen.
  */
+extern char **environ;
+
 void
 Var_UnExport(char *str)
 {
@@ -760,7 +762,6 @@ Var_UnExport(char *str)
 str += 8;
 unexport_env = (strncmp(str, -env, 4) == 0);
 if (unexport_env) {
-	extern char **environ;
 	static char **savenv;
 	char **newenv;
 

CVS commit: [netbsd-6] src/distrib/utils/sysinst

[Stephen Borrill]

Module Name:src
Committed By:   sborrill
Date:   Fri May 18 02:28:52 UTC 2012

Added Files:
src/distrib/utils/sysinst [netbsd-6]: checkrc.c configmenu.c

Log Message:
Add new files from ticket #247:

Pull up the following revisions(s) (requested by riz in ticket #247):
distrib/utils/sysinst/Makefile.inc: revision 1.59 via patch
distrib/utils/sysinst/checkrc.c: revision 1.1-1.2 via patch
distrib/utils/sysinst/configmenu.c: revision 1.1-1.5 via patch
distrib/utils/sysinst/defs.h: revision 1.162 via patch
distrib/utils/sysinst/install.c: revision 1.46 via patch
distrib/utils/sysinst/main.c: revision 1.64 via patch
distrib/utils/sysinst/mbr.c: revision 1.90 via patch
distrib/utils/sysinst/menus.mi: revision 1.45-1.46 via patch
distrib/utils/sysinst/msg.mbr.de: revision 1.12 via patch
distrib/utils/sysinst/msg.mbr.en: revision 1.16-1.17 via patch
distrib/utils/sysinst/msg.mbr.es: revision 1.7 via patch
distrib/utils/sysinst/msg.mbr.fr: revision 1.18-1.19 via patch
distrib/utils/sysinst/msg.mbr.pl: revision 1.15-1.16 via patch
distrib/utils/sysinst/msg.mi.de: revision 1.62-1.67 via patch
distrib/utils/sysinst/msg.mi.en: revision 1.170-1.172 via patch
distrib/utils/sysinst/msg.mi.es: revision 1.40-1.43 via patch
distrib/utils/sysinst/msg.mi.fr: revision 1.120-1.126 via patch
distrib/utils/sysinst/msg.mi.pl: revision 1.79-1.83 via patch
distrib/utils/sysinst/net.c: revision 1.131-1.132 via patch
distrib/utils/sysinst/run.c: revision 1.70 via patch
distrib/utils/sysinst/target.c: revision 1.55 via patch
distrib/utils/sysinst/util.c: revision 1.174-1.178 via patch
distrib/utils/sysinst/arch/evbarm/msg.md.de: revision 1.10-1.11 via 
patch
distrib/utils/sysinst/arch/evbmips/md.c: revision 1.10 via patch
distrib/utils/sysinst/arch/hp300/msg.md.de: revision 1.6-1.7 via patch
distrib/utils/sysinst/arch/hp300/msg.md.en: revision 1.9 via patch
distrib/utils/sysinst/arch/hp300/msg.md.es: revision 1.5 via patch
distrib/utils/sysinst/arch/hp300/msg.md.fr: revision 1.8 via patch
distrib/utils/sysinst/arch/hp300/msg.md.pl: revision 1.8 via patch
distrib/utils/sysinst/arch/i386/msg.md.en: revision 1.62-1.63 via patch
distrib/utils/sysinst/arch/i386/msg.md.es: revision 1.14 via patch
distrib/utils/sysinst/arch/i386/msg.md.de: revision 1.23

Sync sysinst with -current as of 2011-05-17
Add new post-install configuration menu for sysinst, and apply numerous
bug fixes.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.2.2.2 src/distrib/utils/sysinst/checkrc.c
cvs rdiff -u -r0 -r1.5.2.2 src/distrib/utils/sysinst/configmenu.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/distrib/utils/sysinst/checkrc.c
diff -u /dev/null src/distrib/utils/sysinst/checkrc.c:1.2.2.2
--- /dev/null	Fri May 18 02:28:52 2012
+++ src/distrib/utils/sysinst/checkrc.c	Fri May 18 02:28:52 2012
@@ -0,0 +1,117 @@
+/* $NetBSD: checkrc.c,v 1.2.2.2 2012/05/18 02:28:52 sborrill Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jeffrey C. Rizzo
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION 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.
+ */
+
+/* checkrc.c -- Create a script on the target to check the state of
+ * its rc.conf variables. */
+
+#include curses.h
+#include err.h
+#include stdio.h
+#include defs.h
+#include msg_defs.h
+#include menu_defs.h
+
+#define