CVS commit: src/lib/libisns

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Sun Jan 16 08:00:01 UTC 2011

Modified Files:
src/lib/libisns: isns.3

Log Message:
Typo fixes, use more markup.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/lib/libisns/isns.3

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

Modified files:

Index: src/lib/libisns/isns.3
diff -u src/lib/libisns/isns.3:1.1.1.1 src/lib/libisns/isns.3:1.2
--- src/lib/libisns/isns.3:1.1.1.1	Sun Jan 16 01:22:50 2011
+++ src/lib/libisns/isns.3	Sun Jan 16 08:00:01 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: isns.3,v 1.1.1.1 2011/01/16 01:22:50 agc Exp $
+.\ $NetBSD: isns.3,v 1.2 2011/01/16 08:00:01 wiz Exp $
 .\
 .\ Copyright (c) 2004,2009 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -76,7 +76,7 @@
 .Nm
 does not currently support receipt of iSNS Heartbeat messages, State Change
 Notification (SCN) messages, or Entity Status Inquiry (ESI) messages.
-.Sh INITILAIZATION
+.Sh INITIALIZATION
 An iSNS client that uses
 .Nm
 must call
@@ -86,12 +86,16 @@
 as such should only be called when thread creation is appropriate (such
 as after a daemonized program forks).
 .Pp
-The value passed as 'is_server' is used to set iSNSP message format Flags
+The value passed as
+.Ar is_server
+is used to set iSNSP message format Flags
 Sender is the iSNS client (bit position 16) and Sender is the iSNS server
 (bit position 17).
 For now the value 0 (zero) should be passed for
-'is_server'.
-The value returned in 'h' should be considered opaque by the caller.
+.Ar is_server .
+The value returned in
+.Ar h
+should be considered opaque by the caller.
 This value is passed unchanged to
 .Fn isns_add_servercon ,
 .Fn isns_init_reg_refresh ,
@@ -110,8 +114,11 @@
 server to which iSNSP queries and requests are to be sent.
 This routine should not be called by a program acting as an iSNS server.
 .Pp
-A connected TCP socket descriptor is passed as parameter 'fd'.
-Parameter 'ai' is the address of the remote TCP endpoint.
+A connected TCP socket descriptor is passed as parameter
+.Ar fd .
+Parameter
+.Ar ai
+is the address of the remote TCP endpoint.
 It is included so that reconnection may be attempted by
 .Nm
 in the event that the TCP connection is broken.
@@ -124,20 +131,30 @@
 .Nm
 to refresh registrations on behalf of the iSNS client.
 .Pp
-Parameter 'node' is the iSCSI Name attribute used for the periodic queries.
+Parameter
+.Ar node
+is the
+.Dq iSCSI Name
+attribute used for the periodic queries.
 It should be the name of an iSCSI node within the registered iSNS entity.
-The desired refresh interval, in seconds, is passed in parameter 'interval'.
+The desired refresh interval, in seconds, is passed in parameter
+.Ar interval .
 .Sh TRANSACTIONS
 .Fn isns_new_trans
 creates new iSNS transactions.
 .Pp
-Parameter 'func_id' is used as the iSNSP message id.
-Parameter 'pdu_flags' is used to set iSNSP message format Flags and is
+Parameter
+.Ar func_id
+is used as the iSNSP message id.
+Parameter
+.Ar pdu_flags
+is used to set iSNSP message format Flags and is
 exposed to allow callers to set flag Replace flag (bit position 19).
 This provides callers with a way
 to specify whether a Device Attribute Registration Request is intended to
-update or replace an existing registration.  This is currently the only use
-defined for parameter 'pdu_flags'.
+update or replace an existing registration.
+This is currently the only use defined for parameter
+.Ar pdu_flags .
 .Pp
 Once a new transaction has been created, callers can specify iSNS attributes
 used for registration and query requests.
@@ -146,9 +163,15 @@
 or
 .Fn isns_add_string .
 .Pp
-Parameter 'tag' is the iSNS Tag corresponding to the attribute being added.
-Parameter 'data_len' is the length of the attribute value.
-Parameter 'data_p' references the attribute value.
+Parameter
+.Ar tag
+is the iSNS Tag corresponding to the attribute being added.
+Parameter
+.Ar data_len
+is the length of the attribute value.
+Parameter
+.Ar data_p
+references the attribute value.
 The caller does not need to handle iSNS attribute 4-byte alignment requirements.
 This is handled by the iSNS environment on behalf of the caller.
 .Fn isns_add_string
@@ -163,22 +186,36 @@
 supports bounded waits.
 Successful waits, those that do not time out, return the iSNSP response
 status code received in the iSNSP response message.
-If a wait does time out, the value of 'status_p' is undefined.
+If a wait does time out, the value of
+.Ar status_p
+is undefined.
 Callers that do not need to wait for returned data can simply
-pass NULL for parameter 'timeout_p'.
-Callers should set parameter 'status_p' to NULL if not waiting.
+pass
+.Dv NULL
+for parameter
+.Ar timeout_p .
+Callers should set parameter
+.Ar status_p
+to
+.Dv NULL
+if not waiting.
 .Pp
 .Fn isns_get_tlv
 is used to retrieve TLV data returned in a transaction.
 The first call to
 .Fn isns_get_tlv
-should pass 

CVS commit: src/sys/dev/usb

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sun Jan 16 08:58:03 UTC 2011

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

Log Message:
Add CyberTAN ZD1211B. From OpenBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.575 -r1.576 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.575 src/sys/dev/usb/usbdevs:1.576
--- src/sys/dev/usb/usbdevs:1.575	Sun Jan  9 14:30:36 2011
+++ src/sys/dev/usb/usbdevs	Sun Jan 16 08:58:03 2011
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.575 2011/01/09 14:30:36 is Exp $
+$NetBSD: usbdevs,v 1.576 2011/01/16 08:58:03 tsutsui Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1056,6 +1056,7 @@
 
 /* CyberTAN Technology products */
 product CYBERTAN TG54USB	0x1666	TG54USB
+product CYBERTAN ZD1211B	0x1667	ZD1211B
 product CYBERTAN RT2870		0x1828	RT2870
 
 /* Cypress Semiconductor products */

CVS commit: src/sys/dev/usb

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sun Jan 16 08:59:09 UTC 2011

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

Log Message:
Regen from usbdevs rev 1.576:
 Add CyberTAN ZD1211B. From OpenBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.568 -r1.569 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.569 -r1.570 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.568 src/sys/dev/usb/usbdevs.h:1.569
--- src/sys/dev/usb/usbdevs.h:1.568	Sun Jan  9 14:32:36 2011
+++ src/sys/dev/usb/usbdevs.h	Sun Jan 16 08:59:08 2011
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs.h,v 1.568 2011/01/09 14:32:36 is Exp $	*/
+/*	$NetBSD: usbdevs.h,v 1.569 2011/01/16 08:59:08 tsutsui Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.575 2011/01/09 14:30:36 is Exp
+ *	NetBSD: usbdevs,v 1.576 2011/01/16 08:58:03 tsutsui Exp
  */
 
 /*
@@ -1063,6 +1063,7 @@
 
 /* CyberTAN Technology products */
 #define	USB_PRODUCT_CYBERTAN_TG54USB	0x1666		/* TG54USB */
+#define	USB_PRODUCT_CYBERTAN_ZD1211B	0x1667		/* ZD1211B */
 #define	USB_PRODUCT_CYBERTAN_RT2870	0x1828		/* RT2870 */
 
 /* Cypress Semiconductor products */

Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.569 src/sys/dev/usb/usbdevs_data.h:1.570
--- src/sys/dev/usb/usbdevs_data.h:1.569	Sun Jan  9 14:32:36 2011
+++ src/sys/dev/usb/usbdevs_data.h	Sun Jan 16 08:59:08 2011
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs_data.h,v 1.569 2011/01/09 14:32:36 is Exp $	*/
+/*	$NetBSD: usbdevs_data.h,v 1.570 2011/01/16 08:59:08 tsutsui Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.575 2011/01/09 14:30:36 is Exp
+ *	NetBSD: usbdevs,v 1.576 2011/01/16 08:58:03 tsutsui Exp
  */
 
 /*
@@ -3367,6 +3367,10 @@
 	TG54USB,
 	},
 	{
+	USB_VENDOR_CYBERTAN, USB_PRODUCT_CYBERTAN_ZD1211B,
+	ZD1211B,
+	},
+	{
 	USB_VENDOR_CYBERTAN, USB_PRODUCT_CYBERTAN_RT2870,
 	RT2870,
 	},
@@ -8399,4 +8403,4 @@
 	Prestige,
 	},
 };
-const int usb_nproducts = 1599;
+const int usb_nproducts = 1600;

CVS commit: src/sys/dev/usb

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sun Jan 16 09:08:29 UTC 2011

Modified Files:
src/sys/dev/usb: if_zyd.c if_zydreg.h

Log Message:
Pull AL2230S radio support for chips:
   zyd0: sorry, radio PV2000 is not supported yet
   zyd0: could not attach RF
mentioned in PR kern/43125. From (FreeBSD via) OpenBSD.

Untested (no hardware here), but should not affect other chips.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/usb/if_zyd.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/usb/if_zydreg.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/if_zyd.c
diff -u src/sys/dev/usb/if_zyd.c:1.27 src/sys/dev/usb/if_zyd.c:1.28
--- src/sys/dev/usb/if_zyd.c:1.27	Wed Nov  3 22:28:31 2010
+++ src/sys/dev/usb/if_zyd.c	Sun Jan 16 09:08:29 2011
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $	*/
-/*	$NetBSD: if_zyd.c,v 1.27 2010/11/03 22:28:31 dyoung Exp $	*/
+/*	$NetBSD: if_zyd.c,v 1.28 2011/01/16 09:08:29 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 2006 by Damien Bergamini damien.bergam...@free.fr
@@ -22,7 +22,7 @@
  * ZyDAS ZD1211/ZD1211B USB WLAN driver.
  */
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_zyd.c,v 1.27 2010/11/03 22:28:31 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_zyd.c,v 1.28 2011/01/16 09:08:29 tsutsui Exp $);
 
 
 #include sys/param.h
@@ -124,6 +124,7 @@
 	ZYD_ZD1211B_DEV(BELKIN,		F5D7050C),
 	ZYD_ZD1211B_DEV(BELKIN,		ZD1211B),
 	ZYD_ZD1211B_DEV(CISCOLINKSYS,	WUSBF54G),
+	ZYD_ZD1211B_DEV(CYBERTAN,	ZD1211B),
 	ZYD_ZD1211B_DEV(FIBERLINE,	WL430U),
 	ZYD_ZD1211B_DEV(MELCO,		KG54L),
 	ZYD_ZD1211B_DEV(PHILIPS,	SNU5600),
@@ -997,6 +998,7 @@
 #define N(a)	(sizeof (a) / sizeof ((a)[0]))
 	struct zyd_softc *sc = rf-rf_sc;
 	static const struct zyd_phy_pair phyini[] = ZYD_AL2230_PHY;
+	static const struct zyd_phy_pair phy2230s[] = ZYD_AL2230S_PHY_INIT;
 	static const uint32_t rfini[] = ZYD_AL2230_RF;
 	int i, error;
 
@@ -1007,6 +1009,15 @@
 			return error;
 	}
 
+	if (sc-rf_rev == ZYD_RF_AL2230S) {
+		for (i = 0; i  N(phy2230s); i++) {
+			error = zyd_write16(sc, phy2230s[i].reg,
+			phy2230s[i].val);
+			if (error != 0)
+return error;
+		}
+	}
+
 	/* init AL2230 radio */
 	for (i = 0; i  N(rfini); i++) {
 		if ((error = zyd_rfwrite(sc, rfini[i])) != 0)
@@ -1474,6 +1485,7 @@
 		rf-width= 24;	/* 24-bit RF values */
 		break;
 	case ZYD_RF_AL2230:
+	case ZYD_RF_AL2230S:
 		if (sc-mac_rev == ZYD_ZD1211B)
 			rf-init = zyd_al2230_init_b;
 		else
@@ -1526,7 +1538,7 @@
 	static const char * const zyd_rfs[] = {
 		unknown, unknown, UW2451,   UCHIP, AL2230,
 		AL7230B, THETA,   AL2210,   MAXIM_NEW, GCT,
-		PV2000,  RALINK,  INTERSIL, RFMD,  MAXIM_NEW2,
+		AL2230S, RALINK,  INTERSIL, RFMD,  MAXIM_NEW2,
 		PHILIPS
 	};
 

Index: src/sys/dev/usb/if_zydreg.h
diff -u src/sys/dev/usb/if_zydreg.h:1.5 src/sys/dev/usb/if_zydreg.h:1.6
--- src/sys/dev/usb/if_zydreg.h:1.5	Wed Nov  3 22:30:50 2010
+++ src/sys/dev/usb/if_zydreg.h	Sun Jan 16 09:08:29 2011
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_zydreg.h,v 1.19 2006/11/30 19:28:07 damien Exp $	*/
-/*	$NetBSD: if_zydreg.h,v 1.5 2010/11/03 22:30:50 dyoung Exp $	*/
+/*	$NetBSD: if_zydreg.h,v 1.6 2011/01/16 09:08:29 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 2006 by Damien Bergamini damien.bergam...@free.fr
@@ -160,7 +160,7 @@
 #define ZYD_RF_AL2210		0x7
 #define ZYD_RF_MAXIM_NEW	0x8
 #define ZYD_RF_GCT		0x9
-#define ZYD_RF_PV2000		0xa	/* not supported yet */
+#define ZYD_RF_AL2230S		0xa
 #define ZYD_RF_RALINK		0xb	/* not supported yet */
 #define ZYD_RF_INTERSIL		0xc	/* not supported yet */
 #define ZYD_RF_RFMD		0xd
@@ -638,6 +638,14 @@
 	{ ZYD_CR252, 0x00 }, { ZYD_CR253, 0x00 }			\
 }
 
+#define	ZYD_AL2230S_PHY_INIT		\
+{	\
+	{ ZYD_CR47,  0x1e }, { ZYD_CR106, 0x22 }, { ZYD_CR107, 0x2a },	\
+	{ ZYD_CR109, 0x13 }, { ZYD_CR118, 0xf8 }, { ZYD_CR119, 0x12 },	\
+	{ ZYD_CR122, 0xe0 }, { ZYD_CR128, 0x10 }, { ZYD_CR129, 0x0e },	\
+	{ ZYD_CR130, 0x10 }		\
+}
+
 #define ZYD_AL2230_RF			\
 {	\
 	0x03f790, 0x01, 0x0d, 0x0b3331, 0x03b812, 0x00fff3,	\

CVS commit: src/sys/arch/mips/mips

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sun Jan 16 09:50:45 UTC 2011

Modified Files:
src/sys/arch/mips/mips: cpu_exec.c

Log Message:
Make pre-2.0 ELF binaries (with gcc-2.95.3/binutils-2.11.2) actually work
with options COMPAT_16.
Tested on R3000 pmax and R5000 sgimips, closes PR port-mips/44375.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/mips/mips/cpu_exec.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/mips/mips/cpu_exec.c
diff -u src/sys/arch/mips/mips/cpu_exec.c:1.59 src/sys/arch/mips/mips/cpu_exec.c:1.60
--- src/sys/arch/mips/mips/cpu_exec.c:1.59	Mon Dec 14 04:09:38 2009
+++ src/sys/arch/mips/mips/cpu_exec.c	Sun Jan 16 09:50:44 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu_exec.c,v 1.59 2009/12/14 04:09:38 mrg Exp $	*/
+/*	$NetBSD: cpu_exec.c,v 1.60 2011/01/16 09:50:44 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -35,7 +35,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu_exec.c,v 1.59 2009/12/14 04:09:38 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu_exec.c,v 1.60 2011/01/16 09:50:44 tsutsui Exp $);
 
 #include opt_compat_netbsd.h
 #include opt_compat_ultrix.h
@@ -291,12 +291,14 @@
 			printf(pid %d(%s): ABI set to N32 (e_flags=%#x)\n, p-p_pid, p-p_comm, eh-e_flags);
 		break;
 #endif
-	case EF_MIPS_ABI_O32:
-		itp_suffix = o32;
-		p-p_md.md_abi = _MIPS_BSD_API_O32;
 #ifdef COMPAT_16
+	case 0:
 		*start_p = ELF32_LINK_ADDR;
+		/* FALLTHROUGH */
 #endif
+	case EF_MIPS_ABI_O32:
+		itp_suffix = o32;
+		p-p_md.md_abi = _MIPS_BSD_API_O32;
 		if (old_abi != p-p_md.md_abi)
 			printf(pid %d(%s): ABI set to O32 (e_flags=%#x)\n, p-p_pid, p-p_comm, eh-e_flags);
 		break;

CVS commit: src/common/lib/libc/arch/hppa/atomic

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sun Jan 16 12:07:27 UTC 2011

Modified Files:
src/common/lib/libc/arch/hppa/atomic: atomic_cas_up.S

Log Message:
Fix RCSId.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/arch/hppa/atomic/atomic_cas_up.S

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

Modified files:

Index: src/common/lib/libc/arch/hppa/atomic/atomic_cas_up.S
diff -u src/common/lib/libc/arch/hppa/atomic/atomic_cas_up.S:1.1 src/common/lib/libc/arch/hppa/atomic/atomic_cas_up.S:1.2
--- src/common/lib/libc/arch/hppa/atomic/atomic_cas_up.S:1.1	Mon Aug 11 21:54:51 2008
+++ src/common/lib/libc/arch/hppa/atomic/atomic_cas_up.S	Sun Jan 16 12:07:26 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD $	*/
+/*	$NetBSD: atomic_cas_up.S,v 1.2 2011/01/16 12:07:26 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.

CVS commit: [netbsd-5] src

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 12:38:28 UTC 2011

Modified Files:
src/sbin/fsck_ext2fs [netbsd-5]: inode.c setup.c
src/sbin/newfs_ext2fs [netbsd-5]: mke2fs.c newfs_ext2fs.8
newfs_ext2fs.c
src/sys/lib/libsa [netbsd-5]: ext2fs.c
src/sys/ufs/ext2fs [netbsd-5]: ext2fs_dinode.h ext2fs_inode.c
ext2fs_vfsops.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1486):
sbin/fsck_ext2fs/setup.c: revision 1.26
sbin/newfs_ext2fs/mke2fs.c: revision 1.10
sbin/newfs_ext2fs/mke2fs.c: revision 1.11
sbin/newfs_ext2fs/mke2fs.c: revision 1.12
sbin/fsck_ext2fs/inode.c: revision 1.24
sys/lib/libsa/ext2fs.c: revision 1.6
sbin/newfs_ext2fs/extern.h: revision 1.3
sbin/fsck_ext2fs/inode.c: revision 1.25
sys/lib/libsa/ext2fs.c: revision 1.7
sbin/fsck_ext2fs/inode.c: revision 1.26
sys/ufs/ext2fs/ext2fs_inode.c: revision 1.68
sbin/fsck_ext2fs/inode.c: revision 1.27
sbin/fsck_ext2fs/inode.c: revision 1.28
sys/ufs/ext2fs/ext2fs_dinode.h: revision 1.18
sys/ufs/ext2fs/ext2fs_dinode.h: revision 1.19
sbin/newfs_ext2fs/newfs_ext2fs.c: revision 1.5
sbin/newfs_ext2fs/newfs_ext2fs.8: revision 1.2
sbin/newfs_ext2fs/newfs_ext2fs.c: revision 1.6
sbin/newfs_ext2fs/newfs_ext2fs.8: revision 1.3
sys/ufs/ext2fs/ext2fs_vfsops.c: revision 1.142
sbin/newfs_ext2fs/newfs_ext2fs.c: revision 1.7
sbin/newfs_ext2fs/newfs_ext2fs.8: revision 1.4
sbin/newfs_ext2fs/newfs_ext2fs.c: revision 1.8
PR/40936: Frederik Sausmikat: ext2fs: add support for inodes  128 bytes
Support variable inode sizes.
catch up with variable inode size.
Don't use e2fs_inode_size in superblock on E2FS_REV0 file system.
- accept only EXT2_REV0_DINODE_SIZE inodesize on -O 0
- use inodesize to get offset of inode, not struct ext2fs_dinode array
Replace a magic number with a new EXT2_REV0_DINODE_SIZE macro.
Use EXT2_DINODE_SIZE() to get offset of inode, not struct ext2fs_dinode array.
Fix botched logic in inodesize check.
Use inodesize to get offset of inode in one more place.
- add a sanity check for e2fs_inode_size in readsb()
- use EXT2_DINODE_SIZE() rather than sizeof(struct ext2fs_dinode) or
  struct ext2fs_dinode array/pointer to see e2fs_ipb and inode offsets
Sort options.
New sentence, new line.
Sort options in usage.
- unsigned - unsigned int
- remove unnecessary casts from malloc(3) and free(3)
- fix a bogus indent
Use size  INT32_MAX rather than size = 0x8000U to check 2GB limit.
Add missed byteswap ops against ext2fs_dinode members.
Handle 32 bit uid field on E2FS_REV1.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.2.1 src/sbin/fsck_ext2fs/inode.c
cvs rdiff -u -r1.25 -r1.25.6.1 src/sbin/fsck_ext2fs/setup.c
cvs rdiff -u -r1.9 -r1.9.2.1 src/sbin/newfs_ext2fs/mke2fs.c
cvs rdiff -u -r1.1 -r1.1.16.1 src/sbin/newfs_ext2fs/newfs_ext2fs.8
cvs rdiff -u -r1.4 -r1.4.2.1 src/sbin/newfs_ext2fs/newfs_ext2fs.c
cvs rdiff -u -r1.4 -r1.4.36.1 src/sys/lib/libsa/ext2fs.c
cvs rdiff -u -r1.16.28.1 -r1.16.28.2 src/sys/ufs/ext2fs/ext2fs_dinode.h
cvs rdiff -u -r1.66.8.1 -r1.66.8.2 src/sys/ufs/ext2fs/ext2fs_inode.c
cvs rdiff -u -r1.137.6.5 -r1.137.6.6 src/sys/ufs/ext2fs/ext2fs_vfsops.c

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

Modified files:

Index: src/sbin/fsck_ext2fs/inode.c
diff -u src/sbin/fsck_ext2fs/inode.c:1.23 src/sbin/fsck_ext2fs/inode.c:1.23.2.1
--- src/sbin/fsck_ext2fs/inode.c:1.23	Thu Oct  9 16:56:23 2008
+++ src/sbin/fsck_ext2fs/inode.c	Sun Jan 16 12:38:27 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: inode.c,v 1.23 2008/10/09 16:56:23 christos Exp $	*/
+/*	$NetBSD: inode.c,v 1.23.2.1 2011/01/16 12:38:27 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -63,7 +63,7 @@
 #if 0
 static char sccsid[] = @(#)inode.c	8.5 (Berkeley) 2/8/95;
 #else
-__RCSID($NetBSD: inode.c,v 1.23 2008/10/09 16:56:23 christos Exp $);
+__RCSID($NetBSD: inode.c,v 1.23.2.1 2011/01/16 12:38:27 bouyer Exp $);
 #endif
 #endif /* not lint */
 
@@ -127,7 +127,7 @@
 
 	if ((fs2h16(dp-e2di_mode)  IFMT) == IFREG)
 		size |= (u_int64_t)fs2h32(dp-e2di_dacl)  32;
-	if (size = 0x8000U)
+	if (size  INT32_MAX)
 		(void)setlarge();
 	return size;
 }
@@ -137,10 +137,10 @@
 {
 	if ((fs2h16(dp-e2di_mode)  IFMT) == IFREG) {
 		dp-e2di_dacl = h2fs32(size  32);
-		if (size = 0x8000U)
+		if (size  INT32_MAX)
 			if (!setlarge())
 return;
-	} else if (size = 0x8000U) {
+	} else if (size  INT32_MAX) {
 		pfatal(TRYING TO SET FILESIZE TO %llu ON MODE %x FILE\n,
 		(unsigned long long)size, fs2h16(dp-e2di_mode)  IFMT);
 		return;
@@ -169,7 +169,7 @@
 	dino = *dp;
 	ndb = howmany(inosize(dino), sblock.e2fs_bsize);
 	for (ap = dino.e2di_blocks[0]; ap  dino.e2di_blocks[NDADDR];
-ap++,ndb--) {
+	ap++,ndb--) {
 		

CVS commit: [netbsd-5] src/sys/dev/usb

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 12:40:22 UTC 2011

Modified Files:
src/sys/dev/usb [netbsd-5]: ukbd.c

Log Message:
Pull up following revision(s) (requested by mbalmer in ticket #1513):
sys/dev/usb/ukbd.c: revision 1.110
Cap h.loc.count at MAXKEYCODE instead of bailing out.  This lets some obscure/
roque keyboards attach.
From logana...@devio.us (Loganaden Velvindron), thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.101.4.1 -r1.101.4.2 src/sys/dev/usb/ukbd.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/dev/usb/ukbd.c
diff -u src/sys/dev/usb/ukbd.c:1.101.4.1 src/sys/dev/usb/ukbd.c:1.101.4.2
--- src/sys/dev/usb/ukbd.c:1.101.4.1	Sun Feb 14 13:58:32 2010
+++ src/sys/dev/usb/ukbd.c	Sun Jan 16 12:40:22 2011
@@ -1,4 +1,4 @@
-/*  $NetBSD: ukbd.c,v 1.101.4.1 2010/02/14 13:58:32 bouyer Exp $*/
+/*  $NetBSD: ukbd.c,v 1.101.4.2 2011/01/16 12:40:22 bouyer Exp $*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ukbd.c,v 1.101.4.1 2010/02/14 13:58:32 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: ukbd.c,v 1.101.4.2 2011/01/16 12:40:22 bouyer Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -869,7 +869,7 @@
 			if (h.loc.size != 8)
 return (key code size != 8);
 			if (h.loc.count  MAXKEYCODE)
-return (too many key codes);
+h.loc.count = MAXKEYCODE;
 			if (h.loc.pos % 8 != 0)
 return (key codes not on byte boundary);
 			if (sc-sc_nkeycode != 0)

CVS commit: [netbsd-5] src/etc/ssh

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 12:43:04 UTC 2011

Modified Files:
src/etc/ssh [netbsd-5]: ssh_known_hosts

Log Message:
Pull up following revision(s) (requested by riz in ticket #1516):
etc/ssh/ssh_known_hosts: revision 1.6
releng has been on mollari for a while now. Also, add wiki


To generate a diff of this commit:
cvs rdiff -u -r1.4.26.1 -r1.4.26.2 src/etc/ssh/ssh_known_hosts

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

Modified files:

Index: src/etc/ssh/ssh_known_hosts
diff -u src/etc/ssh/ssh_known_hosts:1.4.26.1 src/etc/ssh/ssh_known_hosts:1.4.26.2
--- src/etc/ssh/ssh_known_hosts:1.4.26.1	Sun Aug 30 02:49:08 2009
+++ src/etc/ssh/ssh_known_hosts	Sun Jan 16 12:43:04 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: ssh_known_hosts,v 1.4.26.1 2009/08/30 02:49:08 snj Exp $
+#	$NetBSD: ssh_known_hosts,v 1.4.26.2 2011/01/16 12:43:04 bouyer Exp $
 #
 anoncvs.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA3QiBl8leG9fqIJpKeNov0PKq5YryFFiroMWOPUv4hDFn8R0jC07YVaR/OSBrr37CTmGX5AFceXPzoFnLlwCqWR7rXg4NR75FTlTp9CG9EBAEtU8mee27KDrUFBTZdfVl2+aRYoAI5fTXA+0vpIO68Cq843vRWUZCcwinS4cNLUU=
 
@@ -8,13 +8,13 @@
 
 mail.netbsd.org,homeworld.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAt8UJLhW8iou8Ack7V5XrzfCgzOkdK75+xDZePMBPg+CYDLnHbP1+KQaSrvfnvDzCvgOUXHOkGji1jbrtzDYwv7Itw0hRUo7TxR99c3bTomb9U0vWV5k4FDIyz4xJXWBJMVkKseAWAXgnc5FSdB6V/e21TAISJBl9dolhqOGVsxM=
 
-www.netbsd.org,www4.netbsd.org,gnats.netbsd.org,releng.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAyBrlCbbZ2lQxWt7c9Ru0byoOktalLWKJ4t0kzWp6C2oVa+Ll1c1TO2FJb34DCZqULfSHaMmKgq647d75npk9GeXXLk8QwcX6kNl7QFnHo7GUHnHtiZAjTMbYmYOaNLi1PjwyQH+9yeRQYsGW7xejTsyK0yuRKROdCl/QU9gkB3s=
+www.netbsd.org,www4.netbsd.org,gnats.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAyBrlCbbZ2lQxWt7c9Ru0byoOktalLWKJ4t0kzWp6C2oVa+Ll1c1TO2FJb34DCZqULfSHaMmKgq647d75npk9GeXXLk8QwcX6kNl7QFnHo7GUHnHtiZAjTMbYmYOaNLi1PjwyQH+9yeRQYsGW7xejTsyK0yuRKROdCl/QU9gkB3s=
 
 pkgbuild.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAz2c3dFuPdL75gpvwiYinwQ5jiRlfe3HvbXbMkTvpZxLFBQWTVkcDr/yd+vCiWcqVKVENX2tIvT91gPM9/iw7Wl82rxZ54jjaL0pWPL0yjSVhSFxff9pH+as5hgX4l1HjmXLB6v+MWyYVmOSpB01NfVVV2Z9+BGp3Y7i+U5pCdf0=
 
 build.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAzmmcuzoX0D/qDFdDJDyRgQGkUaNTEu7GdruMg1N+ajqvEoKQHQEEBrMdDbeYqCUYacHyhTRMrP6vZ27iX90rl9iS1lR2iPHp/mbnf+iV/BzdWROPvJWxp9/Am/DrYL+Idah5AYNnkC7fon9n+BeMqPDXYGYl/U+dAzp+8GHPhRc=
 
-blog.netbsd.org,rt.netbsd.org,monitor.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0=
+blog.netbsd.org,rt.netbsd.org,monitor.netbsd.org,releng.netbsd.org,wiki.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0=
 
 mollari.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0=
 

CVS commit: [netbsd-5-0] src/etc/ssh

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 12:43:12 UTC 2011

Modified Files:
src/etc/ssh [netbsd-5-0]: ssh_known_hosts

Log Message:
Pull up following revision(s) (requested by riz in ticket #1516):
etc/ssh/ssh_known_hosts: revision 1.6
releng has been on mollari for a while now. Also, add wiki


To generate a diff of this commit:
cvs rdiff -u -r1.4.30.1 -r1.4.30.2 src/etc/ssh/ssh_known_hosts

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

Modified files:

Index: src/etc/ssh/ssh_known_hosts
diff -u src/etc/ssh/ssh_known_hosts:1.4.30.1 src/etc/ssh/ssh_known_hosts:1.4.30.2
--- src/etc/ssh/ssh_known_hosts:1.4.30.1	Sun Aug 30 02:47:07 2009
+++ src/etc/ssh/ssh_known_hosts	Sun Jan 16 12:43:12 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: ssh_known_hosts,v 1.4.30.1 2009/08/30 02:47:07 snj Exp $
+#	$NetBSD: ssh_known_hosts,v 1.4.30.2 2011/01/16 12:43:12 bouyer Exp $
 #
 anoncvs.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA3QiBl8leG9fqIJpKeNov0PKq5YryFFiroMWOPUv4hDFn8R0jC07YVaR/OSBrr37CTmGX5AFceXPzoFnLlwCqWR7rXg4NR75FTlTp9CG9EBAEtU8mee27KDrUFBTZdfVl2+aRYoAI5fTXA+0vpIO68Cq843vRWUZCcwinS4cNLUU=
 
@@ -8,13 +8,13 @@
 
 mail.netbsd.org,homeworld.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAt8UJLhW8iou8Ack7V5XrzfCgzOkdK75+xDZePMBPg+CYDLnHbP1+KQaSrvfnvDzCvgOUXHOkGji1jbrtzDYwv7Itw0hRUo7TxR99c3bTomb9U0vWV5k4FDIyz4xJXWBJMVkKseAWAXgnc5FSdB6V/e21TAISJBl9dolhqOGVsxM=
 
-www.netbsd.org,www4.netbsd.org,gnats.netbsd.org,releng.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAyBrlCbbZ2lQxWt7c9Ru0byoOktalLWKJ4t0kzWp6C2oVa+Ll1c1TO2FJb34DCZqULfSHaMmKgq647d75npk9GeXXLk8QwcX6kNl7QFnHo7GUHnHtiZAjTMbYmYOaNLi1PjwyQH+9yeRQYsGW7xejTsyK0yuRKROdCl/QU9gkB3s=
+www.netbsd.org,www4.netbsd.org,gnats.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAyBrlCbbZ2lQxWt7c9Ru0byoOktalLWKJ4t0kzWp6C2oVa+Ll1c1TO2FJb34DCZqULfSHaMmKgq647d75npk9GeXXLk8QwcX6kNl7QFnHo7GUHnHtiZAjTMbYmYOaNLi1PjwyQH+9yeRQYsGW7xejTsyK0yuRKROdCl/QU9gkB3s=
 
 pkgbuild.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAz2c3dFuPdL75gpvwiYinwQ5jiRlfe3HvbXbMkTvpZxLFBQWTVkcDr/yd+vCiWcqVKVENX2tIvT91gPM9/iw7Wl82rxZ54jjaL0pWPL0yjSVhSFxff9pH+as5hgX4l1HjmXLB6v+MWyYVmOSpB01NfVVV2Z9+BGp3Y7i+U5pCdf0=
 
 build.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAzmmcuzoX0D/qDFdDJDyRgQGkUaNTEu7GdruMg1N+ajqvEoKQHQEEBrMdDbeYqCUYacHyhTRMrP6vZ27iX90rl9iS1lR2iPHp/mbnf+iV/BzdWROPvJWxp9/Am/DrYL+Idah5AYNnkC7fon9n+BeMqPDXYGYl/U+dAzp+8GHPhRc=
 
-blog.netbsd.org,rt.netbsd.org,monitor.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0=
+blog.netbsd.org,rt.netbsd.org,monitor.netbsd.org,releng.netbsd.org,wiki.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0=
 
 mollari.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0=
 

CVS commit: [netbsd-5-1] src/etc/ssh

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 12:43:16 UTC 2011

Modified Files:
src/etc/ssh [netbsd-5-1]: ssh_known_hosts

Log Message:
Pull up following revision(s) (requested by riz in ticket #1516):
etc/ssh/ssh_known_hosts: revision 1.6
releng has been on mollari for a while now. Also, add wiki


To generate a diff of this commit:
cvs rdiff -u -r1.4.26.1 -r1.4.26.1.2.1 src/etc/ssh/ssh_known_hosts

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

Modified files:

Index: src/etc/ssh/ssh_known_hosts
diff -u src/etc/ssh/ssh_known_hosts:1.4.26.1 src/etc/ssh/ssh_known_hosts:1.4.26.1.2.1
--- src/etc/ssh/ssh_known_hosts:1.4.26.1	Sun Aug 30 02:49:08 2009
+++ src/etc/ssh/ssh_known_hosts	Sun Jan 16 12:43:15 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: ssh_known_hosts,v 1.4.26.1 2009/08/30 02:49:08 snj Exp $
+#	$NetBSD: ssh_known_hosts,v 1.4.26.1.2.1 2011/01/16 12:43:15 bouyer Exp $
 #
 anoncvs.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA3QiBl8leG9fqIJpKeNov0PKq5YryFFiroMWOPUv4hDFn8R0jC07YVaR/OSBrr37CTmGX5AFceXPzoFnLlwCqWR7rXg4NR75FTlTp9CG9EBAEtU8mee27KDrUFBTZdfVl2+aRYoAI5fTXA+0vpIO68Cq843vRWUZCcwinS4cNLUU=
 
@@ -8,13 +8,13 @@
 
 mail.netbsd.org,homeworld.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAt8UJLhW8iou8Ack7V5XrzfCgzOkdK75+xDZePMBPg+CYDLnHbP1+KQaSrvfnvDzCvgOUXHOkGji1jbrtzDYwv7Itw0hRUo7TxR99c3bTomb9U0vWV5k4FDIyz4xJXWBJMVkKseAWAXgnc5FSdB6V/e21TAISJBl9dolhqOGVsxM=
 
-www.netbsd.org,www4.netbsd.org,gnats.netbsd.org,releng.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAyBrlCbbZ2lQxWt7c9Ru0byoOktalLWKJ4t0kzWp6C2oVa+Ll1c1TO2FJb34DCZqULfSHaMmKgq647d75npk9GeXXLk8QwcX6kNl7QFnHo7GUHnHtiZAjTMbYmYOaNLi1PjwyQH+9yeRQYsGW7xejTsyK0yuRKROdCl/QU9gkB3s=
+www.netbsd.org,www4.netbsd.org,gnats.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAyBrlCbbZ2lQxWt7c9Ru0byoOktalLWKJ4t0kzWp6C2oVa+Ll1c1TO2FJb34DCZqULfSHaMmKgq647d75npk9GeXXLk8QwcX6kNl7QFnHo7GUHnHtiZAjTMbYmYOaNLi1PjwyQH+9yeRQYsGW7xejTsyK0yuRKROdCl/QU9gkB3s=
 
 pkgbuild.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAz2c3dFuPdL75gpvwiYinwQ5jiRlfe3HvbXbMkTvpZxLFBQWTVkcDr/yd+vCiWcqVKVENX2tIvT91gPM9/iw7Wl82rxZ54jjaL0pWPL0yjSVhSFxff9pH+as5hgX4l1HjmXLB6v+MWyYVmOSpB01NfVVV2Z9+BGp3Y7i+U5pCdf0=
 
 build.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAzmmcuzoX0D/qDFdDJDyRgQGkUaNTEu7GdruMg1N+ajqvEoKQHQEEBrMdDbeYqCUYacHyhTRMrP6vZ27iX90rl9iS1lR2iPHp/mbnf+iV/BzdWROPvJWxp9/Am/DrYL+Idah5AYNnkC7fon9n+BeMqPDXYGYl/U+dAzp+8GHPhRc=
 
-blog.netbsd.org,rt.netbsd.org,monitor.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0=
+blog.netbsd.org,rt.netbsd.org,monitor.netbsd.org,releng.netbsd.org,wiki.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0=
 
 mollari.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0=
 

CVS commit: [netbsd-5] src/sys/arch/amiga/include

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 12:45:30 UTC 2011

Modified Files:
src/sys/arch/amiga/include [netbsd-5]: vmparam.h

Log Message:
Pull up following revision(s) (requested by mhitch in ticket #1518):
sys/arch/amiga/include/vmparam.h: revision 1.41
Raise address of user stack to the highest safe (for 68040 mmu) address,
which increases available user address space by 256MB.  One file in
pkgsrc/lang/php53 was too large for the amiga.  Also remove an old
presumably outdated comment.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.36.30.1 src/sys/arch/amiga/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/amiga/include/vmparam.h
diff -u src/sys/arch/amiga/include/vmparam.h:1.36 src/sys/arch/amiga/include/vmparam.h:1.36.30.1
--- src/sys/arch/amiga/include/vmparam.h:1.36	Wed Oct 17 19:53:26 2007
+++ src/sys/arch/amiga/include/vmparam.h	Sun Jan 16 12:45:30 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.36 2007/10/17 19:53:26 garbled Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.36.30.1 2011/01/16 12:45:30 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -98,9 +98,8 @@
  * These are a mixture of i386, sun3 and hp settings.. 
  */
 
-/* Sun settings. Still hope, that I might get sun3 binaries to work... */
 #ifndef USRSTACK
-#define	USRSTACK	0x0E00
+#define	USRSTACK	0x1E00
 #endif
 #define KUSER_AREA	(-UPAGES*PAGE_SIZE)
 /*

CVS commit: [netbsd-5] src/distrib/sets/lists

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 12:48:10 UTC 2011

Modified Files:
src/distrib/sets/lists/xcomp [netbsd-5]: md.sparc
src/distrib/sets/lists/xserver [netbsd-5]: md.sparc

Log Message:
Apply patch, requested my mrg in ticket #1523:
distrib/sets/lists/xcomp/md.sparc:  patch
distrib/sets/lists/xserver/md.sparc:patch
update Xorg set lists for sparc


To generate a diff of this commit:
cvs rdiff -u -r1.4.14.2 -r1.4.14.3 src/distrib/sets/lists/xcomp/md.sparc
cvs rdiff -u -r1.27.2.1 -r1.27.2.2 src/distrib/sets/lists/xserver/md.sparc

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/xcomp/md.sparc
diff -u src/distrib/sets/lists/xcomp/md.sparc:1.4.14.2 src/distrib/sets/lists/xcomp/md.sparc:1.4.14.3
--- src/distrib/sets/lists/xcomp/md.sparc:1.4.14.2	Wed Mar 17 03:17:19 2010
+++ src/distrib/sets/lists/xcomp/md.sparc	Sun Jan 16 12:48:09 2011
@@ -1,4 +1,70 @@
-#	$NetBSD: md.sparc,v 1.4.14.2 2010/03/17 03:17:19 snj Exp $
+#	$NetBSD: md.sparc,v 1.4.14.3 2011/01/16 12:48:09 bouyer Exp $
+./usr/X11R7/man/cat3/XF86VM.0-unknown-	.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeDeleteModeLine.0	-unknown-	.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeGetAllModeLines.0	-unknown-	.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeGetDotClocks.0		-unknown-	.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeGetGamma.0		-unknown-	.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeGetGammaRamp.0		-unknown-	.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeGetGammaRampSize.0	-unknown-	.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeGetModeLine.0		-unknown-	.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeGetMonitor.0		-unknown-	.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeGetPermissions.0	-unknown-	.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeGetViewPort.0		-unknown-	.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeLockModeSwitch.0	-unknown-	.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeModModeLine.0		-unknown-	.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeQueryExtension.0	-unknown-	.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeQueryVersion.0		-unknown-	.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeSetClientVersion.0	-unknown-	.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeSetGamma.0		-unknown-	.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeSetGammaRamp.0		-unknown-	.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeSetViewPort.0		-unknown-	.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeSwitchMode.0		-unknown-	.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeSwitchToMode.0		-unknown-	.cat,xorg
+./usr/X11R7/man/cat3/XF86VidModeValidateModeLine.0	-unknown-	.cat,xorg
+./usr/X11R7/man/html3/XF86VM.html			-unknown-	html,xorg
+./usr/X11R7/man/html3/XF86VidModeDeleteModeLine.html	-unknown-	html,xorg
+./usr/X11R7/man/html3/XF86VidModeGetAllModeLines.html	-unknown-	html,xorg
+./usr/X11R7/man/html3/XF86VidModeGetDotClocks.html	-unknown-	html,xorg
+./usr/X11R7/man/html3/XF86VidModeGetGamma.html		-unknown-	html,xorg
+./usr/X11R7/man/html3/XF86VidModeGetGammaRamp.html	-unknown-	html,xorg
+./usr/X11R7/man/html3/XF86VidModeGetGammaRampSize.html	-unknown-	html,xorg
+./usr/X11R7/man/html3/XF86VidModeGetModeLine.html	-unknown-	html,xorg
+./usr/X11R7/man/html3/XF86VidModeGetMonitor.html	-unknown-	html,xorg
+./usr/X11R7/man/html3/XF86VidModeGetPermissions.html	-unknown-	html,xorg
+./usr/X11R7/man/html3/XF86VidModeGetViewPort.html	-unknown-	html,xorg
+./usr/X11R7/man/html3/XF86VidModeLockModeSwitch.html	-unknown-	html,xorg
+./usr/X11R7/man/html3/XF86VidModeModModeLine.html	-unknown-	html,xorg
+./usr/X11R7/man/html3/XF86VidModeQueryExtension.html	-unknown-	html,xorg
+./usr/X11R7/man/html3/XF86VidModeQueryVersion.html	-unknown-	html,xorg
+./usr/X11R7/man/html3/XF86VidModeSetClientVersion.html	-unknown-	html,xorg
+./usr/X11R7/man/html3/XF86VidModeSetGamma.html		-unknown-	html,xorg
+./usr/X11R7/man/html3/XF86VidModeSetGammaRamp.html	-unknown-	html,xorg
+./usr/X11R7/man/html3/XF86VidModeSetViewPort.html	-unknown-	html,xorg
+./usr/X11R7/man/html3/XF86VidModeSwitchMode.html	-unknown-	html,xorg
+./usr/X11R7/man/html3/XF86VidModeSwitchToMode.html	-unknown-	html,xorg
+./usr/X11R7/man/html3/XF86VidModeValidateModeLine.html	-unknown-	html,xorg
+./usr/X11R7/man/man3/XF86VM.3-unknown-	.man,xorg
+./usr/X11R7/man/man3/XF86VidModeDeleteModeLine.3	-unknown-	.man,xorg
+./usr/X11R7/man/man3/XF86VidModeGetAllModeLines.3	-unknown-	.man,xorg
+./usr/X11R7/man/man3/XF86VidModeGetDotClocks.3		-unknown-	.man,xorg
+./usr/X11R7/man/man3/XF86VidModeGetGamma.3		-unknown-	.man,xorg
+./usr/X11R7/man/man3/XF86VidModeGetGammaRamp.3		-unknown-	.man,xorg
+./usr/X11R7/man/man3/XF86VidModeGetGammaRampSize.3	-unknown-	.man,xorg
+./usr/X11R7/man/man3/XF86VidModeGetModeLine.3		-unknown-	.man,xorg
+./usr/X11R7/man/man3/XF86VidModeGetMonitor.3		-unknown-	.man,xorg
+./usr/X11R7/man/man3/XF86VidModeGetPermissions.3	-unknown-	.man,xorg
+./usr/X11R7/man/man3/XF86VidModeGetViewPort.3		-unknown-	.man,xorg

CVS commit: [netbsd-5] src/sys/dev/pci

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 12:51:59 UTC 2011

Modified Files:
src/sys/dev/pci [netbsd-5]: if_jme.c

Log Message:
Pull up following revision(s) (requested by kochi in ticket #1525):
sys/dev/pci/if_jme.c: revision 1.16
Try reading MAC addr from register if it fails to read from EEPROM.
Copied from FreeBSD driver.
Without this my JMC261 doesn't get MAC address properly.
OK'ed by bouyer@


To generate a diff of this commit:
cvs rdiff -u -r1.4.6.2 -r1.4.6.3 src/sys/dev/pci/if_jme.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/dev/pci/if_jme.c
diff -u src/sys/dev/pci/if_jme.c:1.4.6.2 src/sys/dev/pci/if_jme.c:1.4.6.3
--- src/sys/dev/pci/if_jme.c:1.4.6.2	Mon Feb  2 20:50:11 2009
+++ src/sys/dev/pci/if_jme.c	Sun Jan 16 12:51:59 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_jme.c,v 1.4.6.2 2009/02/02 20:50:11 snj Exp $	*/
+/*	$NetBSD: if_jme.c,v 1.4.6.3 2011/01/16 12:51:59 bouyer Exp $	*/
 
 /*
  * Copyright (c) 2008 Manuel Bouyer.  All rights reserved.
@@ -63,7 +63,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_jme.c,v 1.4.6.2 2009/02/02 20:50:11 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_jme.c,v 1.4.6.3 2011/01/16 12:51:59 bouyer Exp $);
 
 
 #include sys/param.h
@@ -223,6 +223,7 @@
 
 static int jme_eeprom_read_byte(struct jme_softc *, uint8_t, uint8_t *);
 static int jme_eeprom_macaddr(struct jme_softc *);
+static int jme_reg_macaddr(struct jme_softc *);
 
 #define JME_TIMEOUT		1000
 #define JME_PHY_TIMEOUT		1000
@@ -392,7 +393,7 @@
 	jme_reset(sc);
 
 	/* read mac addr */
-	if (jme_eeprom_macaddr(sc)) {
+	if (jme_eeprom_macaddr(sc)  jme_reg_macaddr(sc)) {
 		aprint_error_dev(self, error reading Ethernet address\n);
 		/* return; */
 	}
@@ -2005,6 +2006,28 @@
 	return (ENOENT);
 }
 
+static int
+jme_reg_macaddr(struct jme_softc *sc)
+{
+	uint32_t par0, par1;
+
+	par0 = bus_space_read_4(sc-jme_bt_mac, sc-jme_bh_mac, JME_PAR0);
+	par1 = bus_space_read_4(sc-jme_bt_mac, sc-jme_bh_mac, JME_PAR1);
+	par1 = 0x;
+	if ((par0 == 0  par1 == 0) ||
+	(par0 == 0x  par1 == 0x)) {
+		return (ENOENT);
+	} else {
+		sc-jme_enaddr[0] = (par0  0)  0xff;
+		sc-jme_enaddr[1] = (par0  8)  0xff;
+		sc-jme_enaddr[2] = (par0  16)  0xff;
+		sc-jme_enaddr[3] = (par0  24)  0xff;
+		sc-jme_enaddr[4] = (par1  0)  0xff;
+		sc-jme_enaddr[5] = (par1  8)  0xff;
+	}
+	return (0);
+}
+
 /*
  * Set up sysctl(3) MIB, hw.jme.* - Individual controllers will be
  * set up in jme_pci_attach()

CVS commit: [netbsd-5] src/sys

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 12:54:43 UTC 2011

Modified Files:
src/sys/arch/sparc/dev [netbsd-5]: zs.c
src/sys/arch/sparc64/dev [netbsd-5]: zs.c
src/sys/dev/ic [netbsd-5]: z8530sc.c z8530sc.h z8530tty.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #1526):
sys/arch/sparc/dev/zs.c: revision 1.115
sys/dev/ic/z8530sc.h: revision 1.26
sys/dev/ic/z8530sc.c: revision 1.30
sys/dev/ic/z8530tty.c: revision 1.127
sys/arch/sparc64/dev/zs.c: revision 1.68
add two new functions for z8530tty: zs_chan_lock() and zs_chan_unlock(),
and use them instead of various spl's in the zs.c's.
reviewed by ad and martin.


To generate a diff of this commit:
cvs rdiff -u -r1.111.6.2 -r1.111.6.3 src/sys/arch/sparc/dev/zs.c
cvs rdiff -u -r1.67 -r1.67.6.1 src/sys/arch/sparc64/dev/zs.c
cvs rdiff -u -r1.28 -r1.28.14.1 src/sys/dev/ic/z8530sc.c
cvs rdiff -u -r1.25 -r1.25.12.1 src/sys/dev/ic/z8530sc.h
cvs rdiff -u -r1.123 -r1.123.12.1 src/sys/dev/ic/z8530tty.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/sparc/dev/zs.c
diff -u src/sys/arch/sparc/dev/zs.c:1.111.6.2 src/sys/arch/sparc/dev/zs.c:1.111.6.3
--- src/sys/arch/sparc/dev/zs.c:1.111.6.2	Tue Jun  9 17:50:34 2009
+++ src/sys/arch/sparc/dev/zs.c	Sun Jan 16 12:54:42 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: zs.c,v 1.111.6.2 2009/06/09 17:50:34 snj Exp $	*/
+/*	$NetBSD: zs.c,v 1.111.6.3 2011/01/16 12:54:42 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zs.c,v 1.111.6.2 2009/06/09 17:50:34 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: zs.c,v 1.111.6.3 2011/01/16 12:54:42 bouyer Exp $);
 
 #include opt_ddb.h
 #include opt_kgdb.h
@@ -395,7 +395,7 @@
 {
 	struct zsc_attach_args zsc_args;
 	struct zs_chanstate *cs;
-	int s, channel;
+	int channel;
 	static int didintr, prevpri;
 #if (NKBD  0) || (NMS  0)
 	int ch0_is_cons = 0;
@@ -509,9 +509,9 @@
 			/* No sub-driver.  Just reset it. */
 			uint8_t reset = (channel == 0) ?
 ZSWR9_A_RESET : ZSWR9_B_RESET;
-			s = splzs();
+			zs_lock_chan(cs);
 			zs_write_reg(cs,  9, reset);
-			splx(s);
+			zs_unlock_chan(cs);
 		}
 #if (NKBD  0) || (NMS  0)
 		/*
@@ -571,12 +571,12 @@
 	 * (common to both channels, do it on A)
 	 */
 	cs = zsc-zsc_cs[0];
-	s = splhigh();
+	zs_lock_chan(cs);
 	/* interrupt vector */
 	zs_write_reg(cs, 2, zs_init_reg[2]);
 	/* master interrupt control (enable) */
 	zs_write_reg(cs, 9, zs_init_reg[9]);
-	splx(s);
+	zs_unlock_chan(cs);
 
 #if 0
 	/*
@@ -653,7 +653,7 @@
 zssoft(void *arg)
 {
 	struct zsc_softc *zsc;
-	int s, unit;
+	int unit;
 
 	/* This is not the only ISR on this IPL. */
 	if (zssoftpending == 0)
@@ -668,15 +668,19 @@
 	/* ienab_bic(IE_ZSSOFT); */
 	zssoftpending = 0;
 
-	/* Make sure we call the tty layer at spltty. */
-	s = spltty();
+#if 0 /* not yet */
+	/* Make sure we call the tty layer with tty_lock held. */
+	mutex_spin_enter(tty_lock);
+#endif
 	for (unit = 0; unit  zs_cd.cd_ndevs; unit++) {
 		zsc = device_lookup_private(zs_cd, unit);
 		if (zsc == NULL)
 			continue;
 		(void)zsc_intr_soft(zsc);
 	}
-	splx(s);
+#if 0 /* not yet */
+	mutex_spin_exit(tty_lock);
+#endif
 }
 
 
@@ -731,7 +735,6 @@
 int
 zs_set_modes(struct zs_chanstate *cs, int cflag)
 {
-	int s;
 
 	/*
 	 * Output hardware flow control on the chip is horrendous:
@@ -740,7 +743,7 @@
 	 * Therefore, NEVER set the HFC bit, and instead use the
 	 * status interrupt to detect CTS changes.
 	 */
-	s = splzs();
+	zs_lock_chan(cs);
 	cs-cs_rr0_pps = 0;
 	if ((cflag  (CLOCAL | MDMBUF)) != 0) {
 		cs-cs_rr0_dcd = 0;
@@ -765,7 +768,7 @@
 		cs-cs_wr5_rts = 0;
 		cs-cs_rr0_cts = 0;
 	}
-	splx(s);
+	zs_unlock_chan(cs);
 
 	/* Caller will stuff the pending registers. */
 	return (0);

Index: src/sys/arch/sparc64/dev/zs.c
diff -u src/sys/arch/sparc64/dev/zs.c:1.67 src/sys/arch/sparc64/dev/zs.c:1.67.6.1
--- src/sys/arch/sparc64/dev/zs.c:1.67	Fri Jun 13 13:10:49 2008
+++ src/sys/arch/sparc64/dev/zs.c	Sun Jan 16 12:54:43 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: zs.c,v 1.67 2008/06/13 13:10:49 cegger Exp $	*/
+/*	$NetBSD: zs.c,v 1.67.6.1 2011/01/16 12:54:43 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zs.c,v 1.67 2008/06/13 13:10:49 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: zs.c,v 1.67.6.1 2011/01/16 12:54:43 bouyer Exp $);
 
 #include opt_ddb.h
 #include opt_kgdb.h
@@ -254,7 +254,7 @@
 {
 	struct zsc_attach_args zsc_args;
 	struct zs_chanstate *cs;
-	int s, channel;
+	int channel;
 
 	if (zsd == NULL) {
 		aprint_error(: configuration incomplete\n);
@@ -333,9 +333,9 @@
 			/* No sub-driver.  Just reset it. */
 			uint8_t reset = (channel == 0) ?
 ZSWR9_A_RESET : ZSWR9_B_RESET;
-			s = splzs();
+			zs_lock_chan(cs);
 			

CVS commit: [netbsd-5] src/sys/arch/sparc/sparc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 12:58:24 UTC 2011

Modified Files:
src/sys/arch/sparc/sparc [netbsd-5]: cpu.c cpuvar.h db_interface.c
locore.s pmap.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #1527):
sys/arch/sparc/sparc/pmap.c: revision 1.327, 1.328
sys/arch/sparc/sparc/cpuvar.h: revision 1.77
sys/arch/sparc/sparc/locore.s: revision 1.245
sys/arch/sparc/sparc/cpu.c: revision 1.214
sys/arch/sparc/sparc/db_interface.c: revision 1.84
- retire union cpu_info_pg
- allocate space for each cpu_info{} in pmap_bootstrap
- remap cpu0's space into the PA currently in CPUINFO_VA
- cpus[] becomes an array of pointers to cpu_info{}, easy to traverse
- only call kernel lock for IPL_VM interrupts (?  as implemented on
  x86 and sparc64)
- revert a minor part of locore.s:1.241
- in cpu_hatch(), set %sp to near the middle of the interrupt stack.
  we only need a %sp until we get to run an MI thread (own idlelwp or
  real code)
we still waste one page of space, but this gets SMP much closer to
actually working again.
fix a LOCKDEBUG problem from the previous: need to call pmap_kremove()
on a pre-existing mapping, before installing a new one.


To generate a diff of this commit:
cvs rdiff -u -r1.211.8.1 -r1.211.8.2 src/sys/arch/sparc/sparc/cpu.c
cvs rdiff -u -r1.75.10.1 -r1.75.10.2 src/sys/arch/sparc/sparc/cpuvar.h
cvs rdiff -u -r1.79.4.1 -r1.79.4.2 src/sys/arch/sparc/sparc/db_interface.c
cvs rdiff -u -r1.244.8.1 -r1.244.8.2 src/sys/arch/sparc/sparc/locore.s
cvs rdiff -u -r1.322.20.2 -r1.322.20.3 src/sys/arch/sparc/sparc/pmap.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/sparc/sparc/cpu.c
diff -u src/sys/arch/sparc/sparc/cpu.c:1.211.8.1 src/sys/arch/sparc/sparc/cpu.c:1.211.8.2
--- src/sys/arch/sparc/sparc/cpu.c:1.211.8.1	Sat May 30 16:57:18 2009
+++ src/sys/arch/sparc/sparc/cpu.c	Sun Jan 16 12:58:23 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.211.8.1 2009/05/30 16:57:18 snj Exp $ */
+/*	$NetBSD: cpu.c,v 1.211.8.2 2011/01/16 12:58:23 bouyer Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -52,7 +52,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.211.8.1 2009/05/30 16:57:18 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.211.8.2 2011/01/16 12:58:23 bouyer Exp $);
 
 #include opt_multiprocessor.h
 #include opt_lockdebug.h
@@ -103,7 +103,7 @@
 
 int	sparc_ncpus;			/* # of CPUs detected by PROM */
 #ifdef MULTIPROCESSOR
-union cpu_info_pg *cpus;
+struct cpu_info *cpus[4];		/* we only support 4 CPUs. */
 u_int	cpu_ready_mask;			/* the set of CPUs marked as READY */
 #endif
 
@@ -156,10 +156,10 @@
 	getcpuinfo(cpi, node);
 
 	/*
-	 * Arrange pcb and interrupt stack.
+	 * Arrange interrupt stack.  This cpu will also abuse the bottom
+	 * half of the interrupt stack before it gets to run its idle LWP.
 	 */
-	intstack = uvm_km_alloc(kernel_map, INT_STACK_SIZE,
-		0, UVM_KMF_WIRED);
+	intstack = uvm_km_alloc(kernel_map, INT_STACK_SIZE, 0, UVM_KMF_WIRED);
 	if (intstack == 0)
 		panic(%s: no uspace/intstack, __func__);
 	cpi-eintstack = (void*)(intstack + INT_STACK_SIZE);
@@ -339,7 +339,7 @@
 		getcpuinfo(cpuinfo, node);
 
 #if defined(MULTIPROCESSOR)
-		cpi = sc-sc_cpuinfo = cpuinfo.ci_self;
+		cpi = sc-sc_cpuinfo = cpus[idx];
 #else
 		/* The `local' VA is global for uniprocessor. */
 		cpi = sc-sc_cpuinfo = (struct cpu_info *)CPUINFO_VA;
@@ -362,7 +362,7 @@
 		/*
 		 * Initialise this cpu's cpu_info.
 		 */
-		cpi = sc-sc_cpuinfo = cpus[idx].ci;
+		cpi = sc-sc_cpuinfo = cpus[idx];
 		init_cpuinfo(cpi, node);
 
 		/*

Index: src/sys/arch/sparc/sparc/cpuvar.h
diff -u src/sys/arch/sparc/sparc/cpuvar.h:1.75.10.1 src/sys/arch/sparc/sparc/cpuvar.h:1.75.10.2
--- src/sys/arch/sparc/sparc/cpuvar.h:1.75.10.1	Sat May 30 16:57:18 2009
+++ src/sys/arch/sparc/sparc/cpuvar.h	Sun Jan 16 12:58:23 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpuvar.h,v 1.75.10.1 2009/05/30 16:57:18 snj Exp $ */
+/*	$NetBSD: cpuvar.h,v 1.75.10.2 2011/01/16 12:58:23 bouyer Exp $ */
 
 /*
  *  Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -416,7 +416,7 @@
 
 #define CPU_INFO_ITERATOR		int
 #ifdef MULTIPROCESSOR
-#define CPU_INFO_FOREACH(cii, cp)	cii = 0; cp = cpus[cii].ci, cii  sparc_ncpus; cii++
+#define CPU_INFO_FOREACH(cii, cp)	cii = 0; cp = cpus[cii], cii  sparc_ncpus; cii++
 #else
 #define	CPU_INFO_FOREACH(cii, cp)	(void)cii, cp = curcpu(); cp != NULL; cp = NULL
 #endif
@@ -473,11 +473,7 @@
 #define CPU_MID2CPUNO(mid)		((mid) != 0 ? (mid) - 8 : 0)
 
 #ifdef MULTIPROCESSOR
-union cpu_info_pg {
-	struct cpu_info ci;	/* cpu info (aliased (per cpu) to CPUINFO_VA */
-	char pad[32 * 1024];	/* XXX: force 32K alignment for now */
-};/* SMP capable cpu types */
-extern union cpu_info_pg *cpus;
+extern struct cpu_info *cpus[];
 extern u_int cpu_ready_mask;		/* the set of CPUs marked as READY */
 #endif
 

Index: 

CVS commit: [netbsd-5] src/etc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 13:00:03 UTC 2011

Modified Files:
src/etc [netbsd-5]: named.conf
src/etc/mtree [netbsd-5]: special

Log Message:
Pull up following revision(s) (requested by spz in ticket #1528):
etc/named.conf: revision 1.6
etc/mtree/special: revision 1.133
Enable dnssec, and populate managed-keys.bind
Add directory for bind's managed keys.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.2.1 src/etc/named.conf
cvs rdiff -u -r1.121.2.4 -r1.121.2.5 src/etc/mtree/special

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

Modified files:

Index: src/etc/named.conf
diff -u src/etc/named.conf:1.5 src/etc/named.conf:1.5.2.1
--- src/etc/named.conf:1.5	Wed Jul 23 05:47:48 2008
+++ src/etc/named.conf	Sun Jan 16 13:00:02 2011
@@ -1,10 +1,14 @@
-# $NetBSD: named.conf,v 1.5 2008/07/23 05:47:48 dholland Exp $
+# $NetBSD: named.conf,v 1.5.2.1 2011/01/16 13:00:02 bouyer Exp $
 
 # boot file for secondary name server
 # Note that there should be one primary entry for each SOA record.
 
 options {
 	directory /etc/namedb;
+	dnssec-enable yes;
+	dnssec-validation yes;
+	dnssec-lookaside auto;
+	managed-keys-directory keys;
 	allow-recursion { localhost; localnets; };
 
 	#

Index: src/etc/mtree/special
diff -u src/etc/mtree/special:1.121.2.4 src/etc/mtree/special:1.121.2.5
--- src/etc/mtree/special:1.121.2.4	Thu Dec  9 04:17:22 2010
+++ src/etc/mtree/special	Sun Jan 16 13:00:03 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: special,v 1.121.2.4 2010/12/09 04:17:22 riz Exp $
+#	$NetBSD: special,v 1.121.2.5 2011/01/16 13:00:03 bouyer Exp $
 #	@(#)special	8.2 (Berkeley) 1/23/94
 #
 # This file may be overwritten on upgrades.
@@ -381,6 +381,7 @@
 ./var/chroot/named/etc		type=dir  mode=0755
 ./var/chroot/named/etc/namedb	type=dir  mode=0755
 ./var/chroot/named/etc/namedb/cache	type=dir mode=0775 uname=named gname=named
+./var/chroot/named/etc/namedb/keys	type=dir mode=0775 uname=named gname=named
 ./var/chroot/named/usr		type=dir  mode=0755
 ./var/chroot/named/usr/libexec	type=dir  mode=0755
 ./var/chroot/named/var		type=dir  mode=0755

CVS commit: [netbsd-5-0] src/etc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 13:00:34 UTC 2011

Modified Files:
src/etc [netbsd-5-0]: named.conf
src/etc/mtree [netbsd-5-0]: special

Log Message:
Pull up following revision(s) (requested by spz in ticket #1528):
etc/named.conf: revision 1.6
etc/mtree/special: revision 1.133
Enable dnssec, and populate managed-keys.bind
Add directory for bind's managed keys.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.6.1 src/etc/named.conf
cvs rdiff -u -r1.121.2.2 -r1.121.2.2.2.1 src/etc/mtree/special

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

Modified files:

Index: src/etc/named.conf
diff -u src/etc/named.conf:1.5 src/etc/named.conf:1.5.6.1
--- src/etc/named.conf:1.5	Wed Jul 23 05:47:48 2008
+++ src/etc/named.conf	Sun Jan 16 13:00:34 2011
@@ -1,10 +1,14 @@
-# $NetBSD: named.conf,v 1.5 2008/07/23 05:47:48 dholland Exp $
+# $NetBSD: named.conf,v 1.5.6.1 2011/01/16 13:00:34 bouyer Exp $
 
 # boot file for secondary name server
 # Note that there should be one primary entry for each SOA record.
 
 options {
 	directory /etc/namedb;
+	dnssec-enable yes;
+	dnssec-validation yes;
+	dnssec-lookaside auto;
+	managed-keys-directory keys;
 	allow-recursion { localhost; localnets; };
 
 	#

Index: src/etc/mtree/special
diff -u src/etc/mtree/special:1.121.2.2 src/etc/mtree/special:1.121.2.2.2.1
--- src/etc/mtree/special:1.121.2.2	Fri Feb  6 00:55:31 2009
+++ src/etc/mtree/special	Sun Jan 16 13:00:34 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: special,v 1.121.2.2 2009/02/06 00:55:31 snj Exp $
+#	$NetBSD: special,v 1.121.2.2.2.1 2011/01/16 13:00:34 bouyer Exp $
 #	@(#)special	8.2 (Berkeley) 1/23/94
 #
 # This file may be overwritten on upgrades.
@@ -382,6 +382,7 @@
 ./var/chroot/named/etc		type=dir  mode=0755
 ./var/chroot/named/etc/namedb	type=dir  mode=0755
 ./var/chroot/named/etc/namedb/cache	type=dir mode=0775 uname=named gname=named
+./var/chroot/named/etc/namedb/keys	type=dir mode=0775 uname=named gname=named
 ./var/chroot/named/usr		type=dir  mode=0755
 ./var/chroot/named/usr/libexec	type=dir  mode=0755
 ./var/chroot/named/var		type=dir  mode=0755

CVS commit: [netbsd-5-1] src/etc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 13:00:39 UTC 2011

Modified Files:
src/etc [netbsd-5-1]: named.conf
src/etc/mtree [netbsd-5-1]: special

Log Message:
Pull up following revision(s) (requested by spz in ticket #1528):
etc/named.conf: revision 1.6
etc/mtree/special: revision 1.133
Enable dnssec, and populate managed-keys.bind
Add directory for bind's managed keys.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.10.1 src/etc/named.conf
cvs rdiff -u -r1.121.2.3 -r1.121.2.3.2.1 src/etc/mtree/special

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

Modified files:

Index: src/etc/named.conf
diff -u src/etc/named.conf:1.5 src/etc/named.conf:1.5.10.1
--- src/etc/named.conf:1.5	Wed Jul 23 05:47:48 2008
+++ src/etc/named.conf	Sun Jan 16 13:00:39 2011
@@ -1,10 +1,14 @@
-# $NetBSD: named.conf,v 1.5 2008/07/23 05:47:48 dholland Exp $
+# $NetBSD: named.conf,v 1.5.10.1 2011/01/16 13:00:39 bouyer Exp $
 
 # boot file for secondary name server
 # Note that there should be one primary entry for each SOA record.
 
 options {
 	directory /etc/namedb;
+	dnssec-enable yes;
+	dnssec-validation yes;
+	dnssec-lookaside auto;
+	managed-keys-directory keys;
 	allow-recursion { localhost; localnets; };
 
 	#

Index: src/etc/mtree/special
diff -u src/etc/mtree/special:1.121.2.3 src/etc/mtree/special:1.121.2.3.2.1
--- src/etc/mtree/special:1.121.2.3	Fri Sep 18 02:01:38 2009
+++ src/etc/mtree/special	Sun Jan 16 13:00:39 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: special,v 1.121.2.3 2009/09/18 02:01:38 snj Exp $
+#	$NetBSD: special,v 1.121.2.3.2.1 2011/01/16 13:00:39 bouyer Exp $
 #	@(#)special	8.2 (Berkeley) 1/23/94
 #
 # This file may be overwritten on upgrades.
@@ -381,6 +381,7 @@
 ./var/chroot/named/etc		type=dir  mode=0755
 ./var/chroot/named/etc/namedb	type=dir  mode=0755
 ./var/chroot/named/etc/namedb/cache	type=dir mode=0775 uname=named gname=named
+./var/chroot/named/etc/namedb/keys	type=dir mode=0775 uname=named gname=named
 ./var/chroot/named/usr		type=dir  mode=0755
 ./var/chroot/named/usr/libexec	type=dir  mode=0755
 ./var/chroot/named/var		type=dir  mode=0755

CVS commit: [netbsd-5] src/sys/net

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 13:04:33 UTC 2011

Modified Files:
src/sys/net [netbsd-5]: raw_usrreq.c

Log Message:
Pull up following revision(s) (requested by pooka in ticket #1529):
sys/net/raw_usrreq.c: revision 1.36
Apply patch from PR kern/44369 by Wolfgang Stukenbrock.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.35.8.1 src/sys/net/raw_usrreq.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/net/raw_usrreq.c
diff -u src/sys/net/raw_usrreq.c:1.35 src/sys/net/raw_usrreq.c:1.35.8.1
--- src/sys/net/raw_usrreq.c:1.35	Thu May 29 17:26:56 2008
+++ src/sys/net/raw_usrreq.c	Sun Jan 16 13:04:33 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: raw_usrreq.c,v 1.35 2008/05/29 17:26:56 dyoung Exp $	*/
+/*	$NetBSD: raw_usrreq.c,v 1.35.8.1 2011/01/16 13:04:33 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: raw_usrreq.c,v 1.35 2008/05/29 17:26:56 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: raw_usrreq.c,v 1.35.8.1 2011/01/16 13:04:33 bouyer Exp $);
 
 #include sys/param.h
 #include sys/mbuf.h
@@ -276,7 +276,8 @@
 		/*
 		 * stat: don't bother with a blocksize.
 		 */
-		return (0);
+		error = 0;
+		break;
 
 	/*
 	 * Not supported.

CVS commit: [netbsd-5-1] src/sys/net

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 13:04:45 UTC 2011

Modified Files:
src/sys/net [netbsd-5-1]: raw_usrreq.c

Log Message:
Pull up following revision(s) (requested by pooka in ticket #1529):
sys/net/raw_usrreq.c: revision 1.36
Apply patch from PR kern/44369 by Wolfgang Stukenbrock.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.35.22.1 src/sys/net/raw_usrreq.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/net/raw_usrreq.c
diff -u src/sys/net/raw_usrreq.c:1.35 src/sys/net/raw_usrreq.c:1.35.22.1
--- src/sys/net/raw_usrreq.c:1.35	Thu May 29 17:26:56 2008
+++ src/sys/net/raw_usrreq.c	Sun Jan 16 13:04:45 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: raw_usrreq.c,v 1.35 2008/05/29 17:26:56 dyoung Exp $	*/
+/*	$NetBSD: raw_usrreq.c,v 1.35.22.1 2011/01/16 13:04:45 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: raw_usrreq.c,v 1.35 2008/05/29 17:26:56 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: raw_usrreq.c,v 1.35.22.1 2011/01/16 13:04:45 bouyer Exp $);
 
 #include sys/param.h
 #include sys/mbuf.h
@@ -276,7 +276,8 @@
 		/*
 		 * stat: don't bother with a blocksize.
 		 */
-		return (0);
+		error = 0;
+		break;
 
 	/*
 	 * Not supported.

CVS commit: [netbsd-5-0] src/sys/net

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 13:04:51 UTC 2011

Modified Files:
src/sys/net [netbsd-5-0]: raw_usrreq.c

Log Message:
Pull up following revision(s) (requested by pooka in ticket #1529):
sys/net/raw_usrreq.c: revision 1.36
Apply patch from PR kern/44369 by Wolfgang Stukenbrock.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.35.14.1 src/sys/net/raw_usrreq.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/net/raw_usrreq.c
diff -u src/sys/net/raw_usrreq.c:1.35 src/sys/net/raw_usrreq.c:1.35.14.1
--- src/sys/net/raw_usrreq.c:1.35	Thu May 29 17:26:56 2008
+++ src/sys/net/raw_usrreq.c	Sun Jan 16 13:04:51 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: raw_usrreq.c,v 1.35 2008/05/29 17:26:56 dyoung Exp $	*/
+/*	$NetBSD: raw_usrreq.c,v 1.35.14.1 2011/01/16 13:04:51 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: raw_usrreq.c,v 1.35 2008/05/29 17:26:56 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: raw_usrreq.c,v 1.35.14.1 2011/01/16 13:04:51 bouyer Exp $);
 
 #include sys/param.h
 #include sys/mbuf.h
@@ -276,7 +276,8 @@
 		/*
 		 * stat: don't bother with a blocksize.
 		 */
-		return (0);
+		error = 0;
+		break;
 
 	/*
 	 * Not supported.

CVS commit: [netbsd-5] src/sys/dev/ic

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 13:06:49 UTC 2011

Modified Files:
src/sys/dev/ic [netbsd-5]: ahcisata_core.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1530):
sys/dev/ic/ahcisata_core.c: revision 1.31
Don't call bus_dmamap_load(9) and bus_dmamap_sync(9) on command xfers
if (AT_READ|AT_WRITE) in ata_c-flags is set but ata_c-bcount is zero.
Someone actually tries to put such a command and it causes
DIAGNOSTIC panic in x86/bus_dma.c:_bus_dmamap_sync().
I think bus_dma(9) API itself may allow calls with mapsize==0
but there are many MD code that asserts offset=mapsize or len==0.
The problem is reported and fix is confirmed by Takuro KUBOTA
with XEN DOM0 kernel (which has options DIAGNOSTIC).


To generate a diff of this commit:
cvs rdiff -u -r1.18.4.4 -r1.18.4.5 src/sys/dev/ic/ahcisata_core.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/dev/ic/ahcisata_core.c
diff -u src/sys/dev/ic/ahcisata_core.c:1.18.4.4 src/sys/dev/ic/ahcisata_core.c:1.18.4.5
--- src/sys/dev/ic/ahcisata_core.c:1.18.4.4	Sun Mar 28 16:21:18 2010
+++ src/sys/dev/ic/ahcisata_core.c	Sun Jan 16 13:06:49 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ahcisata_core.c,v 1.18.4.4 2010/03/28 16:21:18 snj Exp $	*/
+/*	$NetBSD: ahcisata_core.c,v 1.18.4.5 2011/01/16 13:06:49 bouyer Exp $	*/
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ahcisata_core.c,v 1.18.4.4 2010/03/28 16:21:18 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: ahcisata_core.c,v 1.18.4.5 2011/01/16 13:06:49 bouyer Exp $);
 
 #include sys/types.h
 #include sys/malloc.h
@@ -729,7 +729,8 @@
 	AHCIDEBUG_PRINT((%s port %d header %p\n, AHCINAME(sc),
 	chp-ch_channel, cmd_h), DEBUG_XFERS);
 	if (ahci_dma_setup(chp, slot,
-	(ata_c-flags  (AT_READ|AT_WRITE)) ? ata_c-data : NULL,
+	(ata_c-flags  (AT_READ|AT_WRITE)  ata_c-bcount  0) ?
+	ata_c-data : NULL,
 	ata_c-bcount,
 	(ata_c-flags  AT_READ) ? BUS_DMA_READ : BUS_DMA_WRITE)) {
 		ata_c-flags |= AT_DF;
@@ -862,7 +863,7 @@
 	/* this comamnd is not active any more */
 	achp-ahcic_cmds_active = ~(1  slot);
 
-	if (ata_c-flags  (AT_READ|AT_WRITE)) {
+	if (ata_c-flags  (AT_READ|AT_WRITE)  ata_c-bcount  0) {
 		bus_dmamap_sync(sc-sc_dmat, achp-ahcic_datad[slot], 0,
 		achp-ahcic_datad[slot]-dm_mapsize,
 		(ata_c-flags  AT_READ) ? BUS_DMASYNC_POSTREAD :

CVS commit: [netbsd-5] src

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 13:08:19 UTC 2011

Modified Files:
src/distrib/x68k/floppies/ramdisk [netbsd-5]: Makefile
src/sys/arch/x68k/conf [netbsd-5]: INSTALL

Log Message:
Pull up following revision(s) (requested by isaki in ticket #1531):
sys/arch/x68k/conf/INSTALL: revision 1.85
distrib/x68k/floppies/ramdisk/Makefile: revision 1.30
Increase the image size from 1300KB to 1400KB.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.2.1 src/distrib/x68k/floppies/ramdisk/Makefile
cvs rdiff -u -r1.80 -r1.80.4.1 src/sys/arch/x68k/conf/INSTALL

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

Modified files:

Index: src/distrib/x68k/floppies/ramdisk/Makefile
diff -u src/distrib/x68k/floppies/ramdisk/Makefile:1.29 src/distrib/x68k/floppies/ramdisk/Makefile:1.29.2.1
--- src/distrib/x68k/floppies/ramdisk/Makefile:1.29	Sun May 11 09:35:53 2008
+++ src/distrib/x68k/floppies/ramdisk/Makefile	Sun Jan 16 13:08:19 2011
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.29 2008/05/11 09:35:53 isaki Exp $
+#	$NetBSD: Makefile,v 1.29.2.1 2011/01/16 13:08:19 bouyer Exp $
 
 .include bsd.own.mk
 .include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
 
 IMAGE=			inst.fs
-IMAGESIZE=		1300k
+IMAGESIZE=		1400k
 # `floppy-root' cannot be used now, due to size issue.
 #IMAGE_RELEASEDIR=	installation/floppy
 

Index: src/sys/arch/x68k/conf/INSTALL
diff -u src/sys/arch/x68k/conf/INSTALL:1.80 src/sys/arch/x68k/conf/INSTALL:1.80.4.1
--- src/sys/arch/x68k/conf/INSTALL:1.80	Thu Jul 31 07:41:08 2008
+++ src/sys/arch/x68k/conf/INSTALL	Sun Jan 16 13:08:19 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.80 2008/07/31 07:41:08 simonb Exp $
+#	$NetBSD: INSTALL,v 1.80.4.1 2011/01/16 13:08:19 bouyer Exp $
 
 #
 #	INSTALL -- installation kernel.
@@ -8,7 +8,7 @@
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		INSTALL-$Revision: 1.80 $
+#ident 		INSTALL-$Revision: 1.80.4.1 $
 
 makeoptions	COPTS=-Os		# Optimise for space. Implies -O2
 
@@ -18,7 +18,7 @@
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# Force root on memory-disk
 options 	MEMORY_DISK_SERVER=0	# No user space hooks
-options 	MEMORY_DISK_ROOT_SIZE=2600
+options 	MEMORY_DISK_ROOT_SIZE=2800
 
 ## System kernel configuration.  See options(4) for more detail.
 

CVS commit: [netbsd-5-1] src

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 13:08:22 UTC 2011

Modified Files:
src/distrib/x68k/floppies/ramdisk [netbsd-5-1]: Makefile
src/sys/arch/x68k/conf [netbsd-5-1]: INSTALL

Log Message:
Pull up following revision(s) (requested by isaki in ticket #1531):
sys/arch/x68k/conf/INSTALL: revision 1.85
distrib/x68k/floppies/ramdisk/Makefile: revision 1.30
Increase the image size from 1300KB to 1400KB.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.8.1 src/distrib/x68k/floppies/ramdisk/Makefile
cvs rdiff -u -r1.80 -r1.80.10.1 src/sys/arch/x68k/conf/INSTALL

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

Modified files:

Index: src/distrib/x68k/floppies/ramdisk/Makefile
diff -u src/distrib/x68k/floppies/ramdisk/Makefile:1.29 src/distrib/x68k/floppies/ramdisk/Makefile:1.29.8.1
--- src/distrib/x68k/floppies/ramdisk/Makefile:1.29	Sun May 11 09:35:53 2008
+++ src/distrib/x68k/floppies/ramdisk/Makefile	Sun Jan 16 13:08:21 2011
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.29 2008/05/11 09:35:53 isaki Exp $
+#	$NetBSD: Makefile,v 1.29.8.1 2011/01/16 13:08:21 bouyer Exp $
 
 .include bsd.own.mk
 .include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
 
 IMAGE=			inst.fs
-IMAGESIZE=		1300k
+IMAGESIZE=		1400k
 # `floppy-root' cannot be used now, due to size issue.
 #IMAGE_RELEASEDIR=	installation/floppy
 

Index: src/sys/arch/x68k/conf/INSTALL
diff -u src/sys/arch/x68k/conf/INSTALL:1.80 src/sys/arch/x68k/conf/INSTALL:1.80.10.1
--- src/sys/arch/x68k/conf/INSTALL:1.80	Thu Jul 31 07:41:08 2008
+++ src/sys/arch/x68k/conf/INSTALL	Sun Jan 16 13:08:21 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.80 2008/07/31 07:41:08 simonb Exp $
+#	$NetBSD: INSTALL,v 1.80.10.1 2011/01/16 13:08:21 bouyer Exp $
 
 #
 #	INSTALL -- installation kernel.
@@ -8,7 +8,7 @@
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		INSTALL-$Revision: 1.80 $
+#ident 		INSTALL-$Revision: 1.80.10.1 $
 
 makeoptions	COPTS=-Os		# Optimise for space. Implies -O2
 
@@ -18,7 +18,7 @@
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT	# Force root on memory-disk
 options 	MEMORY_DISK_SERVER=0	# No user space hooks
-options 	MEMORY_DISK_ROOT_SIZE=2600
+options 	MEMORY_DISK_ROOT_SIZE=2800
 
 ## System kernel configuration.  See options(4) for more detail.
 

CVS commit: [netbsd-5] src/doc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 13:22:14 UTC 2011

Modified Files:
src/doc [netbsd-5]: CHANGES-5.2

Log Message:
tickets 1486, 1513, 1516, 1518, 1523, 1525 - 1531


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.52 -r1.1.2.53 src/doc/CHANGES-5.2

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-5.2
diff -u src/doc/CHANGES-5.2:1.1.2.52 src/doc/CHANGES-5.2:1.1.2.53
--- src/doc/CHANGES-5.2:1.1.2.52	Sat Jan  8 01:27:54 2011
+++ src/doc/CHANGES-5.2	Sun Jan 16 13:22:14 2011
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.2,v 1.1.2.52 2011/01/08 01:27:54 riz Exp $
+# $NetBSD: CHANGES-5.2,v 1.1.2.53 2011/01/16 13:22:14 bouyer Exp $
 
 A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2
 release:
@@ -4307,3 +4307,114 @@
 	references to appropriate RFCs.
 	[is, ticket #1514]
 
+sbin/fsck_ext2fs/inode.c			1.24 - 1.28
+sbin/fsck_ext2fs/setup.c			1.26
+sbin/newfs_ext2fs/extern.h			1.3
+sbin/newfs_ext2fs/mke2fs.c			1.10 - 1.12
+sbin/newfs_ext2fs/newfs_ext2fs.8		1.2 - 1.4
+sbin/newfs_ext2fs/newfs_ext2fs.c		1.5 - 1.8
+sys/lib/libsa/ext2fs.c1.6, 1.7
+sys/ufs/ext2fs/ext2fs_dinode.h			1.18, 1.19
+sys/ufs/ext2fs/ext2fs_inode.c			1.68
+sys/ufs/ext2fs/ext2fs_vfsops.c			1.142
+
+	PR/40936: Frederik Sausmikat: ext2fs: add support for inodes  128 bytes
+	  Support variable inode sizes.
+	  Handle 32 bit uid field on E2FS_REV1.
+	[tsutsui, ticket #1486]
+
+sys/dev/usb/ukbd.c1.110
+
+	Cap h.loc.count at MAXKEYCODE instead of bailing out.  This lets
+	some obscure/roque keyboards attach.
+	From logana...@devio.us (Loganaden Velvindron), thanks!
+	[mbalmer, ticket #1513]
+
+etc/ssh/ssh_known_hosts1.6
+
+	releng has been on mollari for a while now. Also, add wiki
+	[riz, ticket #1516]
+
+sys/arch/amiga/include/vmparam.h		1.41
+
+	Raise address of user stack to the highest safe (for 68040 mmu) address,
+	which increases available user address space by 256MB.  One file in
+	pkgsrc/lang/php53 was too large for the amiga.  Also remove an old
+	presumably outdated comment.
+	[mhitch, ticket #1518]
+
+distrib/sets/lists/xcomp/md.sparc		patch
+distrib/sets/lists/xserver/md.sparc		patch
+
+	update Xorg set lists for sparc
+	[mrg, ticket #1523]
+
+sys/dev/pci/if_jme.c1.16
+
+	Try reading MAC addr from register if it fails to read from EEPROM.
+	Copied from FreeBSD driver.
+	Without this my JMC261 doesn't get MAC address properly.
+	[kochi, ticket #1525]
+
+sys/arch/sparc/dev/zs.c1.115
+sys/arch/sparc64/dev/zs.c			1.68
+sys/dev/ic/z8530sc.c1.30
+sys/dev/ic/z8530sc.h1.26
+sys/dev/ic/z8530tty.c1.127
+
+	add two new functions for z8530tty: zs_chan_lock() and zs_chan_unlock(),
+	and use them instead of various spl's in the zs.c's.
+	[mrg, ticket #1526]
+
+sys/arch/sparc/sparc/cpu.c			1.214
+sys/arch/sparc/sparc/cpuvar.h			1.77
+sys/arch/sparc/sparc/db_interface.c		1.84
+sys/arch/sparc/sparc/locore.s			1.245
+sys/arch/sparc/sparc/pmap.c			1.327, 1.328
+
+	- retire union cpu_info_pg
+	- allocate space for each cpu_info{} in pmap_bootstrap
+	- remap cpu0's space into the PA currently in CPUINFO_VA
+	- cpus[] becomes an array of pointers to cpu_info{}, easy to traverse
+	- only call kernel lock for IPL_VM interrupts (?  as implemented on
+	  x86 and sparc64)
+	- revert a minor part of locore.s:1.241
+	- in cpu_hatch(), set %sp to near the middle of the interrupt stack.
+	  we only need a %sp until we get to run an MI thread (own idlelwp or
+	  real code)
+
+	we still waste one page of space, but this gets SMP much closer to
+	actually working again.
+	[mrg, ticket #1527]
+
+etc/mtree/special1.133
+etc/named.conf	1.6
+
+	Enable dnssec, and populate managed-keys.bind
+	[spz, ticket #1528]
+
+sys/net/raw_usrreq.c1.36
+
+	Apply patch from PR kern/44369 by Wolfgang Stukenbrock:
+	Fix a kernel lock leak
+	[pooka, ticket #1529]
+
+sys/dev/ic/ahcisata_core.c			1.31
+
+	Don't call bus_dmamap_load(9) and bus_dmamap_sync(9) on command xfers
+	if (AT_READ|AT_WRITE) in ata_c-flags is set but ata_c-bcount is zero.
+	Someone actually tries to put such a command and it causes
+	DIAGNOSTIC panic in x86/bus_dma.c:_bus_dmamap_sync().
+	I think bus_dma(9) API itself may allow calls with mapsize==0
+	but there are many MD code that asserts offset=mapsize or len==0.
+
+	The problem is reported and fix is confirmed by Takuro KUBOTA
+	with XEN DOM0 kernel (which has options DIAGNOSTIC).
+	[tsutsui, ticket #1530]
+
+distrib/x68k/floppies/ramdisk/Makefile		1.30
+sys/arch/x68k/conf/INSTALL			1.85
+
+	Increase the image size from 1300KB to 1400KB.
+	[isaki, ticket #1531]
+

CVS commit: [netbsd-5-1] src/doc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 13:23:09 UTC 2011

Modified Files:
src/doc [netbsd-5-1]: CHANGES-5.1.1

Log Message:
tickets 1516, 1528, 1529, 1531


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/doc/CHANGES-5.1.1

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-5.1.1
diff -u src/doc/CHANGES-5.1.1:1.1.2.7 src/doc/CHANGES-5.1.1:1.1.2.8
--- src/doc/CHANGES-5.1.1:1.1.2.7	Sun Jan  9 20:51:33 2011
+++ src/doc/CHANGES-5.1.1	Sun Jan 16 13:23:09 2011
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1.1,v 1.1.2.7 2011/01/09 20:51:33 riz Exp $
+# $NetBSD: CHANGES-5.1.1,v 1.1.2.8 2011/01/16 13:23:09 bouyer Exp $
 
 A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.1.1
 release:
@@ -2217,3 +2217,26 @@
 	Adjust named startup for new BIND version.
 	[tron, ticket #1519]
 
+etc/ssh/ssh_known_hosts1.6
+
+	releng has been on mollari for a while now. Also, add wiki
+	[riz, ticket #1516]
+
+etc/mtree/special1.133
+etc/named.conf	1.6
+
+	Enable dnssec, and populate managed-keys.bind
+	[spz, ticket #1528]
+
+sys/net/raw_usrreq.c1.36
+
+	Apply patch from PR kern/44369 by Wolfgang Stukenbrock:
+	Fix a kernel lock leak
+	[pooka, ticket #1529]
+
+distrib/x68k/floppies/ramdisk/Makefile		1.30
+sys/arch/x68k/conf/INSTALL			1.85
+
+	Increase the image size from 1300KB to 1400KB.
+	[isaki, ticket #1531]
+

CVS commit: src/sys/dev/isa

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Sun Jan 16 14:16:03 UTC 2011

Modified Files:
src/sys/dev/isa: aps.c

Log Message:
save a line of dmesg


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/isa/aps.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/dev/isa/aps.c
diff -u src/sys/dev/isa/aps.c:1.11 src/sys/dev/isa/aps.c:1.12
--- src/sys/dev/isa/aps.c:1.11	Sun Jan 16 01:05:45 2011
+++ src/sys/dev/isa/aps.c	Sun Jan 16 14:16:03 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: aps.c,v 1.11 2011/01/16 01:05:45 jmcneill Exp $	*/
+/*	$NetBSD: aps.c,v 1.12 2011/01/16 14:16:03 jmcneill Exp $	*/
 /*	$OpenBSD: aps.c,v 1.15 2007/05/19 19:14:11 tedu Exp $	*/
 /*	$OpenBSD: aps.c,v 1.17 2008/06/27 06:08:43 canacar Exp $	*/
 /*
@@ -24,7 +24,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: aps.c,v 1.11 2011/01/16 01:05:45 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: aps.c,v 1.12 2011/01/16 14:16:03 jmcneill Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -313,7 +313,7 @@
 	sc-sc_bus_space_valid = true;
 
 	aprint_naive(\n);
-	aprint_normal(\n);
+	aprint_normal(: Thinkpad Active Protection System\n);
 
 	if (aps_init(sc)) {
 		aprint_error_dev(self, failed to initialize\n);
@@ -364,7 +364,6 @@
 	/* Refresh sensor data every 0.5 seconds */
 	callout_schedule(sc-sc_callout, (hz) / 2);
 
-aprint_normal_dev(self, Thinkpad Active Protection System\n);
 	return;
 
 out:

CVS commit: [netbsd-5]

[Manuel Bouyer]

Module Name:xsrc
Committed By:   bouyer
Date:   Sun Jan 16 14:17:42 UTC 2011

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon [netbsd-5]:
Makefile
xsrc/external/mit/xf86-video-ati/dist [netbsd-5]: COPYING ChangeLog
Makefile.am Makefile.in README aclocal.m4 config.guess config.h.in
config.sub configure configure.ac depcomp install-sh ltmain.sh
missing
xsrc/external/mit/xf86-video-ati/dist/man [netbsd-5]: Makefile.am
Makefile.in radeon.man
xsrc/external/mit/xf86-video-ati/dist/src [netbsd-5]: Makefile.am
Makefile.in ati.c ati_pciids_gen.h atipciids.h atombios_crtc.c
atombios_output.c legacy_crtc.c legacy_output.c r600_exa.c
r600_reg_r6xx.h r600_shader.c r600_shader.h r600_state.h
r600_textured_videofuncs.c r6xx_accel.c radeon.h radeon_accel.c
radeon_accelfuncs.c radeon_atombios.c radeon_atombios.h
radeon_bios.c radeon_chipinfo_gen.h radeon_chipset_gen.h
radeon_commonfuncs.c radeon_crtc.c radeon_cursor.c radeon_dri.c
radeon_dri.h radeon_driver.c radeon_drm.h radeon_exa.c
radeon_exa_funcs.c radeon_exa_render.c radeon_legacy_memory.c
radeon_macros.h radeon_modes.c radeon_output.c
radeon_pci_chipset_gen.h radeon_pci_device_match_gen.h
radeon_probe.c radeon_probe.h radeon_reg.h radeon_render.c
radeon_textured_video.c radeon_textured_videofuncs.c radeon_tv.c
radeon_tv.h radeon_version.h radeon_video.c radeon_video.h
radeon_vip.c theatre200.c theatre_detect.c
xsrc/external/mit/xf86-video-ati/dist/src/AtomBios [netbsd-5]:
CD_Operations.c
xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/includes [netbsd-5]:
Decoder.h ObjectID.h atombios.h
xsrc/external/mit/xf86-video-ati/dist/src/pcidb [netbsd-5]:
ati_pciids.csv parse_pci_ids.pl
xsrc/external/mit/xf86-video-ati/include [netbsd-5]: config.h
Removed Files:
xsrc/external/mit/xf86-video-ati/dist/src [netbsd-5]:
local_xf86Rename.h radeon_dga.c
xsrc/external/mit/xf86-video-ati/dist/src/modes [netbsd-5]: xf86Crtc.c
xf86Crtc.h xf86Cursors.c xf86DiDGA.c xf86EdidModes.c xf86Modes.c
xf86Modes.h xf86RandR12.c xf86RandR12.h xf86Rename.h xf86Rotate.c
xf86cvt.c
xsrc/external/mit/xf86-video-ati/dist/src/parser [netbsd-5]:
xf86Optrec.h xf86Parser.h

Log Message:
Apply patch, requested by mrg in ticket #1524:
external/mit/xorg/server/drivers/xf86-video-radeon/Makefile patch
xsrc/external/mit/xf86-video-ati/dist/COPYING   patch
xsrc/external/mit/xf86-video-ati/dist/ChangeLog patch
xsrc/external/mit/xf86-video-ati/dist/Makefile.am   patch
xsrc/external/mit/xf86-video-ati/dist/Makefile.in   patch
xsrc/external/mit/xf86-video-ati/dist/READMEpatch
xsrc/external/mit/xf86-video-ati/dist/aclocal.m4patch
xsrc/external/mit/xf86-video-ati/dist/compile   patch
xsrc/external/mit/xf86-video-ati/dist/config.guess  patch
xsrc/external/mit/xf86-video-ati/dist/config.h.in   patch
xsrc/external/mit/xf86-video-ati/dist/config.subpatch
xsrc/external/mit/xf86-video-ati/dist/configure patch
xsrc/external/mit/xf86-video-ati/dist/configure.ac  patch
xsrc/external/mit/xf86-video-ati/dist/depcomp   patch
xsrc/external/mit/xf86-video-ati/dist/install-shpatch
xsrc/external/mit/xf86-video-ati/dist/ltmain.sh patch
xsrc/external/mit/xf86-video-ati/dist/missing   patch
xsrc/external/mit/xf86-video-ati/dist/man/Makefile.am   patch
xsrc/external/mit/xf86-video-ati/dist/man/Makefile.in   patch
xsrc/external/mit/xf86-video-ati/dist/man/radeon.manpatch
xsrc/external/mit/xf86-video-ati/dist/src/Makefile.am   patch
xsrc/external/mit/xf86-video-ati/dist/src/Makefile.in   patch
xsrc/external/mit/xf86-video-ati/dist/src/ati.c patch
xsrc/external/mit/xf86-video-ati/dist/src/ati_pciids_gen.h  patch
xsrc/external/mit/xf86-video-ati/dist/src/atipciids.h   patch
xsrc/external/mit/xf86-video-ati/dist/src/atombios_crtc.c   patch
xsrc/external/mit/xf86-video-ati/dist/src/atombios_output.c patch
xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.c patch
xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.h patch
xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c patch

CVS commit: [netbsd-5] src/doc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 14:36:30 UTC 2011

Modified Files:
src/doc [netbsd-5]: CHANGES-5.2

Log Message:
Ticket 1524


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.53 -r1.1.2.54 src/doc/CHANGES-5.2

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-5.2
diff -u src/doc/CHANGES-5.2:1.1.2.53 src/doc/CHANGES-5.2:1.1.2.54
--- src/doc/CHANGES-5.2:1.1.2.53	Sun Jan 16 13:22:14 2011
+++ src/doc/CHANGES-5.2	Sun Jan 16 14:36:30 2011
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.2,v 1.1.2.53 2011/01/16 13:22:14 bouyer Exp $
+# $NetBSD: CHANGES-5.2,v 1.1.2.54 2011/01/16 14:36:30 bouyer Exp $
 
 A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2
 release:
@@ -4418,3 +4418,132 @@
 	Increase the image size from 1300KB to 1400KB.
 	[isaki, ticket #1531]
 
+external/mit/xorg/server/drivers/xf86-video-radeon/Makefile		patch
+xsrc/external/mit/xf86-video-ati/dist/COPYINGpatch
+xsrc/external/mit/xf86-video-ati/dist/ChangeLogpatch
+xsrc/external/mit/xf86-video-ati/dist/Makefile.am			patch
+xsrc/external/mit/xf86-video-ati/dist/Makefile.in			patch
+xsrc/external/mit/xf86-video-ati/dist/READMEpatch
+xsrc/external/mit/xf86-video-ati/dist/aclocal.m4			patch
+xsrc/external/mit/xf86-video-ati/dist/compilepatch
+xsrc/external/mit/xf86-video-ati/dist/config.guess			patch
+xsrc/external/mit/xf86-video-ati/dist/config.h.in			patch
+xsrc/external/mit/xf86-video-ati/dist/config.sub			patch
+xsrc/external/mit/xf86-video-ati/dist/configurepatch
+xsrc/external/mit/xf86-video-ati/dist/configure.ac			patch
+xsrc/external/mit/xf86-video-ati/dist/depcomppatch
+xsrc/external/mit/xf86-video-ati/dist/install-sh			patch
+xsrc/external/mit/xf86-video-ati/dist/ltmain.shpatch
+xsrc/external/mit/xf86-video-ati/dist/missingpatch
+xsrc/external/mit/xf86-video-ati/dist/man/Makefile.am			patch
+xsrc/external/mit/xf86-video-ati/dist/man/Makefile.in			patch
+xsrc/external/mit/xf86-video-ati/dist/man/radeon.man			patch
+xsrc/external/mit/xf86-video-ati/dist/src/Makefile.am			patch
+xsrc/external/mit/xf86-video-ati/dist/src/Makefile.in			patch
+xsrc/external/mit/xf86-video-ati/dist/src/ati.cpatch
+xsrc/external/mit/xf86-video-ati/dist/src/ati_pciids_gen.h		patch
+xsrc/external/mit/xf86-video-ati/dist/src/atipciids.h			patch
+xsrc/external/mit/xf86-video-ati/dist/src/atombios_crtc.c		patch
+xsrc/external/mit/xf86-video-ati/dist/src/atombios_output.c		patch
+xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.c		patch
+xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.h		patch
+xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c			patch
+xsrc/external/mit/xf86-video-ati/dist/src/legacy_output.c		patch
+xsrc/external/mit/xf86-video-ati/dist/src/local_xf86Rename.h		patch
+xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c			patch
+xsrc/external/mit/xf86-video-ati/dist/src/r600_reg_r6xx.h		patch
+xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.c			patch
+xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.h			patch
+xsrc/external/mit/xf86-video-ati/dist/src/r600_state.h			patch
+xsrc/external/mit/xf86-video-ati/dist/src/r600_textured_videofuncs.c	patch
+xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c			patch
+xsrc/external/mit/xf86-video-ati/dist/src/radeon.h			patch
+xsrc/external/mit/xf86-video-ati/dist/src/radeon_accel.c		patch
+xsrc/external/mit/xf86-video-ati/dist/src/radeon_accelfuncs.c		patch
+xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.c		patch
+xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.h		patch
+xsrc/external/mit/xf86-video-ati/dist/src/radeon_bios.c			patch
+xsrc/external/mit/xf86-video-ati/dist/src/radeon_chipinfo_gen.h		patch
+xsrc/external/mit/xf86-video-ati/dist/src/radeon_chipset_gen.h		patch
+xsrc/external/mit/xf86-video-ati/dist/src/radeon_commonfuncs.c		patch
+xsrc/external/mit/xf86-video-ati/dist/src/radeon_crtc.c			patch
+xsrc/external/mit/xf86-video-ati/dist/src/radeon_cursor.c		patch
+xsrc/external/mit/xf86-video-ati/dist/src/radeon_dga.c			patch
+xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri.c			patch
+xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri.h			patch
+xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri2.c			patch
+xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri2.h			patch
+xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c		patch
+xsrc/external/mit/xf86-video-ati/dist/src/radeon_drm.h			patch
+xsrc/external/mit/xf86-video-ati/dist/src/radeon_dummy_bufmgr.h		patch
+xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa.c			patch
+xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_funcs.c		patch
+xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_render.c		patch
+xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c		patch
+xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.h		patch

CVS commit: [netbsd-4-0] src/etc/ssh

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 15:34:14 UTC 2011

Modified Files:
src/etc/ssh [netbsd-4-0]: ssh_known_hosts

Log Message:
Pull up following revision(s) (requested by riz in ticket #1415):
etc/ssh/ssh_known_hosts: revision 1.6
releng has been on mollari for a while now. Also, add wiki


To generate a diff of this commit:
cvs rdiff -u -r1.4.12.1 -r1.4.12.2 src/etc/ssh/ssh_known_hosts

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

Modified files:

Index: src/etc/ssh/ssh_known_hosts
diff -u src/etc/ssh/ssh_known_hosts:1.4.12.1 src/etc/ssh/ssh_known_hosts:1.4.12.2
--- src/etc/ssh/ssh_known_hosts:1.4.12.1	Sat Sep  5 13:53:52 2009
+++ src/etc/ssh/ssh_known_hosts	Sun Jan 16 15:34:14 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: ssh_known_hosts,v 1.4.12.1 2009/09/05 13:53:52 bouyer Exp $
+#	$NetBSD: ssh_known_hosts,v 1.4.12.2 2011/01/16 15:34:14 bouyer Exp $
 #
 anoncvs.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA3QiBl8leG9fqIJpKeNov0PKq5YryFFiroMWOPUv4hDFn8R0jC07YVaR/OSBrr37CTmGX5AFceXPzoFnLlwCqWR7rXg4NR75FTlTp9CG9EBAEtU8mee27KDrUFBTZdfVl2+aRYoAI5fTXA+0vpIO68Cq843vRWUZCcwinS4cNLUU=
 
@@ -8,13 +8,13 @@
 
 mail.netbsd.org,homeworld.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAt8UJLhW8iou8Ack7V5XrzfCgzOkdK75+xDZePMBPg+CYDLnHbP1+KQaSrvfnvDzCvgOUXHOkGji1jbrtzDYwv7Itw0hRUo7TxR99c3bTomb9U0vWV5k4FDIyz4xJXWBJMVkKseAWAXgnc5FSdB6V/e21TAISJBl9dolhqOGVsxM=
 
-www.netbsd.org,www4.netbsd.org,gnats.netbsd.org,releng.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAyBrlCbbZ2lQxWt7c9Ru0byoOktalLWKJ4t0kzWp6C2oVa+Ll1c1TO2FJb34DCZqULfSHaMmKgq647d75npk9GeXXLk8QwcX6kNl7QFnHo7GUHnHtiZAjTMbYmYOaNLi1PjwyQH+9yeRQYsGW7xejTsyK0yuRKROdCl/QU9gkB3s=
+www.netbsd.org,www4.netbsd.org,gnats.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAyBrlCbbZ2lQxWt7c9Ru0byoOktalLWKJ4t0kzWp6C2oVa+Ll1c1TO2FJb34DCZqULfSHaMmKgq647d75npk9GeXXLk8QwcX6kNl7QFnHo7GUHnHtiZAjTMbYmYOaNLi1PjwyQH+9yeRQYsGW7xejTsyK0yuRKROdCl/QU9gkB3s=
 
 pkgbuild.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAz2c3dFuPdL75gpvwiYinwQ5jiRlfe3HvbXbMkTvpZxLFBQWTVkcDr/yd+vCiWcqVKVENX2tIvT91gPM9/iw7Wl82rxZ54jjaL0pWPL0yjSVhSFxff9pH+as5hgX4l1HjmXLB6v+MWyYVmOSpB01NfVVV2Z9+BGp3Y7i+U5pCdf0=
 
 build.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAzmmcuzoX0D/qDFdDJDyRgQGkUaNTEu7GdruMg1N+ajqvEoKQHQEEBrMdDbeYqCUYacHyhTRMrP6vZ27iX90rl9iS1lR2iPHp/mbnf+iV/BzdWROPvJWxp9/Am/DrYL+Idah5AYNnkC7fon9n+BeMqPDXYGYl/U+dAzp+8GHPhRc=
 
-blog.netbsd.org,rt.netbsd.org,monitor.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0=
+blog.netbsd.org,rt.netbsd.org,monitor.netbsd.org,releng.netbsd.org,wiki.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0=
 
 mollari.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0=
 

CVS commit: [netbsd-4] src/etc/ssh

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 15:34:17 UTC 2011

Modified Files:
src/etc/ssh [netbsd-4]: ssh_known_hosts

Log Message:
Pull up following revision(s) (requested by riz in ticket #1415):
etc/ssh/ssh_known_hosts: revision 1.6
releng has been on mollari for a while now. Also, add wiki


To generate a diff of this commit:
cvs rdiff -u -r1.4.2.1 -r1.4.2.2 src/etc/ssh/ssh_known_hosts

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

Modified files:

Index: src/etc/ssh/ssh_known_hosts
diff -u src/etc/ssh/ssh_known_hosts:1.4.2.1 src/etc/ssh/ssh_known_hosts:1.4.2.2
--- src/etc/ssh/ssh_known_hosts:1.4.2.1	Sat Sep  5 13:53:48 2009
+++ src/etc/ssh/ssh_known_hosts	Sun Jan 16 15:34:17 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: ssh_known_hosts,v 1.4.2.1 2009/09/05 13:53:48 bouyer Exp $
+#	$NetBSD: ssh_known_hosts,v 1.4.2.2 2011/01/16 15:34:17 bouyer Exp $
 #
 anoncvs.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA3QiBl8leG9fqIJpKeNov0PKq5YryFFiroMWOPUv4hDFn8R0jC07YVaR/OSBrr37CTmGX5AFceXPzoFnLlwCqWR7rXg4NR75FTlTp9CG9EBAEtU8mee27KDrUFBTZdfVl2+aRYoAI5fTXA+0vpIO68Cq843vRWUZCcwinS4cNLUU=
 
@@ -8,13 +8,13 @@
 
 mail.netbsd.org,homeworld.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAt8UJLhW8iou8Ack7V5XrzfCgzOkdK75+xDZePMBPg+CYDLnHbP1+KQaSrvfnvDzCvgOUXHOkGji1jbrtzDYwv7Itw0hRUo7TxR99c3bTomb9U0vWV5k4FDIyz4xJXWBJMVkKseAWAXgnc5FSdB6V/e21TAISJBl9dolhqOGVsxM=
 
-www.netbsd.org,www4.netbsd.org,gnats.netbsd.org,releng.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAyBrlCbbZ2lQxWt7c9Ru0byoOktalLWKJ4t0kzWp6C2oVa+Ll1c1TO2FJb34DCZqULfSHaMmKgq647d75npk9GeXXLk8QwcX6kNl7QFnHo7GUHnHtiZAjTMbYmYOaNLi1PjwyQH+9yeRQYsGW7xejTsyK0yuRKROdCl/QU9gkB3s=
+www.netbsd.org,www4.netbsd.org,gnats.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAyBrlCbbZ2lQxWt7c9Ru0byoOktalLWKJ4t0kzWp6C2oVa+Ll1c1TO2FJb34DCZqULfSHaMmKgq647d75npk9GeXXLk8QwcX6kNl7QFnHo7GUHnHtiZAjTMbYmYOaNLi1PjwyQH+9yeRQYsGW7xejTsyK0yuRKROdCl/QU9gkB3s=
 
 pkgbuild.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAz2c3dFuPdL75gpvwiYinwQ5jiRlfe3HvbXbMkTvpZxLFBQWTVkcDr/yd+vCiWcqVKVENX2tIvT91gPM9/iw7Wl82rxZ54jjaL0pWPL0yjSVhSFxff9pH+as5hgX4l1HjmXLB6v+MWyYVmOSpB01NfVVV2Z9+BGp3Y7i+U5pCdf0=
 
 build.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAzmmcuzoX0D/qDFdDJDyRgQGkUaNTEu7GdruMg1N+ajqvEoKQHQEEBrMdDbeYqCUYacHyhTRMrP6vZ27iX90rl9iS1lR2iPHp/mbnf+iV/BzdWROPvJWxp9/Am/DrYL+Idah5AYNnkC7fon9n+BeMqPDXYGYl/U+dAzp+8GHPhRc=
 
-blog.netbsd.org,rt.netbsd.org,monitor.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0=
+blog.netbsd.org,rt.netbsd.org,monitor.netbsd.org,releng.netbsd.org,wiki.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0=
 
 mollari.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0=
 

CVS commit: [netbsd-4-0] src/doc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 15:35:48 UTC 2011

Modified Files:
src/doc [netbsd-4-0]: CHANGES-4.0.2

Log Message:
ticket 1415


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.77 -r1.1.2.78 src/doc/CHANGES-4.0.2

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-4.0.2
diff -u src/doc/CHANGES-4.0.2:1.1.2.77 src/doc/CHANGES-4.0.2:1.1.2.78
--- src/doc/CHANGES-4.0.2:1.1.2.77	Tue Oct 12 10:16:56 2010
+++ src/doc/CHANGES-4.0.2	Sun Jan 16 15:35:48 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: CHANGES-4.0.2,v 1.1.2.77 2010/10/12 10:16:56 bouyer Exp $
+#	$NetBSD: CHANGES-4.0.2,v 1.1.2.78 2011/01/16 15:35:48 bouyer Exp $
 
 A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2
 release:
@@ -1082,3 +1082,8 @@
 	I was getting a SEGV with the example posted there.
 	[jnemeth, ticket #1408]
 
+etc/ssh/ssh_known_hosts1.6
+
+	releng has been on mollari for a while now. Also, add wiki
+	[riz, ticket #1415]
+

CVS commit: [netbsd-4] src/sys/arch/amiga/include

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 15:36:01 UTC 2011

Modified Files:
src/sys/arch/amiga/include [netbsd-4]: vmparam.h

Log Message:
Pull up following revision(s) (requested by mhitch in ticket #1416):
sys/arch/amiga/include/vmparam.h: revision 1.41
Raise address of user stack to the highest safe (for 68040 mmu) address,
which increases available user address space by 256MB.  One file in
pkgsrc/lang/php53 was too large for the amiga.  Also remove an old
presumably outdated comment.


To generate a diff of this commit:
cvs rdiff -u -r1.34.24.1 -r1.34.24.2 src/sys/arch/amiga/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/amiga/include/vmparam.h
diff -u src/sys/arch/amiga/include/vmparam.h:1.34.24.1 src/sys/arch/amiga/include/vmparam.h:1.34.24.2
--- src/sys/arch/amiga/include/vmparam.h:1.34.24.1	Wed May 23 23:04:30 2007
+++ src/sys/arch/amiga/include/vmparam.h	Sun Jan 16 15:36:01 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.34.24.1 2007/05/23 23:04:30 riz Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.34.24.2 2011/01/16 15:36:01 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -98,9 +98,8 @@
  * These are a mixture of i386, sun3 and hp settings.. 
  */
 
-/* Sun settings. Still hope, that I might get sun3 binaries to work... */
 #ifndef USRSTACK
-#define	USRSTACK	0x0E00
+#define	USRSTACK	0x1E00
 #endif
 #define KUSER_AREA	(-UPAGES*PAGE_SIZE)
 /*

CVS commit: [netbsd-4] src/doc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 16 15:36:46 UTC 2011

Modified Files:
src/doc [netbsd-4]: CHANGES-4.1

Log Message:
Tickets 1415 and 1416


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.213 -r1.1.2.214 src/doc/CHANGES-4.1

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-4.1
diff -u src/doc/CHANGES-4.1:1.1.2.213 src/doc/CHANGES-4.1:1.1.2.214
--- src/doc/CHANGES-4.1:1.1.2.213	Fri Dec 10 22:16:45 2010
+++ src/doc/CHANGES-4.1	Sun Jan 16 15:36:46 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: CHANGES-4.1,v 1.1.2.213 2010/12/10 22:16:45 bouyer Exp $
+#	$NetBSD: CHANGES-4.1,v 1.1.2.214 2011/01/16 15:36:46 bouyer Exp $
 
 A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1
 release:
@@ -4284,3 +4284,16 @@
 	builds, but, strangely enough, not in sparc builds.
 	[hauke, ticket #1412]
 
+etc/ssh/ssh_known_hosts1.6
+
+	releng has been on mollari for a while now. Also, add wiki
+	[riz, ticket #1415]
+
+sys/arch/amiga/include/vmparam.h		1.41
+
+	Raise address of user stack to the highest safe (for 68040 mmu) address,
+	which increases available user address space by 256MB.  One file in
+	pkgsrc/lang/php53 was too large for the amiga.  Also remove an old
+	presumably outdated comment.
+	[mhitch, ticket #1416]
+

CVS commit: src/libexec/ld.elf_so

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Sun Jan 16 15:56:37 UTC 2011

Modified Files:
src/libexec/ld.elf_so: rtld.h

Log Message:
Move powerpc gotptr to the end to preserve binary compatibility.


To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/libexec/ld.elf_so/rtld.h

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

Modified files:

Index: src/libexec/ld.elf_so/rtld.h
diff -u src/libexec/ld.elf_so/rtld.h:1.98 src/libexec/ld.elf_so/rtld.h:1.99
--- src/libexec/ld.elf_so/rtld.h:1.98	Sun Jan 16 01:22:29 2011
+++ src/libexec/ld.elf_so/rtld.h	Sun Jan 16 15:56:37 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtld.h,v 1.98 2011/01/16 01:22:29 matt Exp $	 */
+/*	$NetBSD: rtld.h,v 1.99 2011/01/16 15:56:37 matt Exp $	 */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -167,9 +167,6 @@
 	Elf_Wordsymtabno;	/* Number of dynamic symbols */
 	Elf_Wordgotsym;		/* First dynamic symbol in GOT */
 #endif
-#ifdef __powerpc__
-	Elf_Addr   *gotptr;		/* GOT table (secure-plt only) */
-#endif
 
 	const Elf_Symindx *buckets;	/* Hash table buckets array */
 	unsigned long	unused1;	/* Used to be nbuckets */
@@ -234,6 +231,9 @@
 	size_t		pathlen;	/* Pathname length */
 	STAILQ_HEAD(, Struct_Name_Entry) names;	/* List of names for this object we
 		   know about. */
+#ifdef __powerpc__
+	Elf_Addr   *gotptr;		/* GOT table (secure-plt only) */
+#endif
 } Obj_Entry;
 
 typedef struct Struct_DoneList {

CVS commit: src/share/mk

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Sun Jan 16 19:30:00 UTC 2011

Modified Files:
src/share/mk: sys.mk

Log Message:
Alpha doesn't need -traditional-cpp for assembler.


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 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/share/mk/sys.mk
diff -u src/share/mk/sys.mk:1.101 src/share/mk/sys.mk:1.102
--- src/share/mk/sys.mk:1.101	Wed Jan 12 23:12:11 2011
+++ src/share/mk/sys.mk	Sun Jan 16 19:29:59 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: sys.mk,v 1.101 2011/01/12 23:12:11 joerg Exp $
+#	$NetBSD: sys.mk,v 1.102 2011/01/16 19:29:59 joerg Exp $
 #	@(#)sys.mk	8.2 (Berkeley) 3/21/94
 
 unix?=		We run NetBSD.
@@ -15,7 +15,8 @@
 AFLAGS?=
 COMPILE.s?=	${CC} ${AFLAGS} -c
 LINK.s?=	${CC} ${AFLAGS} ${LDFLAGS}
-.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
+.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64 || \
+${MACHINE_ARCH} == alpha
 _ASM_TRADITIONAL_CPP=	-x assembler-with-cpp
 .else
 _ASM_TRADITIONAL_CPP=	-traditional-cpp

CVS commit: src/sys/compat/netbsd32

[Nicolas Joly]

Module Name:src
Committed By:   njoly
Date:   Sun Jan 16 23:21:17 UTC 2011

Modified Files:
src/sys/compat/netbsd32: netbsd32_conv.h

Log Message:
In stat structure conversions, do set st_birthtimespec member values
if exists.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/compat/netbsd32/netbsd32_conv.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/compat/netbsd32/netbsd32_conv.h
diff -u src/sys/compat/netbsd32/netbsd32_conv.h:1.23 src/sys/compat/netbsd32/netbsd32_conv.h:1.24
--- src/sys/compat/netbsd32/netbsd32_conv.h:1.23	Tue Jan  4 11:00:31 2011
+++ src/sys/compat/netbsd32/netbsd32_conv.h	Sun Jan 16 23:21:16 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_conv.h,v 1.23 2011/01/04 11:00:31 matt Exp $	*/
+/*	$NetBSD: netbsd32_conv.h,v 1.24 2011/01/16 23:21:16 njoly Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -400,6 +400,8 @@
 	sb32p-st_blocks = sbp-st_blocks;
 	sb32p-st_flags = sbp-st_flags;
 	sb32p-st_gen = sbp-st_gen;
+	sb32p-st_birthtimespec.tv_sec = (int32_t)sbp-st_birthtimespec.tv_sec;
+	sb32p-st_birthtimespec.tv_nsec = (netbsd32_long)sbp-st_birthtimespec.tv_nsec;
 }
 
 static __inline void
@@ -419,6 +421,8 @@
 	sb32p-st_mtimespec.tv_nsec = (netbsd32_long)sbp-st_mtimespec.tv_nsec;
 	sb32p-st_ctimespec.tv_sec = (int32_t)sbp-st_ctimespec.tv_sec;
 	sb32p-st_ctimespec.tv_nsec = (netbsd32_long)sbp-st_ctimespec.tv_nsec;
+	sb32p-st_birthtimespec.tv_sec = (int32_t)sbp-st_birthtimespec.tv_sec;
+	sb32p-st_birthtimespec.tv_nsec = (netbsd32_long)sbp-st_birthtimespec.tv_nsec;
 	sb32p-st_blksize = sbp-st_blksize;
 	sb32p-st_blocks = sbp-st_blocks;
 	sb32p-st_flags = sbp-st_flags;
@@ -442,6 +446,8 @@
 	sb32p-st_mtimespec.tv_nsec = (netbsd32_long)sbp-st_mtimespec.tv_nsec;
 	sb32p-st_ctimespec.tv_sec = (netbsd32_time_t)sbp-st_ctimespec.tv_sec;
 	sb32p-st_ctimespec.tv_nsec = (netbsd32_long)sbp-st_ctimespec.tv_nsec;
+	sb32p-st_birthtimespec.tv_sec = (netbsd32_time_t)sbp-st_birthtimespec.tv_sec;
+	sb32p-st_birthtimespec.tv_nsec = (netbsd32_long)sbp-st_birthtimespec.tv_nsec;
 	sb32p-st_blksize = sbp-st_blksize;
 	sb32p-st_blocks = sbp-st_blocks;
 	sb32p-st_flags = sbp-st_flags;

CVS commit: src/doc

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Mon Jan 17 01:35:25 UTC 2011

Modified Files:
src/doc: CHANGES

Log Message:
Note secureplt support for powerpc.


To generate a diff of this commit:
cvs rdiff -u -r1.1489 -r1.1490 src/doc/CHANGES

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
diff -u src/doc/CHANGES:1.1489 src/doc/CHANGES:1.1490
--- src/doc/CHANGES:1.1489	Fri Jan 14 10:34:15 2011
+++ src/doc/CHANGES	Mon Jan 17 01:35:24 2011
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1489 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1490 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -824,3 +824,6 @@
 		now possible. [jakllsch 20110106]
 	sigqueue(2): Implement sigqueue/sigqueueinfo [christos 20110109]
 	amiga: Add a driver for BlizzardPPC 603e+ SCSI [phx 20110114]
+	powerpc: Add support for using secure PLT (thereby allowing data
+		and bss of powerpc programs and shared library to be set
+		non-executable). [matt 20110115]

CVS commit: src/usr.bin/xlint/lint1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Jan 17 03:04:10 UTC 2011

Modified Files:
src/usr.bin/xlint/lint1: mem1.c

Log Message:
PR/44235: Valeriy E. Ushakov: Don't pick up a block from the free list if
it is not big enough, allocate a new one. XXX: this is inefficient, but at
least it does not end up corrupting memory.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/xlint/lint1/mem1.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/xlint/lint1/mem1.c
diff -u src/usr.bin/xlint/lint1/mem1.c:1.13 src/usr.bin/xlint/lint1/mem1.c:1.14
--- src/usr.bin/xlint/lint1/mem1.c:1.13	Wed Aug  5 15:08:28 2009
+++ src/usr.bin/xlint/lint1/mem1.c	Sun Jan 16 22:04:10 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem1.c,v 1.13 2009/08/05 19:08:28 wiz Exp $	*/
+/*	$NetBSD: mem1.c,v 1.14 2011/01/17 03:04:10 christos Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
 
 #include sys/cdefs.h
 #if defined(__RCSID)  !defined(lint)
-__RCSID($NetBSD: mem1.c,v 1.13 2009/08/05 19:08:28 wiz Exp $);
+__RCSID($NetBSD: mem1.c,v 1.14 2011/01/17 03:04:10 christos Exp $);
 #endif
 
 #include sys/types.h
@@ -194,7 +194,7 @@
 
 	s = ALIGN(s);
 	if ((mb = *mbp) == NULL || mb-nfree  s) {
-		if ((mb = frmblks) == NULL) {
+		if ((mb = frmblks) == NULL || mb-size  s) {
 			if (s  mblklen) {
 t = mblklen;
 mblklen = s;

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

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Mon Jan 17 06:55:49 UTC 2011

Modified Files:
src/sys/arch/powerpc/ibm4xx: ibm4xx_machdep.c

Log Message:
Add a #include machine/pcb.h


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/ibm4xx/ibm4xx_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/ibm4xx/ibm4xx_machdep.c
diff -u src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.13 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.14
--- src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.13	Thu Feb 25 23:31:47 2010
+++ src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c	Mon Jan 17 06:55:49 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ibm4xx_machdep.c,v 1.13 2010/02/25 23:31:47 matt Exp $	*/
+/*	$NetBSD: ibm4xx_machdep.c,v 1.14 2011/01/17 06:55:49 matt Exp $	*/
 /*	Original: ibm40x_machdep.c,v 1.3 2005/01/17 17:19:36 shige Exp $ */
 
 /*
@@ -68,7 +68,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ibm4xx_machdep.c,v 1.13 2010/02/25 23:31:47 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: ibm4xx_machdep.c,v 1.14 2011/01/17 06:55:49 matt Exp $);
 
 #include opt_compat_netbsd.h
 #include opt_ddb.h
@@ -95,6 +95,7 @@
 #endif
 
 #include machine/powerpc.h
+#include powerpc/pcb.h
 #include powerpc/spr.h
 #include powerpc/ibm4xx/spr.h
 #include machine/trap.h

CVS commit: src/sys/arch/ofppc/ofppc

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Mon Jan 17 07:06:10 UTC 2011

Modified Files:
src/sys/arch/ofppc/ofppc: locore.S

Log Message:
Use %rX instead of X.  (no function change).


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/ofppc/ofppc/locore.S

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/ofppc/ofppc/locore.S
diff -u src/sys/arch/ofppc/ofppc/locore.S:1.44 src/sys/arch/ofppc/ofppc/locore.S:1.45
--- src/sys/arch/ofppc/ofppc/locore.S:1.44	Wed Mar 10 18:06:57 2010
+++ src/sys/arch/ofppc/ofppc/locore.S	Mon Jan 17 07:06:10 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.44 2010/03/10 18:06:57 kiyohara Exp $	*/
+/*	$NetBSD: locore.S,v 1.45 2011/01/17 07:06:10 matt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -85,35 +85,35 @@
 __start:
 	bl	_C_LABEL(ofwinit)	/* init our OF hooks */
 
-	li	0,0
-	mtmsr	0			/* Disable FPU/MMU/exceptions */
+	li	%r0,0
+	mtmsr	%r0			/* Disable FPU/MMU/exceptions */
 
 	bl	_C_LABEL(cpu_model_init)
-	lis	12,oeacpufeat@ha
-	lwz	12,oeacpufeat@l(12)
-	andi.	12,12,OEACPU_64_BRIDGE	/* Compare against OEACPU_64_BRIDGE */
+	lis	%r12,oeacpufeat@ha
+	lwz	%r12,oeacpufeat@l(%r12)
+	andi.	%r12,%r12,OEACPU_64_BRIDGE	/* Compare against OEACPU_64_BRIDGE */
 	beq	2f			/* skip if this is a 32bit part */
-	li	0,0
+	li	%r0,0
 	sync
 	slbia/* invalidate the slb table */
 	sync
-	clrldi	0,0,32			/* clear SF/ISF (high order bits) */
-	mtmsrd	0
+	clrldi	%r0,%r0,32		/* clear SF/ISF (high order bits) */
+	mtmsrd	%r0
 	mtspr	0x118,0		/* clear ASR[V] to enable segregs */
 2:
 	isync
 	/* compute end of kernel memory */
-lis	4,_C_LABEL(end)@ha
-addi	4,4,_C_LABEL(end)@l
+lis	%r4,_C_LABEL(end)@ha
+addi	%r4,%r4,_C_LABEL(end)@l
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	/* skip symbol table */
-	cmpwi	6,0
+	cmpwi	%r6,0
 	beq	1f
-	add	9,6,7			/* r9 = args + l */
-	lwz	9,-8(9)			/* esym */
-	cmpwi	9,0
+	add	%r9,%r6,%r7			/* r9 = args + l */
+	lwz	%r9,-8(%r9)			/* esym */
+	cmpwi	%r9,0
 	beq	1f
-	mr	4,9
+	mr	%r4,%r9
 1:
 #endif
 
@@ -121,11 +121,11 @@
 	/*
 	 * Initialize cpu_info[0]
 	 */
-	INIT_CPUINFO(4,1,9,0)
+	INIT_CPUINFO(%r4,%r1,%r9,%r0)
 
-	lis	3,__start@ha
-	addi	3,3,__start@l
-	mr	5,6			/* args string */
+	lis	%r3,__start@ha
+	addi	%r3,%r3,__start@l
+	mr	%r5,%r6			/* args string */
 	bl	_C_LABEL(initppc)
 	bl	_C_LABEL(main)
 	b	_C_LABEL(OF_exit)

CVS commit: src/sys/lib/libkern/arch/powerpc

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Mon Jan 17 07:07:36 UTC 2011

Modified Files:
src/sys/lib/libkern/arch/powerpc: memset.S

Log Message:
Don't define _NOREGNAMES since all of libkern is now compiled with it.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/lib/libkern/arch/powerpc/memset.S

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

Modified files:

Index: src/sys/lib/libkern/arch/powerpc/memset.S
diff -u src/sys/lib/libkern/arch/powerpc/memset.S:1.6 src/sys/lib/libkern/arch/powerpc/memset.S:1.7
--- src/sys/lib/libkern/arch/powerpc/memset.S:1.6	Sun Mar  4 06:03:12 2007
+++ src/sys/lib/libkern/arch/powerpc/memset.S	Mon Jan 17 07:07:36 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: memset.S,v 1.6 2007/03/04 06:03:12 christos Exp $ */
+/*	$NetBSD: memset.S,v 1.7 2011/01/17 07:07:36 matt Exp $ */
 
 /*-
  * Copyright (C) 2003	Matt Thomas m...@3am-software.com
@@ -29,7 +29,6 @@
  */
 /*--*/
 
-#define _NOREGNAMES
 #include machine/asm.h
 
 /*--*/

CVS commit: src/sys/kern

[Masao Uebayashi]

Module Name:src
Committed By:   uebayasi
Date:   Mon Jan 17 07:13:33 UTC 2011

Modified Files:
src/sys/kern: exec_macho.c exec_subr.c init_main.c kern_idle.c
kern_malloc_debug.c kern_proc.c kern_sig.c subr_pool.c sys_pipe.c
uipc_mbuf.c uipc_socket.c vfs_bio.c vfs_subr.c

Log Message:
Include internal definitions (uvm/uvm.h) only where necessary.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/kern/exec_macho.c
cvs rdiff -u -r1.66 -r1.67 src/sys/kern/exec_subr.c
cvs rdiff -u -r1.424 -r1.425 src/sys/kern/init_main.c
cvs rdiff -u -r1.23 -r1.24 src/sys/kern/kern_idle.c \
src/sys/kern/kern_malloc_debug.c
cvs rdiff -u -r1.168 -r1.169 src/sys/kern/kern_proc.c
cvs rdiff -u -r1.306 -r1.307 src/sys/kern/kern_sig.c
cvs rdiff -u -r1.186 -r1.187 src/sys/kern/subr_pool.c
cvs rdiff -u -r1.128 -r1.129 src/sys/kern/sys_pipe.c
cvs rdiff -u -r1.138 -r1.139 src/sys/kern/uipc_mbuf.c
cvs rdiff -u -r1.201 -r1.202 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.226 -r1.227 src/sys/kern/vfs_bio.c
cvs rdiff -u -r1.417 -r1.418 src/sys/kern/vfs_subr.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/exec_macho.c
diff -u src/sys/kern/exec_macho.c:1.44 src/sys/kern/exec_macho.c:1.45
--- src/sys/kern/exec_macho.c:1.44	Fri Nov 19 06:44:42 2010
+++ src/sys/kern/exec_macho.c	Mon Jan 17 07:13:31 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec_macho.c,v 1.44 2010/11/19 06:44:42 dholland Exp $	*/
+/*	$NetBSD: exec_macho.c,v 1.45 2011/01/17 07:13:31 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: exec_macho.c,v 1.44 2010/11/19 06:44:42 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: exec_macho.c,v 1.45 2011/01/17 07:13:31 uebayasi Exp $);
 
 #include sys/param.h
 #include sys/proc.h
@@ -45,7 +45,7 @@
 #include sys/mount.h
 #include sys/stat.h
 
-#include uvm/uvm.h
+#include uvm/uvm_extern.h
 
 #ifdef DEBUG_MACHO
 #define DPRINTF(a) printf a

Index: src/sys/kern/exec_subr.c
diff -u src/sys/kern/exec_subr.c:1.66 src/sys/kern/exec_subr.c:1.67
--- src/sys/kern/exec_subr.c:1.66	Fri Dec 17 22:35:07 2010
+++ src/sys/kern/exec_subr.c	Mon Jan 17 07:13:31 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec_subr.c,v 1.66 2010/12/17 22:35:07 yamt Exp $	*/
+/*	$NetBSD: exec_subr.c,v 1.67 2011/01/17 07:13:31 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994, 1996 Christopher G. Demetriou
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: exec_subr.c,v 1.66 2010/12/17 22:35:07 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: exec_subr.c,v 1.67 2011/01/17 07:13:31 uebayasi Exp $);
 
 #include opt_pax.h
 
@@ -50,7 +50,7 @@
 #include sys/pax.h
 #endif /* PAX_MPROTECT */
 
-#include uvm/uvm.h
+#include uvm/uvm_extern.h
 
 #define	VMCMD_EVCNT_DECL(name)	\
 static struct evcnt vmcmd_ev_##name =\

Index: src/sys/kern/init_main.c
diff -u src/sys/kern/init_main.c:1.424 src/sys/kern/init_main.c:1.425
--- src/sys/kern/init_main.c:1.424	Thu Dec 16 00:42:22 2010
+++ src/sys/kern/init_main.c	Mon Jan 17 07:13:31 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: init_main.c,v 1.424 2010/12/16 00:42:22 eeh Exp $	*/
+/*	$NetBSD: init_main.c,v 1.425 2011/01/17 07:13:31 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: init_main.c,v 1.424 2010/12/16 00:42:22 eeh Exp $);
+__KERNEL_RCSID(0, $NetBSD: init_main.c,v 1.425 2011/01/17 07:13:31 uebayasi Exp $);
 
 #include opt_ddb.h
 #include opt_ipsec.h
@@ -217,7 +217,7 @@
 
 #include sys/cpu.h
 
-#include uvm/uvm.h
+#include uvm/uvm.h	/* extern struct uvm uvm */
 
 #if NSYSMON_TASKQ  0
 #include dev/sysmon/sysmon_taskq.h

Index: src/sys/kern/kern_idle.c
diff -u src/sys/kern/kern_idle.c:1.23 src/sys/kern/kern_idle.c:1.24
--- src/sys/kern/kern_idle.c:1.23	Sun Jul 19 10:11:55 2009
+++ src/sys/kern/kern_idle.c	Mon Jan 17 07:13:31 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_idle.c,v 1.23 2009/07/19 10:11:55 yamt Exp $	*/
+/*	$NetBSD: kern_idle.c,v 1.24 2011/01/17 07:13:31 uebayasi Exp $	*/
 
 /*-
  * Copyright (c)2002, 2006, 2007 YAMAMOTO Takashi,
@@ -28,7 +28,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(0, $NetBSD: kern_idle.c,v 1.23 2009/07/19 10:11:55 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_idle.c,v 1.24 2011/01/17 07:13:31 uebayasi Exp $);
 
 #include sys/param.h
 #include sys/cpu.h
@@ -39,7 +39,7 @@
 #include sys/proc.h
 #include sys/atomic.h
 
-#include uvm/uvm.h
+#include uvm/uvm.h	/* uvm_pageidlezero */
 #include uvm/uvm_extern.h
 
 void
Index: src/sys/kern/kern_malloc_debug.c
diff -u src/sys/kern/kern_malloc_debug.c:1.23 src/sys/kern/kern_malloc_debug.c:1.24
--- src/sys/kern/kern_malloc_debug.c:1.23	Fri May 14 05:02:06 2010
+++ src/sys/kern/kern_malloc_debug.c	Mon Jan 17 07:13:31 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_malloc_debug.c,v 1.23 2010/05/14 05:02:06 cegger 

CVS commit: src/common/lib/libc/arch/hppa/atomic

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Jan 17 07:29:18 UTC 2011

Modified Files:
src/common/lib/libc/arch/hppa/atomic: Makefile.inc

Log Message:
Tweak layout - no functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/common/lib/libc/arch/hppa/atomic/Makefile.inc

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

Modified files:

Index: src/common/lib/libc/arch/hppa/atomic/Makefile.inc
diff -u src/common/lib/libc/arch/hppa/atomic/Makefile.inc:1.7 src/common/lib/libc/arch/hppa/atomic/Makefile.inc:1.8
--- src/common/lib/libc/arch/hppa/atomic/Makefile.inc:1.7	Tue Jan  6 13:23:31 2009
+++ src/common/lib/libc/arch/hppa/atomic/Makefile.inc	Mon Jan 17 07:29:17 2011
@@ -1,19 +1,23 @@
-#	$NetBSD: Makefile.inc,v 1.7 2009/01/06 13:23:31 mjf Exp $
+#	$NetBSD: Makefile.inc,v 1.8 2011/01/17 07:29:17 skrll Exp $
 
-.if defined(LIB)  (${LIB} == kern || ${LIB} == c || ${LIB} == pthread \
-	|| ${LIB} == rump)
+.if defined(LIB)
+
+.  if (${LIB} == kern || ${LIB} == c || ${LIB} == pthread || \
+${LIB} == rump)
 
 SRCS+=	atomic_add_32_cas.c atomic_add_32_nv_cas.c atomic_and_32_cas.c \
 	atomic_and_32_nv_cas.c atomic_dec_32_cas.c atomic_dec_32_nv_cas.c \
 	atomic_inc_32_cas.c atomic_inc_32_nv_cas.c atomic_or_32_cas.c \
 	atomic_or_32_nv_cas.c atomic_swap_32_cas.c membar_ops_nop.c
 
-.endif
+.  endif
 
-.if defined(LIB)  (${LIB} == c || ${LIB} == pthread)
+.  if (${LIB} == c || ${LIB} == pthread)
 
 SRCS+=	atomic_init_testset.c
 SRCS+=	atomic_cas_up.S
 CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_UP
 
+.  endif
+
 .endif

CVS commit: src/share/man/man4/man4.x86

[Jukka Ruohonen]

Module Name:src
Committed By:   jruoho
Date:   Mon Jan 17 07:32:05 UTC 2011

Modified Files:
src/share/man/man4/man4.x86: ioapic.4

Log Message:
Add two more references.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/man4.x86/ioapic.4

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/man4/man4.x86/ioapic.4
diff -u src/share/man/man4/man4.x86/ioapic.4:1.3 src/share/man/man4/man4.x86/ioapic.4:1.4
--- src/share/man/man4/man4.x86/ioapic.4:1.3	Fri Jan 14 07:11:19 2011
+++ src/share/man/man4/man4.x86/ioapic.4	Mon Jan 17 07:32:05 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: ioapic.4,v 1.3 2011/01/14 07:11:19 jruoho Exp $
+.\	$NetBSD: ioapic.4,v 1.4 2011/01/17 07:32:05 jruoho Exp $
 .\
 .\ Copyright (c) 2011 Jukka Ruohonen jruoho...@iki.fi
 .\ All rights reserved.
@@ -24,7 +24,7 @@
 .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\ POSSIBILITY OF SUCH DAMAGE.
 .\
-.Dd January 14, 2011
+.Dd January 17, 2011
 .Dt IOAPIC 4 x86
 .Os
 .Sh NAME
@@ -141,6 +141,19 @@
 .%D December, 1988
 .%U http://pdos.csail.mit.edu/6.828/2005/readings/hardware/8259A.pdf
 .Re
+.Rs
+.%A John Baldwin
+.%T PCI Interrupts for x86 Machines under FreeBSD
+.%D May 18-19, 2007
+.%O Proceedings of BSDCan 2007
+.%U http://people.freebsd.org/~jhb/papers/bsdcan/2007/article.pdf
+.Re
+.Rs
+.%A Microsoft Corporation
+.%T PCI IRQ Routing on a Multiprocessor ACPI System
+.%D December 4, 2001
+.%U http://www.microsoft.com/whdc/archive/acpi-mp.mspx
+.Re
 .Sh AUTHORS
 .An -nosplit
 Authors of the

CVS commit: src/sys/arch/evbppc/virtex

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Mon Jan 17 07:32:55 UTC 2011

Modified Files:
src/sys/arch/evbppc/virtex: machdep.c

Log Message:
Add #include machine/pcb.h


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbppc/virtex/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/evbppc/virtex/machdep.c
diff -u src/sys/arch/evbppc/virtex/machdep.c:1.14 src/sys/arch/evbppc/virtex/machdep.c:1.15
--- src/sys/arch/evbppc/virtex/machdep.c:1.14	Thu Feb 25 23:33:44 2010
+++ src/sys/arch/evbppc/virtex/machdep.c	Mon Jan 17 07:32:54 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.14 2010/02/25 23:33:44 matt Exp $ */
+/*	$NetBSD: machdep.c,v 1.15 2011/01/17 07:32:54 matt Exp $ */
 
 /*
  * Copyright (c) 2006 Jachym Holecek
@@ -34,7 +34,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.14 2010/02/25 23:33:44 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.15 2011/01/17 07:32:54 matt Exp $);
 
 #include opt_compat_netbsd.h
 #include opt_ddb.h
@@ -69,6 +69,7 @@
 #include machine/bus.h
 #include machine/powerpc.h
 #include machine/trap.h
+#include machine/pcb.h
 
 #include powerpc/spr.h
 #include powerpc/ibm4xx/spr.h

CVS commit: src/doc

[Jukka Ruohonen]

Module Name:src
Committed By:   jruoho
Date:   Mon Jan 17 07:33:16 UTC 2011

Modified Files:
src/doc: CHANGES

Log Message:
Replace reference to nonexistent if_otus(4) with otus(4).


To generate a diff of this commit:
cvs rdiff -u -r1.1490 -r1.1491 src/doc/CHANGES

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
diff -u src/doc/CHANGES:1.1490 src/doc/CHANGES:1.1491
--- src/doc/CHANGES:1.1490	Mon Jan 17 01:35:24 2011
+++ src/doc/CHANGES	Mon Jan 17 07:33:16 2011
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1490 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1491 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -761,7 +761,7 @@
 	lua(1): Import of Lua 5.1.4. [mbalmer 20101031]
 	raidframe(4): Support greater than 2TB devices.  [mrg 20101101]
 	xz(1): Import of XZ 5.0.0. [joerg 20101102]
-	if_otus(4): Port the Atheros AR9001U from OpenBSD (Anon Ymous)
+	otus(4): Port the Atheros AR9001U from OpenBSD (Anon Ymous)
 		[christos 20101103]
 	fujitsu(4): Add brightness and hotkey drivers for Fujitsu laptops.
 		[gsutre 20101105]

CVS commit: src/doc

[Jukka Ruohonen]

Module Name:src
Committed By:   jruoho
Date:   Mon Jan 17 07:35:02 UTC 2011

Modified Files:
src/doc: BRANCHES

Log Message:
Note jruoho-x86intr branch.


To generate a diff of this commit:
cvs rdiff -u -r1.302 -r1.303 src/doc/BRANCHES

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

Modified files:

Index: src/doc/BRANCHES
diff -u src/doc/BRANCHES:1.302 src/doc/BRANCHES:1.303
--- src/doc/BRANCHES:1.302	Fri Jan  7 01:11:03 2011
+++ src/doc/BRANCHES	Mon Jan 17 07:35:02 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: BRANCHES,v 1.302 2011/01/07 01:11:03 matt Exp $
+#	$NetBSD: BRANCHES,v 1.303 2011/01/17 07:35:02 jruoho Exp $
 #
 # This file contains a list of branches that exist in the NetBSD CVS
 # tree and their current state.
@@ -331,6 +331,20 @@
 		2. update files in the branch
 			sh -e src/sys/dev/usb/filelist
 
+Branch:		jruoho-x86intr
+Description:	Cleanup and rework the x86 APIC and PIC subsystems
+Status:		Active
+Start Date:	17 January 2011
+End Date:
+Base Tag:	jruoho-x86intr-base
+Maintainer:	Jukka Ruohonen jru...@netbsd.org
+Scope:		kernel
+Notes:		This branch aims to cleanup the x86 interrupt routing code.
+		In particular, a new implementation is provided for all
+		elements of the APIC that involve ACPI. In addition, better
+		abstractions are provided for the whole PIC layer. The main
+		work areas are sys/arch/x86 and sys/dev/acpi.
+
 Branch:		jym-xensuspend
 Description:	Implement xm save/restore/migrate for NetBSD domU
 Status:		Active

CVS commit: [matt-nb5-pq3] src/sys/arch/evbppc/conf

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Mon Jan 17 07:36:36 UTC 2011

Modified Files:
src/sys/arch/evbppc/conf [matt-nb5-pq3]: MPC8536DS

Log Message:
sdhc has problems; comment out for now.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/evbppc/conf/MPC8536DS

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/evbppc/conf/MPC8536DS
diff -u src/sys/arch/evbppc/conf/MPC8536DS:1.1.2.1 src/sys/arch/evbppc/conf/MPC8536DS:1.1.2.2
--- src/sys/arch/evbppc/conf/MPC8536DS:1.1.2.1	Fri Jan  7 01:40:36 2011
+++ src/sys/arch/evbppc/conf/MPC8536DS	Mon Jan 17 07:36:36 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: MPC8536DS,v 1.1.2.1 2011/01/07 01:40:36 matt Exp $
+#	$NetBSD: MPC8536DS,v 1.1.2.2 2011/01/17 07:36:36 matt Exp $
 #
 #	MPC8536DS -- everything that's currently supported
 #
@@ -7,7 +7,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident 		MPC8536DS-$Revision: 1.1.2.1 $
+ident 		MPC8536DS-$Revision: 1.1.2.2 $
 
 maxusers	32
 
@@ -196,9 +196,9 @@
 scsibus*	at umass? channel ?
 sd*		at scsibus? target ? lun ?
 
-sdhc*		at cpunode?		# sdmmc
-sdmmc*		at sdhc?		# SD/MMC bus
-ld*		at sdmmc?
+#sdhc*		at cpunode?		# sdmmc
+#sdmmc*		at sdhc?		# SD/MMC bus
+#ld*		at sdmmc?
 
 #siisata*	at pci? dev ? function ?
 #atabus* 	at siisata? channel ?

CVS commit: src/sys/kern

[Masao Uebayashi]

Module Name:src
Committed By:   uebayasi
Date:   Mon Jan 17 07:36:58 UTC 2011

Modified Files:
src/sys/kern: subr_pool.c

Log Message:
Fix a conditional include.


To generate a diff of this commit:
cvs rdiff -u -r1.187 -r1.188 src/sys/kern/subr_pool.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/subr_pool.c
diff -u src/sys/kern/subr_pool.c:1.187 src/sys/kern/subr_pool.c:1.188
--- src/sys/kern/subr_pool.c:1.187	Mon Jan 17 07:13:32 2011
+++ src/sys/kern/subr_pool.c	Mon Jan 17 07:36:58 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_pool.c,v 1.187 2011/01/17 07:13:32 uebayasi Exp $	*/
+/*	$NetBSD: subr_pool.c,v 1.188 2011/01/17 07:36:58 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: subr_pool.c,v 1.187 2011/01/17 07:13:32 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_pool.c,v 1.188 2011/01/17 07:36:58 uebayasi Exp $);
 
 #include opt_ddb.h
 #include opt_pool.h
@@ -55,6 +55,9 @@
 #include sys/atomic.h
 
 #include uvm/uvm_extern.h
+#ifdef DIAGNOSTIC
+#include uvm/uvm_km.h	/* uvm_km_va_drain */
+#endif
 
 /*
  * Pool resource management utility.

CVS commit: [matt-nb5-pq3] src/sys/arch/evbppc/conf

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Mon Jan 17 07:37:33 UTC 2011

Modified Files:
src/sys/arch/evbppc/conf [matt-nb5-pq3]: PMPPC

Log Message:
Add TMPFS


To generate a diff of this commit:
cvs rdiff -u -r1.5.12.1 -r1.5.12.2 src/sys/arch/evbppc/conf/PMPPC

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/evbppc/conf/PMPPC
diff -u src/sys/arch/evbppc/conf/PMPPC:1.5.12.1 src/sys/arch/evbppc/conf/PMPPC:1.5.12.2
--- src/sys/arch/evbppc/conf/PMPPC:1.5.12.1	Fri Jan  7 01:44:17 2011
+++ src/sys/arch/evbppc/conf/PMPPC	Mon Jan 17 07:37:33 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: PMPPC,v 1.5.12.1 2011/01/07 01:44:17 matt Exp $
+#	$NetBSD: PMPPC,v 1.5.12.2 2011/01/17 07:37:33 matt Exp $
 #
 #	PMPPC
 #
@@ -73,6 +73,7 @@
 file-system 	OVERLAY		# overlay file system
 file-system 	PORTAL		# portal filesystem (still experimental)
 file-system 	PROCFS		# /proc
+file-system 	TMPFS		# efficient memory file-system
 file-system 	UMAPFS		# NULLFS + uid and gid remapping
 file-system 	UNION		# union file system
 file-system	PTYFS		# /dev/pts/N support

CVS commit: src/common/lib/libc/arch/hppa/atomic

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Jan 17 07:40:21 UTC 2011

Added Files:
src/common/lib/libc/arch/hppa/atomic: membar_ops.S

Log Message:
Add an membar_ops.S - not used currently.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/common/lib/libc/arch/hppa/atomic/membar_ops.S

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

Added files:

Index: src/common/lib/libc/arch/hppa/atomic/membar_ops.S
diff -u /dev/null src/common/lib/libc/arch/hppa/atomic/membar_ops.S:1.1
--- /dev/null	Mon Jan 17 07:40:21 2011
+++ src/common/lib/libc/arch/hppa/atomic/membar_ops.S	Mon Jan 17 07:40:21 2011
@@ -0,0 +1,67 @@
+/*	$NetBSD: membar_ops.S,v 1.1 2011/01/17 07:40:21 skrll Exp $	*/
+
+/*-
+ * Copyright (c) 2007 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe, 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.
+ * 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.
+ */
+
+#include atomic_op_asm.h
+
+RCSID($NetBSD: membar_ops.S,v 1.1 2011/01/17 07:40:21 skrll Exp $)
+
+	.text
+
+LEAF_ENTRY(_membar_consumer)
+	sync
+	nop
+	nop
+	nop
+	nop
+	nop
+	bv	%r0(%rp)
+	 nop
+EXIT(_membar_consumer)
+
+LEAF_ENTRY(_membar_producer)
+	sync
+	nop
+	nop
+	nop
+	nop
+	nop
+	bv	%r0(%rp)
+	 nop
+EXIT(_membar_producer)
+
+ATOMIC_OP_ALIAS(membar_producer,_membar_producer)
+ATOMIC_OP_ALIAS(membar_consumer,_membar_consumer)
+ATOMIC_OP_ALIAS(membar_enter,_membar_consumer)
+STRONG_ALIAS(_membar_enter,_membar_consumer)
+ATOMIC_OP_ALIAS(membar_exit,_membar_producer)
+STRONG_ALIAS(_membar_exit,_membar_producer)
+ATOMIC_OP_ALIAS(membar_sync,_membar_producer)
+STRONG_ALIAS(_membar_sync,_membar_producer)

CVS commit: [matt-nb5-pq3] src/sys/arch/evbppc

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Mon Jan 17 07:47:20 UTC 2011

Modified Files:
src/sys/arch/evbppc/conf [matt-nb5-pq3]: RB800
src/sys/arch/evbppc/mpc85xx [matt-nb5-pq3]: machdep.c mpc85xx_start.S

Log Message:
Enable SPE for RB800.
Add SPE tidbits for mpc85xx.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/evbppc/conf/RB800
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/evbppc/mpc85xx/machdep.c \
src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S

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/evbppc/conf/RB800
diff -u src/sys/arch/evbppc/conf/RB800:1.1.2.1 src/sys/arch/evbppc/conf/RB800:1.1.2.2
--- src/sys/arch/evbppc/conf/RB800:1.1.2.1	Fri Jan  7 01:40:36 2011
+++ src/sys/arch/evbppc/conf/RB800	Mon Jan 17 07:47:20 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: RB800,v 1.1.2.1 2011/01/07 01:40:36 matt Exp $
+#	$NetBSD: RB800,v 1.1.2.2 2011/01/17 07:47:20 matt Exp $
 #
 #	RB800 -- everything that's currently supported
 #
@@ -7,7 +7,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident 		RB800-$Revision: 1.1.2.1 $
+ident 		RB800-$Revision: 1.1.2.2 $
 
 maxusers	32
 
@@ -15,6 +15,7 @@
 #options 	UVMHIST_PRINT
 
 options 	MPC8544
+options 	PPC_HAVE_SPE
 
 # Options for necessary to use MD
 #options 	MEMORY_DISK_HOOKS
@@ -40,11 +41,10 @@
 # Diagnostic/debugging support options
 #options 	VERBOSE_INITPPC
 options 	DIAGNOSTIC	# cheap kernel consistency checks
-options 	DEBUG		# expensive debugging checks/support
+#options 	DEBUG		# expensive debugging checks/support
 #options 	SYSCALL_DEBUG	# syscall debugging
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
-options 	TRAP_PANICWAIT
 options 	SYMTAB_SPACE=41	# size for embedded symbol table
 
 makeoptions	DEBUG=-g	# compile full symbol table

Index: src/sys/arch/evbppc/mpc85xx/machdep.c
diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.1.2.1 src/sys/arch/evbppc/mpc85xx/machdep.c:1.1.2.2
--- src/sys/arch/evbppc/mpc85xx/machdep.c:1.1.2.1	Fri Jan  7 01:40:36 2011
+++ src/sys/arch/evbppc/mpc85xx/machdep.c	Mon Jan 17 07:47:20 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.1.2.1 2011/01/07 01:40:36 matt Exp $	*/
+/*	$NetBSD: machdep.c,v 1.1.2.2 2011/01/17 07:47:20 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -39,7 +39,9 @@
 __KERNEL_RCSID(0, $NetSBD$);
 
 #include opt_mpc85xx.h
+#include opt_altivec.h
 #include opt_pci.h
+#include opt_ddb.h
 #include gpio.h
 #include pci.h
 
@@ -65,6 +67,7 @@
 #include prop/proplib.h
 
 #include machine/stdarg.h
+#include powerpc/pcb.h
 
 #include dev/cons.h
 
@@ -247,7 +250,7 @@
 	{ spi, SPI_BASE, SPI_SIZE, 0, 1,
 		{ ISOURCE_SPI },
 		1 + ilog2(DEVDISR_SPI) },
-	{ esdhc, ESDHC_BASE, ESDHC_SIZE, 0, 1,
+	{ sdhc, ESDHC_BASE, ESDHC_SIZE, 0, 1,
 		{ ISOURCE_ESDHC },
 		1 + ilog2(DEVDISR_ESDHC) },
 #endif
@@ -730,6 +733,17 @@
 #endif
 
 	/*
+	 * Initialize a few things in lwp0.
+	 */
+	lwp0.l_md.md_veccpu = curcpu();
+	lwp0.l_md.md_fpucpu = curcpu();
+	{
+		extern void *proc0paddr;
+		lwp0.l_addr = proc0paddr;
+	}
+	lwp0.l_md.md_utf = trapframe(lwp0);
+
+	/*
 	 * Set some more MD helpers
 	 */
 	cpu_md_ops.md_cpunode_locs = mpc8548_cpunode_locs;
@@ -748,7 +762,7 @@
 	}
 #endif
 
-		printf( initppc done!\n);
+	printf( initppc done!\n);
 }
 
 #ifdef MPC8548
@@ -850,7 +864,7 @@
 {
 	struct cpu_info * const ci = curcpu();
 
-	booke_cpu_startup();
+	booke_cpu_startup(socname(mfspr(SPR_SVR)));
 
 	uint32_t v = cpu_read_4(GLOBAL_BASE + PORPLLSR);
 	uint32_t plat_ratio = PLAT_RATIO_GET(v);
Index: src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S
diff -u src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S:1.1.2.1 src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S:1.1.2.2
--- src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S:1.1.2.1	Fri Jan  7 01:40:36 2011
+++ src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S	Mon Jan 17 07:47:20 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: mpc85xx_start.S,v 1.1.2.1 2011/01/07 01:40:36 matt Exp $	*/
+/*	$NetBSD: mpc85xx_start.S,v 1.1.2.2 2011/01/17 07:47:20 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -38,7 +38,7 @@
 #include sys/cdefs.h
 #include powerpc/asm.h
 
-RCSID($NetBSD: mpc85xx_start.S,v 1.1.2.1 2011/01/07 01:40:36 matt Exp $)
+RCSID($NetBSD: mpc85xx_start.S,v 1.1.2.2 2011/01/17 07:47:20 matt Exp $)
 
 #include opt_ddb.h
 #include opt_ipkdb.h
@@ -47,6 +47,7 @@
 #include opt_multiprocessor.h
 #include opt_ppcarch.h
 #include opt_ppcparam.h
+#include opt_altivec.h
 
 #include ksyms.h
 
@@ -62,7 +63,7 @@
 
 #define	INTSTK	0
 
-	.machine e500
+	.machine e500x2
 /*
  * This symbol is here for the benefit of kvm_mkdb, and is supposed to
  * mark the start of kernel text.
@@ -273,6 +274,9 @@
 #include powerpc/booke/trap_subr.S
 #include powerpc/powerpc/locore_subr.S
 #include powerpc/powerpc/pio_subr.S

CVS commit: [matt-nb5-pq3] src/sys/common/pmap/tlb

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Mon Jan 17 07:54:53 UTC 2011

Modified Files:
src/sys/common/pmap/tlb [matt-nb5-pq3]: pmap.c

Log Message:
Don't define DEBUG by default.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/common/pmap/tlb/pmap.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/common/pmap/tlb/pmap.c
diff -u src/sys/common/pmap/tlb/pmap.c:1.1.2.1 src/sys/common/pmap/tlb/pmap.c:1.1.2.2
--- src/sys/common/pmap/tlb/pmap.c:1.1.2.1	Fri Jan  7 01:21:10 2011
+++ src/sys/common/pmap/tlb/pmap.c	Mon Jan 17 07:54:53 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.1.2.1 2011/01/07 01:21:10 matt Exp $	*/
+/*	$NetBSD: pmap.c,v 1.1.2.2 2011/01/17 07:54:53 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.1.2.1 2011/01/07 01:21:10 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.1.2.2 2011/01/17 07:54:53 matt Exp $);
 
 /*
  *	Manages physical address maps.
@@ -114,8 +114,6 @@
 
 #include uvm/uvm.h
 
-#define DEBUG 1
-
 #define	PMAP_COUNT(name)	(pmap_evcnt_##name.ev_count++ + 0)
 #define PMAP_COUNTER(name, desc) \
 static struct evcnt pmap_evcnt_##name = \