CVS commit: src/sys/arch/sparc/sparc

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Fri Jan  1 08:00:02 UTC 2010

Modified Files:
src/sys/arch/sparc/sparc: timer_sun4m.c

Log Message:
remove wrong if 0ed code


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sparc/sparc/timer_sun4m.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/timer_sun4m.c
diff -u src/sys/arch/sparc/sparc/timer_sun4m.c:1.18 src/sys/arch/sparc/sparc/timer_sun4m.c:1.19
--- src/sys/arch/sparc/sparc/timer_sun4m.c:1.18	Sun Dec 20 03:40:03 2009
+++ src/sys/arch/sparc/sparc/timer_sun4m.c	Fri Jan  1 08:00:02 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: timer_sun4m.c,v 1.18 2009/12/20 03:40:03 mrg Exp $	*/
+/*	$NetBSD: timer_sun4m.c,v 1.19 2010/01/01 08:00:02 mrg Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -58,7 +58,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: timer_sun4m.c,v 1.18 2009/12/20 03:40:03 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: timer_sun4m.c,v 1.19 2010/01/01 08:00:02 mrg Exp $);
 
 #include sys/param.h
 #include sys/kernel.h
@@ -131,12 +131,6 @@
 
 	cpuinfo.ci_lev14.ev_count++;
 
-#if defined(MULTIPROCESSOR)  0
-	if (!(curcpu()-master)) {
-		raise_ipi(cpuinfo, 10);
-	}
-#endif
-
 	/* read the limit register to clear the interrupt */
 	*((volatile int *)counterreg4m-t_limit);
 

CVS commit: src/games/canfield/canfield

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Fri Jan  1 11:45:34 UTC 2010

Modified Files:
src/games/canfield/canfield: canfield.6

Log Message:
New sentence, new line.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/games/canfield/canfield/canfield.6

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

Modified files:

Index: src/games/canfield/canfield/canfield.6
diff -u src/games/canfield/canfield/canfield.6:1.11 src/games/canfield/canfield/canfield.6:1.12
--- src/games/canfield/canfield/canfield.6:1.11	Fri Jan  1 07:35:09 2010
+++ src/games/canfield/canfield/canfield.6	Fri Jan  1 11:45:34 2010
@@ -1,4 +1,4 @@
-.\	$NetBSD: canfield.6,v 1.11 2010/01/01 07:35:09 dholland Exp $
+.\	$NetBSD: canfield.6,v 1.12 2010/01/01 11:45:34 wiz Exp $
 .\
 .\ Copyright (c) 1983, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -44,17 +44,19 @@
 .Fl a
 .Sh DESCRIPTION
 If you have never played solitaire before, it is recommended
-that you consult a solitaire instruction book. In
-Canfield, tableau cards may be built on each other downward
-in alternate colors. An entire pile must be moved as a unit
-in building. Top cards of the piles are available
-to be played on foundations, but never into empty spaces.
-.Pp
-Spaces must be filled from the stock. The top card of
-the stock also is available to be played on foundations or
-built on tableau piles. After the stock is exhausted,
-tableau spaces may be filled from the talon and the player may
-keep them open until he wishes to use them.
+that you consult a solitaire instruction book.
+In Canfield, tableau cards may be built on each other downward in
+alternate colors.
+An entire pile must be moved as a unit in building.
+Top cards of the piles are available to be played on foundations,
+but never into empty spaces.
+.Pp
+Spaces must be filled from the stock.
+The top card of the stock also is available to be played on
+foundations or built on tableau piles.
+After the stock is exhausted, tableau spaces may be filled from
+the talon and the player may keep them open until he wishes to use
+them.
 .Pp
 Cards are dealt from the hand to the talon by threes
 and this repeats until there are no more cards in the hand

CVS commit: src/sys/dev/sysmon

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Fri Jan  1 15:41:25 UTC 2010

Modified Files:
src/sys/dev/sysmon: sysmon_envsys_events.c

Log Message:
Don't infer a sensor driver's ability to handle limit checking itself.


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/dev/sysmon/sysmon_envsys_events.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/sysmon/sysmon_envsys_events.c
diff -u src/sys/dev/sysmon/sysmon_envsys_events.c:1.72 src/sys/dev/sysmon/sysmon_envsys_events.c:1.73
--- src/sys/dev/sysmon/sysmon_envsys_events.c:1.72	Wed Dec 23 18:31:00 2009
+++ src/sys/dev/sysmon/sysmon_envsys_events.c	Fri Jan  1 15:41:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys_events.c,v 1.72 2009/12/23 18:31:00 pgoyette Exp $ */
+/* $NetBSD: sysmon_envsys_events.c,v 1.73 2010/01/01 15:41:25 pgoyette Exp $ */
 
 /*-
  * Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sysmon_envsys_events.c,v 1.72 2009/12/23 18:31:00 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: sysmon_envsys_events.c,v 1.73 2010/01/01 15:41:25 pgoyette Exp $);
 
 #include sys/param.h
 #include sys/types.h
@@ -481,16 +481,9 @@
 } while (/* CONSTCOND */ 0)
 
 	/*
-	 * If driver provides method to retrieve its internal limit
-	 * values, call it.  If it returns any values, set the flag
-	 * PROP_DRIVER_LIMITS to indicate that the driver can process
-	 * all the limits we have.  (If userland limits are specified
-	 * later and the driver cannot handle them, this flag will be
-	 * cleared.)
-	 *
-	 * If the driver cannot or does not provide us with limit values
-	 * we cannot monitor limits now;  we get another chance to create
-	 * the FMONLIMITS entry later if userland specifies some limits.
+	 * If driver provides a method to retrieve its internal limit
+	 * values, call it and use thoe returned values as initial
+	 * limits for event monitoring.
 	 */
 	lims.sel_flags = 0;
 	if (sed_t-sed_edata-flags  ENVSYS_FMONLIMITS)
@@ -498,11 +491,21 @@
 			(*sed_t-sed_sme-sme_get_limits)(sed_t-sed_sme,
 			  sed_t-sed_edata,
 			  lims);
-	if (lims.sel_flags)
-		lims.sel_flags |= PROP_DRIVER_LIMITS;
-	else
+	/*
+	 * If no values returned, don't create the event monitor at
+	 * this time.  We'll get another chance later when the user
+	 * provides us with limits.
+	 */
+	if (lims.sel_flags == 0)
 		sed_t-sed_edata-flags = ~ENVSYS_FMONLIMITS;
 
+	/*
+	 * If driver doesn't provide a way to absorb user-specified
+	 * limit values, we must monitor all limits ourselves
+	 */
+	else if (sed_t-sed_sme-sme_get_limits == NULL)
+		lims.sel_flags |= PROP_DRIVER_LIMITS;
+
 	/* Register the events that were specified */
 
 	SEE_REGEVENT(ENVSYS_FMONCRITICAL,

CVS commit: src/sys/dev/i2c

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Fri Jan  1 15:43:50 UTC 2010

Modified Files:
src/sys/dev/i2c: sdtemp.c

Log Message:
Explicitly inform envsys that the driver is capable of doing its own
limit checking at initialization time.  Later on, if user specifics any
unsupported limits, the driver will relinquish this task.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/i2c/sdtemp.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/i2c/sdtemp.c
diff -u src/sys/dev/i2c/sdtemp.c:1.7 src/sys/dev/i2c/sdtemp.c:1.8
--- src/sys/dev/i2c/sdtemp.c:1.7	Fri Jul 10 15:30:45 2009
+++ src/sys/dev/i2c/sdtemp.c	Fri Jan  1 15:43:49 2010
@@ -1,4 +1,4 @@
-/*  $NetBSD: sdtemp.c,v 1.7 2009/07/10 15:30:45 pgoyette Exp $*/
+/*  $NetBSD: sdtemp.c,v 1.8 2010/01/01 15:43:49 pgoyette Exp $*/
 
 /*
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sdtemp.c,v 1.7 2009/07/10 15:30:45 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: sdtemp.c,v 1.8 2010/01/01 15:43:49 pgoyette Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -325,6 +325,8 @@
 		limits-sel_flags |= PROP_CRITMAX;
 	}
 	iic_release_bus(sc-sc_tag, 0);
+	if (limits-sel_flags != 0)
+		limits-sel_flags |= PROP_DRIVER_LIMITS;
 }
 
 /* Send current limit values to the device */

CVS commit: src/sys/dev/acpi

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Fri Jan  1 15:55:30 UTC 2010

Modified Files:
src/sys/dev/acpi: acpi_tz.c

Log Message:
Don't set sensor state to SWARNOVER here.  Doing so based only on the
device's active cooling levels prevents the user from overriding these
limits with his own values.

XXX We should probably also change setting SCRITOVER state to SCRITICAL,
XXX but right now that just confuses things.  We currently don't have a
XXX way for a sensor to be both SCRITICAL and SCRITOVER.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/acpi/acpi_tz.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/acpi/acpi_tz.c
diff -u src/sys/dev/acpi/acpi_tz.c:1.52 src/sys/dev/acpi/acpi_tz.c:1.53
--- src/sys/dev/acpi/acpi_tz.c:1.52	Thu Dec 24 00:26:28 2009
+++ src/sys/dev/acpi/acpi_tz.c	Fri Jan  1 15:55:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_tz.c,v 1.52 2009/12/24 00:26:28 pgoyette Exp $ */
+/* $NetBSD: acpi_tz.c,v 1.53 2010/01/01 15:55:30 pgoyette Exp $ */
 
 /*
  * Copyright (c) 2003 Jared D. McNeill jmcne...@invisible.ca
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_tz.c,v 1.52 2009/12/24 00:26:28 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_tz.c,v 1.53 2010/01/01 15:55:30 pgoyette Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -303,8 +303,6 @@
 			if (sc-sc_zone.ac[i] = tmp)
 active = i;
 		}
-		if (active != ATZ_ACTIVE_NONE)
-			sc-sc_temp_sensor.state = ENVSYS_SWARNOVER;
 
 		flags = sc-sc_flags 
 		~(ATZ_F_CRITICAL|ATZ_F_HOT|ATZ_F_PASSIVE);

CVS commit: src/bin/sh

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Fri Jan  1 18:09:16 UTC 2010

Modified Files:
src/bin/sh: sh.1

Log Message:
fix typo


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/bin/sh/sh.1

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

Modified files:

Index: src/bin/sh/sh.1
diff -u src/bin/sh/sh.1:1.93 src/bin/sh/sh.1:1.94
--- src/bin/sh/sh.1:1.93	Sun Mar 29 08:55:27 2009
+++ src/bin/sh/sh.1	Fri Jan  1 18:09:16 2010
@@ -1,4 +1,4 @@
-.\	$NetBSD: sh.1,v 1.93 2009/03/29 08:55:27 wiz Exp $
+.\	$NetBSD: sh.1,v 1.94 2010/01/01 18:09:16 dholland Exp $
 .\ Copyright (c) 1991, 1993
 .\	The Regents of the University of California.  All rights reserved.
 .\
@@ -1518,7 +1518,7 @@
 .Xr getcwd 3 .
 The environment variable
 .Ev PWD
-is set to printed value.
+is set to the printed value.
 .Pp
 The default is
 .Ic pwd

CVS commit: src/bin/sh

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Fri Jan  1 19:34:59 UTC 2010

Modified Files:
src/bin/sh: cd.c sh.1

Log Message:
Make the cd builtin accept and ignore -P, which is a kshism that has been
allowed to leak into POSIX and selects the behavior cd already implements.
Closes PR bin/42557 and also relevant to PR pkg/42168.

I suppose this should probably be pulled up to both -4 and -5...


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/bin/sh/cd.c
cvs rdiff -u -r1.94 -r1.95 src/bin/sh/sh.1

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

Modified files:

Index: src/bin/sh/cd.c
diff -u src/bin/sh/cd.c:1.39 src/bin/sh/cd.c:1.40
--- src/bin/sh/cd.c:1.39	Thu May  4 11:16:53 2006
+++ src/bin/sh/cd.c	Fri Jan  1 19:34:59 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd.c,v 1.39 2006/05/04 11:16:53 simonb Exp $	*/
+/*	$NetBSD: cd.c,v 1.40 2010/01/01 19:34:59 dholland Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = @(#)cd.c	8.2 (Berkeley) 5/4/95;
 #else
-__RCSID($NetBSD: cd.c,v 1.39 2006/05/04 11:16:53 simonb Exp $);
+__RCSID($NetBSD: cd.c,v 1.40 2010/01/01 19:34:59 dholland Exp $);
 #endif
 #endif /* not lint */
 
@@ -84,7 +84,8 @@
 	struct stat statb;
 	int print = cdprint;	/* set -cdprint to enable */
 
-	nextopt(nullstr);
+	while (nextopt(P) != '\0')
+		;
 
 	/*
 	 * Try (quite hard) to have 'curdir' defined, nothing has set

Index: src/bin/sh/sh.1
diff -u src/bin/sh/sh.1:1.94 src/bin/sh/sh.1:1.95
--- src/bin/sh/sh.1:1.94	Fri Jan  1 18:09:16 2010
+++ src/bin/sh/sh.1	Fri Jan  1 19:34:59 2010
@@ -1,4 +1,4 @@
-.\	$NetBSD: sh.1,v 1.94 2010/01/01 18:09:16 dholland Exp $
+.\	$NetBSD: sh.1,v 1.95 2010/01/01 19:34:59 dholland Exp $
 .\ Copyright (c) 1991, 1993
 .\	The Regents of the University of California.  All rights reserved.
 .\
@@ -1219,7 +1219,7 @@
 search for the command and print the absolute pathname
 of utilities, the name for built-ins or the expansion of aliases.
 .El
-.It cd Op Ar directory Op Ar replace
+.It cd Oo Fl P Oc Op Ar directory Op Ar replace
 Switch to the specified directory (default
 .Ev $HOME ) .
 If
@@ -1245,6 +1245,21 @@
 is the same as that of
 .Ev PATH .
 .Pp
+The
+.Fl P
+option instructs the shell to update
+.Ev PWD
+with the specified directory and change to that directory.
+This is the default.
+.Pp
+Some shells also support a
+.Fl L
+option, which instructs the shell to update
+.Ev PWD
+with incorrect information and to change the current directory
+accordingly.
+This is not supported.
+.Pp
 In an interactive shell, the
 .Ic cd
 command will print out the name of the
@@ -1525,11 +1540,9 @@
 .Fl L ,
 but note that the built-in
 .Ic cd
-command doesn't currently support
+command doesn't currently support the
 .Fl L
-or
-.Fl P
-and will cache (almost) the absolute path.
+option and will cache (almost) the absolute path.
 If
 .Ic cd
 is changed,

CVS commit: src/bin/sh

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Fri Jan  1 19:51:19 UTC 2010

Modified Files:
src/bin/sh: sh.1

Log Message:
fix another typo


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/bin/sh/sh.1

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

Modified files:

Index: src/bin/sh/sh.1
diff -u src/bin/sh/sh.1:1.95 src/bin/sh/sh.1:1.96
--- src/bin/sh/sh.1:1.95	Fri Jan  1 19:34:59 2010
+++ src/bin/sh/sh.1	Fri Jan  1 19:51:19 2010
@@ -1,4 +1,4 @@
-.\	$NetBSD: sh.1,v 1.95 2010/01/01 19:34:59 dholland Exp $
+.\	$NetBSD: sh.1,v 1.96 2010/01/01 19:51:19 dholland Exp $
 .\ Copyright (c) 1991, 1993
 .\	The Regents of the University of California.  All rights reserved.
 .\
@@ -1527,7 +1527,7 @@
 .Fl L
 is specified the cached value (initially set from
 .Ev PWD )
-is checked to see if it refers to the current directory, if it does
+is checked to see if it refers to the current directory; if it does
 the value is printed.
 Otherwise the current directory name is found using
 .Xr getcwd 3 .

CVS commit: src/lib/libc/gen

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Fri Jan  1 19:59:21 UTC 2010

Modified Files:
src/lib/libc/gen: getcwd.c

Log Message:
POSIX says realpath(NULL, foo) is supposed to yield EINVAL rather than
being allowed to crash. Go figure. Closes PR lib/42559 from Stathis Kamperis.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/lib/libc/gen/getcwd.c

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

Modified files:

Index: src/lib/libc/gen/getcwd.c
diff -u src/lib/libc/gen/getcwd.c:1.45 src/lib/libc/gen/getcwd.c:1.46
--- src/lib/libc/gen/getcwd.c:1.45	Fri Oct 26 19:48:14 2007
+++ src/lib/libc/gen/getcwd.c	Fri Jan  1 19:59:21 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: getcwd.c,v 1.45 2007/10/26 19:48:14 christos Exp $	*/
+/*	$NetBSD: getcwd.c,v 1.46 2010/01/01 19:59:21 dholland Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1995
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = @(#)getcwd.c	8.5 (Berkeley) 2/7/95;
 #else
-__RCSID($NetBSD: getcwd.c,v 1.45 2007/10/26 19:48:14 christos Exp $);
+__RCSID($NetBSD: getcwd.c,v 1.46 2010/01/01 19:59:21 dholland Exp $);
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -74,9 +74,14 @@
 	char *p, wbuf[2][MAXPATHLEN];
 	size_t len;
 
-	_DIAGASSERT(path != NULL);
 	_DIAGASSERT(resolved != NULL);
 
+	/* POSIX sez we must test for this */
+	if (path == NULL) {
+		errno = EINVAL;
+		return NULL;
+	}
+
 	/*
 	 * Build real path one by one with paying an attention to .,
 	 * .. and symbolic link.

CVS commit: src/usr.sbin/syslogd

[Marc Balmer]

Module Name:src
Committed By:   mbalmer
Date:   Fri Jan  1 21:26:18 UTC 2010

Modified Files:
src/usr.sbin/syslogd: syslog.conf.5

Log Message:
fold long lines.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/syslogd/syslog.conf.5

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

Modified files:

Index: src/usr.sbin/syslogd/syslog.conf.5
diff -u src/usr.sbin/syslogd/syslog.conf.5:1.16 src/usr.sbin/syslogd/syslog.conf.5:1.17
--- src/usr.sbin/syslogd/syslog.conf.5:1.16	Thu Apr  9 02:41:44 2009
+++ src/usr.sbin/syslogd/syslog.conf.5	Fri Jan  1 21:26:18 2010
@@ -1,4 +1,4 @@
-.\	$NetBSD: syslog.conf.5,v 1.16 2009/04/09 02:41:44 joerg Exp $
+.\	$NetBSD: syslog.conf.5,v 1.17 2010/01/01 21:26:18 mbalmer Exp $
 .\
 .\ Copyright (c) 1990, 1991, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\
 .\ from: @(#)syslog.conf.5	8.1 (Berkeley) 6/9/93
 .\
-.Dd August 8, 2008
+.Dd January 1st, 2010
 .Dt SYSLOG.CONF 5
 .Os
 .Sh NAME
@@ -404,7 +404,8 @@
 Service name or port number to bind to.
 Default is
 .Sq syslog .
-.Em As long as no official port is assigned this option is required for TLS servers.
+.Em As long as no official port is assigned this option is required for TLS
+servers.
 .It Em tls_bindhost
 Hostname or IP to bind to.
 .It Em tls_gen_cert
@@ -586,7 +587,7 @@
 # Log all messages of level info or higher to another
 # machine using TLS with an alternative portname and a
 # fingerprint for athentication
-*.info	@[logserver]:1234(fingerprint=SHA1:01:02:...)
+*.info			@[logserver]:1234(fingerprint=SHA1:01:02:...)
 
 # Root and Eric get alert and higher messages.
 *.alert	root,eric

CVS commit: src/usr.sbin/syslogd

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Fri Jan  1 21:44:08 UTC 2010

Modified Files:
src/usr.sbin/syslogd: syslog.conf.5

Log Message:
Fix previous: Dd argument and lost Em markup.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/syslogd/syslog.conf.5

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

Modified files:

Index: src/usr.sbin/syslogd/syslog.conf.5
diff -u src/usr.sbin/syslogd/syslog.conf.5:1.17 src/usr.sbin/syslogd/syslog.conf.5:1.18
--- src/usr.sbin/syslogd/syslog.conf.5:1.17	Fri Jan  1 21:26:18 2010
+++ src/usr.sbin/syslogd/syslog.conf.5	Fri Jan  1 21:44:07 2010
@@ -1,4 +1,4 @@
-.\	$NetBSD: syslog.conf.5,v 1.17 2010/01/01 21:26:18 mbalmer Exp $
+.\	$NetBSD: syslog.conf.5,v 1.18 2010/01/01 21:44:07 wiz Exp $
 .\
 .\ Copyright (c) 1990, 1991, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\
 .\ from: @(#)syslog.conf.5	8.1 (Berkeley) 6/9/93
 .\
-.Dd January 1st, 2010
+.Dd January 1, 2010
 .Dt SYSLOG.CONF 5
 .Os
 .Sh NAME
@@ -404,8 +404,8 @@
 Service name or port number to bind to.
 Default is
 .Sq syslog .
-.Em As long as no official port is assigned this option is required for TLS
-servers.
+.Em As long as no official port is assigned this option is required
+.Em for TLS servers.
 .It Em tls_bindhost
 Hostname or IP to bind to.
 .It Em tls_gen_cert

CVS commit: src/bin/sh

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Fri Jan  1 21:46:31 UTC 2010

Modified Files:
src/bin/sh: sh.1

Log Message:
Bump date for cd -P support.


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/bin/sh/sh.1

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

Modified files:

Index: src/bin/sh/sh.1
diff -u src/bin/sh/sh.1:1.96 src/bin/sh/sh.1:1.97
--- src/bin/sh/sh.1:1.96	Fri Jan  1 19:51:19 2010
+++ src/bin/sh/sh.1	Fri Jan  1 21:46:31 2010
@@ -1,4 +1,4 @@
-.\	$NetBSD: sh.1,v 1.96 2010/01/01 19:51:19 dholland Exp $
+.\	$NetBSD: sh.1,v 1.97 2010/01/01 21:46:31 wiz Exp $
 .\ Copyright (c) 1991, 1993
 .\	The Regents of the University of California.  All rights reserved.
 .\
@@ -31,7 +31,7 @@
 .\
 .\	@(#)sh.1	8.6 (Berkeley) 5/4/95
 .\
-.Dd March 29, 2009
+.Dd January 1, 2010
 .Dt SH 1
 .Os
 .Sh NAME

CVS commit: src/sys/arch/i386/conf

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Fri Jan  1 22:12:19 UTC 2010

Modified Files:
src/sys/arch/i386/conf: MONOLITHIC

Log Message:
add rcsid


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/i386/conf/MONOLITHIC

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/i386/conf/MONOLITHIC
diff -u src/sys/arch/i386/conf/MONOLITHIC:1.9 src/sys/arch/i386/conf/MONOLITHIC:1.10
--- src/sys/arch/i386/conf/MONOLITHIC:1.9	Sat Dec  5 20:11:15 2009
+++ src/sys/arch/i386/conf/MONOLITHIC	Fri Jan  1 22:12:19 2010
@@ -1,3 +1,4 @@
+# $NetBSD: MONOLITHIC,v 1.10 2010/01/01 22:12:19 dholland Exp $
 #
 # Non MODULAR, used mostly as a reference as to what we modularized.
 #

CVS commit: src/sys/dev/isa

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan  2 01:42:49 UTC 2010

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

Log Message:
convert to pmf


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/isa/ym.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/ym.c
diff -u src/sys/dev/isa/ym.c:1.35 src/sys/dev/isa/ym.c:1.36
--- src/sys/dev/isa/ym.c:1.35	Mon Apr 28 16:23:52 2008
+++ src/sys/dev/isa/ym.c	Fri Jan  1 20:42:49 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: ym.c,v 1.35 2008/04/28 20:23:52 martin Exp $	*/
+/*	$NetBSD: ym.c,v 1.36 2010/01/02 01:42:49 christos Exp $	*/
 
 /*-
  * Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ym.c,v 1.35 2008/04/28 20:23:52 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: ym.c,v 1.36 2010/01/02 01:42:49 christos Exp $);
 
 #include mpu_ym.h
 #include opt_ym.h
@@ -148,7 +148,6 @@
 #ifndef AUDIO_NO_POWER_CTL
 static void ym_save_codec_regs(struct ym_softc *);
 static void ym_restore_codec_regs(struct ym_softc *);
-void	ym_power_hook(int, void *);
 int	ym_codec_power_ctl(void *, int);
 static void ym_chip_powerdown(struct ym_softc *);
 static void ym_chip_powerup(struct ym_softc *, int);
@@ -163,6 +162,8 @@
 static void ym_set_mic_gain(struct ym_softc *, int);
 static void ym_set_3d(struct ym_softc *, mixer_ctrl_t *,
 	struct ad1848_volume *, int);
+static bool ym_suspend(device_t PMF_FN_PROTO);
+static bool ym_resume(device_t PMF_FN_PROTO);
 
 
 const struct audio_hw_if ym_hw_if = {
@@ -296,7 +297,10 @@
 #endif
 	ym_powerdown_blocks(sc);
 
-	powerhook_establish(DVNAME(sc), ym_power_hook, sc);
+	if (!pmf_device_register(ac-sc_dev, ym_suspend, ym_resume)) {
+		aprint_error_dev(ac-sc_dev,
+		cannot set power mgmt handler\n);
+	}
 #endif
 
 	/* Set tone control to the default position. */
@@ -1102,76 +1106,79 @@
  * Currently only the parameters, such as output gain, are restored.
  * DMA state should also be restored.  FIXME.
  */
-void
-ym_power_hook(int why, void *v)
+static bool
+ym_suspend(device_t self PMF_FN_ARGS)
 {
-	struct ym_softc *sc;
+	struct ym_softc *sc = device_private(self);
 	int i, xmax;
 	int s;
 
 	sc = v;
-	DPRINTF((%s: ym_power_hook: why = %d\n, DVNAME(sc), why));
+	DPRINTF((%s: ym_power_hook: suspend\n, DVNAME(sc)));
 
 	s = splaudio();
 
-	switch (why) {
-	case PWR_SUSPEND:
-	case PWR_STANDBY:
-		/*
-		 * suspending...
-		 */
-		callout_stop(sc-sc_powerdown_ch);
-		if (sc-sc_turning_off)
-			ym_powerdown_blocks(sc);
+	/*
+	 * suspending...
+	 */
+	callout_stop(sc-sc_powerdown_ch);
+	if (sc-sc_turning_off)
+		ym_powerdown_blocks(sc);
 
-		/*
-		 * Save CODEC registers.
-		 * Note that the registers read incorrect
-		 * if the CODEC part is in power-down mode.
-		 */
-		if (sc-sc_on_blocks  YM_POWER_CODEC_DIGITAL)
-			ym_save_codec_regs(sc);
+	/*
+	 * Save CODEC registers.
+	 * Note that the registers read incorrect
+	 * if the CODEC part is in power-down mode.
+	 */
+	if (sc-sc_on_blocks  YM_POWER_CODEC_DIGITAL)
+		ym_save_codec_regs(sc);
 
-		/*
-		 * Save OPL3-SA3 control registers and power-down the chip.
-		 * Note that the registers read incorrect
-		 * if the chip is in global power-down mode.
-		 */
-		sc-sc_sa3_scan[SA3_PWR_MNG] = ym_read(sc, SA3_PWR_MNG);
-		if (sc-sc_on_blocks)
-			ym_chip_powerdown(sc);
-		break;
+	/*
+	 * Save OPL3-SA3 control registers and power-down the chip.
+	 * Note that the registers read incorrect
+	 * if the chip is in global power-down mode.
+	 */
+	sc-sc_sa3_scan[SA3_PWR_MNG] = ym_read(sc, SA3_PWR_MNG);
+	if (sc-sc_on_blocks)
+		ym_chip_powerdown(sc);
+	splx(s);
+	return true;
 
-	case PWR_RESUME:
-		/*
-		 * resuming...
-		 */
-		ym_chip_powerup(sc, 1);
-		ym_init(sc);		/* power-on CODEC */
+static bool
+ym_resume(device_t self PMF_FN_ARGS)
+{
+	struct ym_softc *sc = device_private(self);
+	int i, xmax;
+	int s;
 
-		/* Restore control registers. */
-		xmax = YM_IS_SA3(sc)? YM_SAVE_REG_MAX_SA3 : YM_SAVE_REG_MAX_SA2;
-		for (i = SA3_PWR_MNG + 1; i = xmax; i++) {
-			if (i == SA3_SB_SCAN || i == SA3_SB_SCAN_DATA ||
-			i == SA3_DPWRDWN)
-continue;
-			ym_write(sc, i, sc-sc_sa3_scan[i]);
-		}
+	sc = v;
+	DPRINTF((%s: ym_power_hook: resume\n, DVNAME(sc)));
 
-		/* Restore CODEC registers (including mixer). */
-		ym_restore_codec_regs(sc);
+	s = splaudio();
+	/*
+	 * resuming...
+	 */
+	ym_chip_powerup(sc, 1);
+	ym_init(sc);		/* power-on CODEC */
 
-		/* Restore global/digital power-down state. */
-		ym_write(sc, SA3_PWR_MNG, sc-sc_sa3_scan[SA3_PWR_MNG]);
-		if (YM_IS_SA3(sc))
-			ym_write(sc, SA3_DPWRDWN, sc-sc_sa3_scan[SA3_DPWRDWN]);
-		break;
-	case PWR_SOFTSUSPEND:
-	case PWR_SOFTSTANDBY:
-	case PWR_SOFTRESUME:
-		break;
+	/* Restore control registers. */
+	xmax = YM_IS_SA3(sc)? YM_SAVE_REG_MAX_SA3 : YM_SAVE_REG_MAX_SA2;
+	for (i = SA3_PWR_MNG + 1; i = xmax; i++) {
+		if (i == SA3_SB_SCAN || i == 

CVS commit: src/sys/dev/pcmcia

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan  2 01:43:12 UTC 2010

Modified Files:
src/sys/dev/pcmcia: if_ne_pcmcia.c

Log Message:
convert to pmf


To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/sys/dev/pcmcia/if_ne_pcmcia.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/pcmcia/if_ne_pcmcia.c
diff -u src/sys/dev/pcmcia/if_ne_pcmcia.c:1.157 src/sys/dev/pcmcia/if_ne_pcmcia.c:1.158
--- src/sys/dev/pcmcia/if_ne_pcmcia.c:1.157	Sat Sep  5 10:44:59 2009
+++ src/sys/dev/pcmcia/if_ne_pcmcia.c	Fri Jan  1 20:43:11 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ne_pcmcia.c,v 1.157 2009/09/05 14:44:59 tsutsui Exp $	*/
+/*	$NetBSD: if_ne_pcmcia.c,v 1.158 2010/01/02 01:43:11 christos Exp $	*/
 
 /*
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_ne_pcmcia.c,v 1.157 2009/09/05 14:44:59 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_ne_pcmcia.c,v 1.158 2010/01/02 01:43:11 christos Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -80,7 +80,6 @@
 	struct pcmcia_function *sc_pf;		/* our PCMCIA function */
 	int sc_state;
 #define	NE_PCMCIA_ATTACHED	3
-	void *sc_powerhook;			/* power management hook */
 };
 
 u_int8_t *ne_pcmcia_get_enaddr(struct ne_pcmcia_softc *, int,
@@ -733,13 +732,9 @@
 	if (ne2000_attach(nsc, enaddr))
 		goto fail2;
 
-	/* dopowerhooks(9) - deprecated, only called by hpcs* apmdev(4) */
-	psc-sc_powerhook = powerhook_establish(device_xname(self),
-	ne2000_power, nsc);
-	if (psc-sc_powerhook == NULL)
-		aprint_error_dev(self,
-		   WARNING: unable to establish power hook\n);
-
+	if (!pmf_device_register(self, ne2000_suspend, ne2000_resume)) {
+		aprint_error_dev(self, cannot set power mgmt handler\n);
+	}
 	/* pmf(9) power hooks */
 	if (pmf_device_register(self, ne2000_suspend, ne2000_resume)) {
 #if 0 /* XXX: notyet: if_stop is NULL! */
@@ -768,9 +763,7 @@
 	if (psc-sc_state != NE_PCMCIA_ATTACHED)
 		return (0);
 
-	if (psc-sc_powerhook != NULL)
-		powerhook_disestablish(psc-sc_powerhook);
-
+	pmf_device_deregister(self);
 	error = ne2000_detach(psc-sc_ne2000, flags);
 	if (error)
 		return (error);

CVS commit: src/sys/dev/sbus

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan  2 01:43:42 UTC 2010

Modified Files:
src/sys/dev/sbus: dbri.c

Log Message:
convert to pmf


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/sbus/dbri.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/sbus/dbri.c
diff -u src/sys/dev/sbus/dbri.c:1.25 src/sys/dev/sbus/dbri.c:1.26
--- src/sys/dev/sbus/dbri.c:1.25	Sun Sep 20 04:24:04 2009
+++ src/sys/dev/sbus/dbri.c	Fri Jan  1 20:43:42 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: dbri.c,v 1.25 2009/09/20 08:24:04 tsutsui Exp $	*/
+/*	$NetBSD: dbri.c,v 1.26 2010/01/02 01:43:42 christos Exp $	*/
 
 /*
  * Copyright (C) 1997 Rudolf Koenig (rfkoe...@immd4.informatik.uni-erlangen.de)
@@ -34,7 +34,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dbri.c,v 1.25 2009/09/20 08:24:04 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: dbri.c,v 1.26 2010/01/02 01:43:42 christos Exp $);
 
 #include audio.h
 #if NAUDIO  0
@@ -162,7 +162,9 @@
 static paddr_t	dbri_mappage(void *, void *, off_t, int);
 static void	dbri_set_power(struct dbri_softc *, int);
 static void	dbri_bring_up(struct dbri_softc *);
-static void	dbri_powerhook(int, void *);
+static void	dbri_sus(int, void *);
+static bool	dbri_suspend(device_t PMF_FN_PROTO);
+static bool	dbri_resume(device_t PMF_FN_PROTO);
 
 /* stupid support routines */
 static uint32_t	reverse_bytes(uint32_t, int);
@@ -294,7 +296,10 @@
 		sc-sc_have_powerctl = 1;
 		sc-sc_powerstate = 0;
 		dbri_set_power(sc, 1);
-		powerhook_establish(device_xname(self), dbri_powerhook, sc);
+		if (!pmf_device_register(self, dbri_suspend, dbri_resume)) {
+			aprint_error_dev(self,
+			cannot set power mgmt handler\n);
+		}
 	} else {
 		/* we can't control power so we're always up */
 		sc-sc_have_powerctl = 0;
@@ -374,7 +379,6 @@
 	sc-sc_refcount = 0;
 	sc-sc_playing = 0;
 	sc-sc_recording = 0;
-	sc-sc_pmgrstate = PWR_RESUME;
 	config_interrupts(self, dbri_config_interrupts);
 
 	return;
@@ -2169,45 +2173,38 @@
 	sc-sc_recording = 0;
 }
 
-static void
-dbri_powerhook(int why, void *cookie)
+static bool
+dbri_suspend(device_t self PMF_FN_ARGS)
 {
-	struct dbri_softc *sc = cookie;
+	struct dbri_softc *sc = device_private(self);
 
-	if (why == sc-sc_pmgrstate)
-		return;
+	dbri_set_power(sc, 0);
+	return true;
+}
 
-	switch(why)
-	{
-		case PWR_SUSPEND:
-			dbri_set_power(sc, 0);
-			break;
-		case PWR_RESUME:
-			if (sc-sc_powerstate != 0)
-break;
-			aprint_verbose(resume: %d\n, sc-sc_refcount);
-			sc-sc_pmgrstate = PWR_RESUME;
-			if (sc-sc_playing) {
-volatile uint32_t *cmd;
-int s;
-
-dbri_bring_up(sc);
-s = splsched();
-cmd = dbri_command_lock(sc);
-*(cmd++) = DBRI_CMD(DBRI_COMMAND_SDP,
-0, sc-sc_pipe[4].sdp |
-DBRI_SDP_VALID_POINTER |
-DBRI_SDP_EVERY | DBRI_SDP_CLEAR);
-*(cmd++) = sc-sc_dmabase +
-dbri_dma_off(xmit, 0);
-dbri_command_send(sc, cmd);
-splx(s);
-			}
-			break;
-		default:
-			return;
+static bool
+dbri_resume(device_t self PMF_FN_ARGS)
+{
+	if (sc-sc_powerstate != 0)
+		break;
+	aprint_verbose(resume: %d\n, sc-sc_refcount);
+	if (sc-sc_playing) {
+		volatile uint32_t *cmd;
+		int s;
+
+		dbri_bring_up(sc);
+		s = splsched();
+		cmd = dbri_command_lock(sc);
+		*(cmd++) = DBRI_CMD(DBRI_COMMAND_SDP,
+		0, sc-sc_pipe[4].sdp |
+		DBRI_SDP_VALID_POINTER |
+		DBRI_SDP_EVERY | DBRI_SDP_CLEAR);
+		*(cmd++) = sc-sc_dmabase +
+		dbri_dma_off(xmit, 0);
+		dbri_command_send(sc, cmd);
+		splx(s);
 	}
-	sc-sc_pmgrstate = why;
+	return true;
 }
 
 #endif /* NAUDIO  0 */

CVS commit: src/sys/dev/isa

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Jan  2 02:37:09 UTC 2010

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

Log Message:
make rhis compile.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/isa/ym.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/ym.c
diff -u src/sys/dev/isa/ym.c:1.36 src/sys/dev/isa/ym.c:1.37
--- src/sys/dev/isa/ym.c:1.36	Fri Jan  1 20:42:49 2010
+++ src/sys/dev/isa/ym.c	Fri Jan  1 21:37:08 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: ym.c,v 1.36 2010/01/02 01:42:49 christos Exp $	*/
+/*	$NetBSD: ym.c,v 1.37 2010/01/02 02:37:08 christos Exp $	*/
 
 /*-
  * Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ym.c,v 1.36 2010/01/02 01:42:49 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: ym.c,v 1.37 2010/01/02 02:37:08 christos Exp $);
 
 #include mpu_ym.h
 #include opt_ym.h
@@ -1110,10 +1110,8 @@
 ym_suspend(device_t self PMF_FN_ARGS)
 {
 	struct ym_softc *sc = device_private(self);
-	int i, xmax;
 	int s;
 
-	sc = v;
 	DPRINTF((%s: ym_power_hook: suspend\n, DVNAME(sc)));
 
 	s = splaudio();
@@ -1143,6 +1141,7 @@
 		ym_chip_powerdown(sc);
 	splx(s);
 	return true;
+}
 
 static bool
 ym_resume(device_t self PMF_FN_ARGS)
@@ -1151,7 +1150,6 @@
 	int i, xmax;
 	int s;
 
-	sc = v;
 	DPRINTF((%s: ym_power_hook: resume\n, DVNAME(sc)));
 
 	s = splaudio();

CVS commit: src/sys/dev/sbus

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Jan  2 04:12:07 UTC 2010

Modified Files:
src/sys/dev/sbus: dbri.c

Log Message:
Fix botches in mechanical changes to make this compile:
dbri.c:165: warning: 'dbri_sus' declared 'static' but never defined
dbri.c: In function 'dbri_resume':
dbri.c:2188: error: 'sc' undeclared
dbri.c:2189: error: break statement not within loop or switch


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/sbus/dbri.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/sbus/dbri.c
diff -u src/sys/dev/sbus/dbri.c:1.26 src/sys/dev/sbus/dbri.c:1.27
--- src/sys/dev/sbus/dbri.c:1.26	Sat Jan  2 01:43:42 2010
+++ src/sys/dev/sbus/dbri.c	Sat Jan  2 04:12:07 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: dbri.c,v 1.26 2010/01/02 01:43:42 christos Exp $	*/
+/*	$NetBSD: dbri.c,v 1.27 2010/01/02 04:12:07 tsutsui Exp $	*/
 
 /*
  * Copyright (C) 1997 Rudolf Koenig (rfkoe...@immd4.informatik.uni-erlangen.de)
@@ -34,7 +34,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dbri.c,v 1.26 2010/01/02 01:43:42 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: dbri.c,v 1.27 2010/01/02 04:12:07 tsutsui Exp $);
 
 #include audio.h
 #if NAUDIO  0
@@ -162,7 +162,6 @@
 static paddr_t	dbri_mappage(void *, void *, off_t, int);
 static void	dbri_set_power(struct dbri_softc *, int);
 static void	dbri_bring_up(struct dbri_softc *);
-static void	dbri_sus(int, void *);
 static bool	dbri_suspend(device_t PMF_FN_PROTO);
 static bool	dbri_resume(device_t PMF_FN_PROTO);
 
@@ -2185,8 +2184,10 @@
 static bool
 dbri_resume(device_t self PMF_FN_ARGS)
 {
+	struct dbri_softc *sc = device_private(self);
+
 	if (sc-sc_powerstate != 0)
-		break;
+		return true;
 	aprint_verbose(resume: %d\n, sc-sc_refcount);
 	if (sc-sc_playing) {
 		volatile uint32_t *cmd;

CVS commit: [netbsd-5-0] src/usr.sbin/makefs/cd9660

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sat Jan  2 06:26:11 UTC 2010

Modified Files:
src/usr.sbin/makefs/cd9660 [netbsd-5-0]: iso9660_rrip.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1198):
usr.sbin/makefs/cd9660/iso9660_rrip.c: revision 1.5
When splitting a System Use Area between a System Use field and a
Continuation Area, be sure to insert the CE record at the correct
point in the chain of SUSP records.  Without this, makefs emits
an invalid image if any file needs a Continuation Area.  The bug
seems to have been introduced with the conversion to TAILQs.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.20.1 src/usr.sbin/makefs/cd9660/iso9660_rrip.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.sbin/makefs/cd9660/iso9660_rrip.c
diff -u src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4 src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4.20.1
--- src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4	Mon Dec 18 21:03:29 2006
+++ src/usr.sbin/makefs/cd9660/iso9660_rrip.c	Sat Jan  2 06:26:11 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: iso9660_rrip.c,v 1.4 2006/12/18 21:03:29 christos Exp $	*/
+/*	$NetBSD: iso9660_rrip.c,v 1.4.20.1 2010/01/02 06:26:11 snj Exp $	*/
 
 /*
  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -43,7 +43,7 @@
 
 #include sys/cdefs.h
 #if defined(__RCSID)  !defined(__lint)
-__RCSID($NetBSD: iso9660_rrip.c,v 1.4 2006/12/18 21:03:29 christos Exp $);
+__RCSID($NetBSD: iso9660_rrip.c,v 1.4.20.1 2010/01/02 06:26:11 snj Exp $);
 #endif  /* !__lint */
 
 static void cd9660_rrip_initialize_inode(cd9660node *);
@@ -228,7 +228,7 @@
 			SUSP_ENTRY_SUSP_CE, CE, SUSP_LOC_ENTRY);
 		cd9660_susp_ce(CE, node);
 		/* This will automatically insert at the appropriate location */
-		TAILQ_INSERT_TAIL(node-head, CE, rr_ll);
+		TAILQ_INSERT_AFTER(node-head, last, CE, rr_ll);
 		susp_used += 28;
 
 		/* Count how much CA data is necessary */

CVS commit: [netbsd-5-0] src/usr.sbin/makefs/cd9660

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sat Jan  2 06:27:27 UTC 2010

Modified Files:
src/usr.sbin/makefs/cd9660 [netbsd-5-0]: iso9660_rrip.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1198):
usr.sbin/makefs/cd9660/iso9660_rrip.c: revision 1.6
Fix another bug in SUSP CE handling: when the SUSP records fit into
the System Use field with fewer then 28 bytes to spare, we were
remembering the wrong length for the System Use field and hence
emitting a corrupt directory entry.  This could be triggered by trying
to build a filesystem containing a regular file with a 120-byte name.
Now we're a little more careful.


To generate a diff of this commit:
cvs rdiff -u -r1.4.20.1 -r1.4.20.2 src/usr.sbin/makefs/cd9660/iso9660_rrip.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.sbin/makefs/cd9660/iso9660_rrip.c
diff -u src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4.20.1 src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4.20.2
--- src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4.20.1	Sat Jan  2 06:26:11 2010
+++ src/usr.sbin/makefs/cd9660/iso9660_rrip.c	Sat Jan  2 06:27:27 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: iso9660_rrip.c,v 1.4.20.1 2010/01/02 06:26:11 snj Exp $	*/
+/*	$NetBSD: iso9660_rrip.c,v 1.4.20.2 2010/01/02 06:27:27 snj Exp $	*/
 
 /*
  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -43,7 +43,7 @@
 
 #include sys/cdefs.h
 #if defined(__RCSID)  !defined(__lint)
-__RCSID($NetBSD: iso9660_rrip.c,v 1.4.20.1 2010/01/02 06:26:11 snj Exp $);
+__RCSID($NetBSD: iso9660_rrip.c,v 1.4.20.2 2010/01/02 06:27:27 snj Exp $);
 #endif  /* !__lint */
 
 static void cd9660_rrip_initialize_inode(cd9660node *);
@@ -200,7 +200,7 @@
 static int
 cd9660_susp_handle_continuation_common(cd9660node *node, int space)
 {
-	int ca_used, susp_used, working;
+	int ca_used, susp_used, susp_used_last, working;
 	struct ISO_SUSP_ATTRIBUTES *temp, *last = NULL, *CE;
 
 	working = 254 - space;
@@ -216,9 +216,15 @@
 		 * CD9660_SUSP_ENTRY_SIZE(temp));
 		 */
 		working -= CD9660_SUSP_ENTRY_SIZE(temp);
+		if (working = 0)
+			susp_used += CD9660_SUSP_ENTRY_SIZE(temp);
 		if (working = 28) {
+			/*
+			 * Remember the last entry after which we
+			 * could insert a CE entry.
+			 */
 			last = temp;
-			susp_used += CD9660_SUSP_ENTRY_SIZE(temp);
+			susp_used_last = susp_used;
 		}
 	}
 
@@ -229,7 +235,7 @@
 		cd9660_susp_ce(CE, node);
 		/* This will automatically insert at the appropriate location */
 		TAILQ_INSERT_AFTER(node-head, last, CE, rr_ll);
-		susp_used += 28;
+		susp_used = susp_used_last + 28;
 
 		/* Count how much CA data is necessary */
 		for (temp = TAILQ_NEXT(CE, rr_ll); temp != NULL;

CVS commit: [netbsd-5-0] src/usr.sbin/makefs/cd9660

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sat Jan  2 06:28:27 UTC 2010

Modified Files:
src/usr.sbin/makefs/cd9660 [netbsd-5-0]: iso9660_rrip.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1198):
usr.sbin/makefs/cd9660/iso9660_rrip.c: revision 1.7
Initialize a local variable to get rid of a may be used uninitialized
warning (turned into error by -Werror).


To generate a diff of this commit:
cvs rdiff -u -r1.4.20.2 -r1.4.20.3 src/usr.sbin/makefs/cd9660/iso9660_rrip.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.sbin/makefs/cd9660/iso9660_rrip.c
diff -u src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4.20.2 src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4.20.3
--- src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4.20.2	Sat Jan  2 06:27:27 2010
+++ src/usr.sbin/makefs/cd9660/iso9660_rrip.c	Sat Jan  2 06:28:26 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: iso9660_rrip.c,v 1.4.20.2 2010/01/02 06:27:27 snj Exp $	*/
+/*	$NetBSD: iso9660_rrip.c,v 1.4.20.3 2010/01/02 06:28:26 snj Exp $	*/
 
 /*
  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -43,7 +43,7 @@
 
 #include sys/cdefs.h
 #if defined(__RCSID)  !defined(__lint)
-__RCSID($NetBSD: iso9660_rrip.c,v 1.4.20.2 2010/01/02 06:27:27 snj Exp $);
+__RCSID($NetBSD: iso9660_rrip.c,v 1.4.20.3 2010/01/02 06:28:26 snj Exp $);
 #endif  /* !__lint */
 
 static void cd9660_rrip_initialize_inode(cd9660node *);
@@ -200,7 +200,7 @@
 static int
 cd9660_susp_handle_continuation_common(cd9660node *node, int space)
 {
-	int ca_used, susp_used, susp_used_last, working;
+	int ca_used, susp_used, susp_used_last = 0, working;
 	struct ISO_SUSP_ATTRIBUTES *temp, *last = NULL, *CE;
 
 	working = 254 - space;

CVS commit: [netbsd-5-0] src/usr.sbin/makefs

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sat Jan  2 06:34:15 UTC 2010

Modified Files:
src/usr.sbin/makefs [netbsd-5-0]: cd9660.c cd9660.h
src/usr.sbin/makefs/cd9660 [netbsd-5-0]: cd9660_write.c iso9660_rrip.c
iso9660_rrip.h

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1198):
usr.sbin/makefs/cd9660.c: revision 1.25 via patch
usr.sbin/makefs/cd9660.h: revision 1.13 via patch
usr.sbin/makefs/cd9660/cd9660_write.c: revision 1.10
usr.sbin/makefs/cd9660/iso9660_rrip.c: revision 1.8
usr.sbin/makefs/cd9660/iso9660_rrip.h: revision 1.5
Add support for encoding RISC OS metadata into ISO 9660 filesystems.
This is done by adding the general ability to stuff non-SUSP data into
the end of the System Use field of a Directory Record, which required
some amount of rewriting of the SUSP support.  I think the result is
at least as good as what came before, and I've fixed at least one bug
along the way.  Tested against RISC OS 3.70 on my Risc PC.
Oh, why do we want it?  It should allow us to make acorn{26,32} CDs that
can be booted directly from RISC OS without mucking around copying the
bootloader to a native filing system.


To generate a diff of this commit:
cvs rdiff -u -r1.22.2.1 -r1.22.2.1.2.1 src/usr.sbin/makefs/cd9660.c
cvs rdiff -u -r1.12 -r1.12.6.1 src/usr.sbin/makefs/cd9660.h
cvs rdiff -u -r1.9 -r1.9.6.1 src/usr.sbin/makefs/cd9660/cd9660_write.c
cvs rdiff -u -r1.4.20.3 -r1.4.20.4 src/usr.sbin/makefs/cd9660/iso9660_rrip.c
cvs rdiff -u -r1.4 -r1.4.28.1 src/usr.sbin/makefs/cd9660/iso9660_rrip.h

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

Modified files:

Index: src/usr.sbin/makefs/cd9660.c
diff -u src/usr.sbin/makefs/cd9660.c:1.22.2.1 src/usr.sbin/makefs/cd9660.c:1.22.2.1.2.1
--- src/usr.sbin/makefs/cd9660.c:1.22.2.1	Mon Feb  2 03:32:34 2009
+++ src/usr.sbin/makefs/cd9660.c	Sat Jan  2 06:34:15 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660.c,v 1.22.2.1 2009/02/02 03:32:34 snj Exp $	*/
+/*	$NetBSD: cd9660.c,v 1.22.2.1.2.1 2010/01/02 06:34:15 snj Exp $	*/
 
 /*
  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -103,7 +103,7 @@
 
 #include sys/cdefs.h
 #if defined(__RCSID)  !defined(__lint)
-__RCSID($NetBSD: cd9660.c,v 1.22.2.1 2009/02/02 03:32:34 snj Exp $);
+__RCSID($NetBSD: cd9660.c,v 1.22.2.1.2.1 2010/01/02 06:34:15 snj Exp $);
 #endif  /* !__lint */
 
 #include string.h
@@ -187,6 +187,7 @@
 	temp-isoDirRecord = NULL;
 	temp-isoExtAttributes = NULL;
 	temp-rr_real_parent = temp-rr_relocated = NULL;
+	temp-su_tail_data = NULL;
 	return temp;
 }
 
@@ -1759,6 +1760,9 @@
 
 	if (diskStructure.rock_ridge_enabled)
 		size += node-susp_entry_size;
+	size += node-su_tail_size;
+	size += size  1; /* Ensure length of record is even. */
+	assert(size = 254);
 	return size;
 }
 

Index: src/usr.sbin/makefs/cd9660.h
diff -u src/usr.sbin/makefs/cd9660.h:1.12 src/usr.sbin/makefs/cd9660.h:1.12.6.1
--- src/usr.sbin/makefs/cd9660.h:1.12	Sun Jul 27 10:29:32 2008
+++ src/usr.sbin/makefs/cd9660.h	Sat Jan  2 06:34:15 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660.h,v 1.12 2008/07/27 10:29:32 reinoud Exp $	*/
+/*	$NetBSD: cd9660.h,v 1.12.6.1 2010/01/02 06:34:15 snj Exp $	*/
 
 /*
  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -208,6 +208,10 @@
 	int susp_dot_ce_length;
 	int susp_dot_dot_ce_length;
 
+	/* Data to put at the end of the System Use field */
+	int su_tail_size;
+	char *su_tail_data;
+
 	/*** PATH TABLE STUFF ***/
 	int level;			/*depth*/
 	int ptnumber;

Index: src/usr.sbin/makefs/cd9660/cd9660_write.c
diff -u src/usr.sbin/makefs/cd9660/cd9660_write.c:1.9 src/usr.sbin/makefs/cd9660/cd9660_write.c:1.9.6.1
--- src/usr.sbin/makefs/cd9660/cd9660_write.c:1.9	Sat May 10 19:00:07 2008
+++ src/usr.sbin/makefs/cd9660/cd9660_write.c	Sat Jan  2 06:34:15 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660_write.c,v 1.9 2008/05/10 19:00:07 skrll Exp $	*/
+/*	$NetBSD: cd9660_write.c,v 1.9.6.1 2010/01/02 06:34:15 snj Exp $	*/
 
 /*
  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -37,7 +37,7 @@
 
 #include sys/cdefs.h
 #if defined(__RCSID)  !defined(__lint)
-__RCSID($NetBSD: cd9660_write.c,v 1.9 2008/05/10 19:00:07 skrll Exp $);
+__RCSID($NetBSD: cd9660_write.c,v 1.9.6.1 2010/01/02 06:34:15 snj Exp $);
 #endif  /* !__lint */
 
 static int cd9660_write_volume_descriptors(FILE *);
@@ -48,7 +48,7 @@
 #if 0
 static int cd9660_write_buffered(FILE *, int, int, const unsigned char*);
 #endif
-static int cd9660_write_rr(FILE *, cd9660node *, int, int);
+static void cd9660_write_rr(FILE *, cd9660node *, int, int);
 
 /*
  * Write the image
@@ -271,7 +271,7 @@
 	int written;
 	iso_directory_record_cd9660 temp_record;
 	cd9660node *temp;
-	int ca = 0, rv = 0;
+	int rv = 0;
 
 	/* Todo : clean up variables */
 
@@ -343,31 +343,27 @@
 working_sector * diskStructure.sectorSize,
 SEEK_SET);
 			}
-
-			

CVS commit: src/distrib/miniroot

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Jan  2 06:37:28 UTC 2010

Modified Files:
src/distrib/miniroot: list

Log Message:
Remove -ledit and -lmagic from LIBS.

No program requires -ledit in crunched SMALLPROG case, and
miniroot doesn't have /usr/bin/file which requires -lmagic.
(sparc had it but it was removed in distrib/sparc/miniroot/list rev 1.29)


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/distrib/miniroot/list

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

Modified files:

Index: src/distrib/miniroot/list
diff -u src/distrib/miniroot/list:1.29 src/distrib/miniroot/list:1.30
--- src/distrib/miniroot/list:1.29	Sun Sep 20 19:49:09 2009
+++ src/distrib/miniroot/list	Sat Jan  2 06:37:28 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.29 2009/09/20 19:49:09 abs Exp $
+#	$NetBSD: list,v 1.30 2010/01/02 06:37:28 tsutsui Exp $
 
 SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin
 
@@ -58,7 +58,7 @@
 SPECIAL	route		srcdir	distrib/utils/x_route
 
 LIBS	libhack.o
-LIBS	-lrmt -ledit -lutil -lcurses -ltermcap -lbz2 -lcrypt -lintl -ll -lm -lkvm -lmagic -lz -lprop
+LIBS	-lrmt -lutil -lcurses -ltermcap -lbz2 -lcrypt -lintl -ll -lm -lkvm -lz -lprop
 
 # various files that we need in /etc for the install
 COPY	${NETBSDSRCDIR}/etc/group		etc/group

CVS commit: src/distrib/amiga/miniroot

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Jan  2 06:39:01 UTC 2010

Modified Files:
src/distrib/amiga/miniroot: list

Log Message:
Remove LIBS -lz which is already in distrib/miniroot/list.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/distrib/amiga/miniroot/list

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

Modified files:

Index: src/distrib/amiga/miniroot/list
diff -u src/distrib/amiga/miniroot/list:1.21 src/distrib/amiga/miniroot/list:1.22
--- src/distrib/amiga/miniroot/list:1.21	Sun Sep 20 23:19:51 2009
+++ src/distrib/amiga/miniroot/list	Sat Jan  2 06:39:00 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.21 2009/09/20 23:19:51 abs Exp $
+#	$NetBSD: list,v 1.22 2010/01/02 06:39:00 tsutsui Exp $
 
 # Amiga extra's
 PROG	sbin/disklabel
@@ -9,9 +9,6 @@
 PROG	usr/bin/vi
 PROG	usr/sbin/loadkmap
 
-# usr/bin/file needs libz
-LIBS	-lz
-
 # crunchgen source directory specials
 SPECIAL	loadkmap	srcdir sys/arch/amiga/stand/loadkmap
 SPECIAL	vi		srcdir usr.bin/nvi/build

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sat Jan  2 06:40:03 UTC 2010

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

Log Message:
Ticket 1198.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.34 -r1.1.2.35 src/doc/CHANGES-5.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-5.0.2
diff -u src/doc/CHANGES-5.0.2:1.1.2.34 src/doc/CHANGES-5.0.2:1.1.2.35
--- src/doc/CHANGES-5.0.2:1.1.2.34	Mon Dec 21 09:42:08 2009
+++ src/doc/CHANGES-5.0.2	Sat Jan  2 06:40:03 2010
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.0.2,v 1.1.2.34 2009/12/21 09:42:08 sborrill Exp $
+# $NetBSD: CHANGES-5.0.2,v 1.1.2.35 2010/01/02 06:40:03 snj Exp $
 
 A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2
 release:
@@ -897,3 +897,14 @@
 	completely separate userspace VA.
 	[martin, ticket #1200]
 
+usr.sbin/makefs/cd9660.c			1.25 via patch
+usr.sbin/makefs/cd9660.h			1.13 via patch
+usr.sbin/makefs/cd9660/cd9660_write.c		1.10
+usr.sbin/makefs/cd9660/iso9660_rrip.c		1.5-1.8
+usr.sbin/makefs/cd9660/iso9660_rrip.h		1.5
+
+	Keep makefs(8) from creating invalid ISO format on rockridge support
+	which causes fatal errors in ARC BIOS firmware on MIPS Magnum R4000
+	while booting from arccd-5.0.1.iso as described in PR bin/42410.
+	[tsutsui, ticket #1198]
+

CVS commit: [netbsd-5] src/usr.sbin/makefs/cd9660

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sat Jan  2 06:41:03 UTC 2010

Modified Files:
src/usr.sbin/makefs/cd9660 [netbsd-5]: iso9660_rrip.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1198):
usr.sbin/makefs/cd9660/iso9660_rrip.c: revision 1.5
When splitting a System Use Area between a System Use field and a
Continuation Area, be sure to insert the CE record at the correct
point in the chain of SUSP records.  Without this, makefs emits
an invalid image if any file needs a Continuation Area.  The bug
seems to have been introduced with the conversion to TAILQs.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.18.1 src/usr.sbin/makefs/cd9660/iso9660_rrip.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.sbin/makefs/cd9660/iso9660_rrip.c
diff -u src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4 src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4.18.1
--- src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4	Mon Dec 18 21:03:29 2006
+++ src/usr.sbin/makefs/cd9660/iso9660_rrip.c	Sat Jan  2 06:41:03 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: iso9660_rrip.c,v 1.4 2006/12/18 21:03:29 christos Exp $	*/
+/*	$NetBSD: iso9660_rrip.c,v 1.4.18.1 2010/01/02 06:41:03 snj Exp $	*/
 
 /*
  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -43,7 +43,7 @@
 
 #include sys/cdefs.h
 #if defined(__RCSID)  !defined(__lint)
-__RCSID($NetBSD: iso9660_rrip.c,v 1.4 2006/12/18 21:03:29 christos Exp $);
+__RCSID($NetBSD: iso9660_rrip.c,v 1.4.18.1 2010/01/02 06:41:03 snj Exp $);
 #endif  /* !__lint */
 
 static void cd9660_rrip_initialize_inode(cd9660node *);
@@ -228,7 +228,7 @@
 			SUSP_ENTRY_SUSP_CE, CE, SUSP_LOC_ENTRY);
 		cd9660_susp_ce(CE, node);
 		/* This will automatically insert at the appropriate location */
-		TAILQ_INSERT_TAIL(node-head, CE, rr_ll);
+		TAILQ_INSERT_AFTER(node-head, last, CE, rr_ll);
 		susp_used += 28;
 
 		/* Count how much CA data is necessary */

CVS commit: [netbsd-5] src/usr.sbin/makefs/cd9660

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sat Jan  2 06:41:48 UTC 2010

Modified Files:
src/usr.sbin/makefs/cd9660 [netbsd-5]: iso9660_rrip.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1198):
usr.sbin/makefs/cd9660/iso9660_rrip.c: revision 1.6
Fix another bug in SUSP CE handling: when the SUSP records fit into
the System Use field with fewer then 28 bytes to spare, we were
remembering the wrong length for the System Use field and hence
emitting a corrupt directory entry.  This could be triggered by trying
to build a filesystem containing a regular file with a 120-byte name.
Now we're a little more careful.


To generate a diff of this commit:
cvs rdiff -u -r1.4.18.1 -r1.4.18.2 src/usr.sbin/makefs/cd9660/iso9660_rrip.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.sbin/makefs/cd9660/iso9660_rrip.c
diff -u src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4.18.1 src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4.18.2
--- src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4.18.1	Sat Jan  2 06:41:03 2010
+++ src/usr.sbin/makefs/cd9660/iso9660_rrip.c	Sat Jan  2 06:41:47 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: iso9660_rrip.c,v 1.4.18.1 2010/01/02 06:41:03 snj Exp $	*/
+/*	$NetBSD: iso9660_rrip.c,v 1.4.18.2 2010/01/02 06:41:47 snj Exp $	*/
 
 /*
  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -43,7 +43,7 @@
 
 #include sys/cdefs.h
 #if defined(__RCSID)  !defined(__lint)
-__RCSID($NetBSD: iso9660_rrip.c,v 1.4.18.1 2010/01/02 06:41:03 snj Exp $);
+__RCSID($NetBSD: iso9660_rrip.c,v 1.4.18.2 2010/01/02 06:41:47 snj Exp $);
 #endif  /* !__lint */
 
 static void cd9660_rrip_initialize_inode(cd9660node *);
@@ -200,7 +200,7 @@
 static int
 cd9660_susp_handle_continuation_common(cd9660node *node, int space)
 {
-	int ca_used, susp_used, working;
+	int ca_used, susp_used, susp_used_last, working;
 	struct ISO_SUSP_ATTRIBUTES *temp, *last = NULL, *CE;
 
 	working = 254 - space;
@@ -216,9 +216,15 @@
 		 * CD9660_SUSP_ENTRY_SIZE(temp));
 		 */
 		working -= CD9660_SUSP_ENTRY_SIZE(temp);
+		if (working = 0)
+			susp_used += CD9660_SUSP_ENTRY_SIZE(temp);
 		if (working = 28) {
+			/*
+			 * Remember the last entry after which we
+			 * could insert a CE entry.
+			 */
 			last = temp;
-			susp_used += CD9660_SUSP_ENTRY_SIZE(temp);
+			susp_used_last = susp_used;
 		}
 	}
 
@@ -229,7 +235,7 @@
 		cd9660_susp_ce(CE, node);
 		/* This will automatically insert at the appropriate location */
 		TAILQ_INSERT_AFTER(node-head, last, CE, rr_ll);
-		susp_used += 28;
+		susp_used = susp_used_last + 28;
 
 		/* Count how much CA data is necessary */
 		for (temp = TAILQ_NEXT(CE, rr_ll); temp != NULL;

CVS commit: [netbsd-5] src/usr.sbin/makefs/cd9660

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sat Jan  2 06:42:45 UTC 2010

Modified Files:
src/usr.sbin/makefs/cd9660 [netbsd-5]: iso9660_rrip.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1198):
usr.sbin/makefs/cd9660/iso9660_rrip.c: revision 1.7
Initialize a local variable to get rid of a may be used uninitialized
warning (turned into error by -Werror).


To generate a diff of this commit:
cvs rdiff -u -r1.4.18.2 -r1.4.18.3 src/usr.sbin/makefs/cd9660/iso9660_rrip.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.sbin/makefs/cd9660/iso9660_rrip.c
diff -u src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4.18.2 src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4.18.3
--- src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.4.18.2	Sat Jan  2 06:41:47 2010
+++ src/usr.sbin/makefs/cd9660/iso9660_rrip.c	Sat Jan  2 06:42:45 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: iso9660_rrip.c,v 1.4.18.2 2010/01/02 06:41:47 snj Exp $	*/
+/*	$NetBSD: iso9660_rrip.c,v 1.4.18.3 2010/01/02 06:42:45 snj Exp $	*/
 
 /*
  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -43,7 +43,7 @@
 
 #include sys/cdefs.h
 #if defined(__RCSID)  !defined(__lint)
-__RCSID($NetBSD: iso9660_rrip.c,v 1.4.18.2 2010/01/02 06:41:47 snj Exp $);
+__RCSID($NetBSD: iso9660_rrip.c,v 1.4.18.3 2010/01/02 06:42:45 snj Exp $);
 #endif  /* !__lint */
 
 static void cd9660_rrip_initialize_inode(cd9660node *);
@@ -200,7 +200,7 @@
 static int
 cd9660_susp_handle_continuation_common(cd9660node *node, int space)
 {
-	int ca_used, susp_used, susp_used_last, working;
+	int ca_used, susp_used, susp_used_last = 0, working;
 	struct ISO_SUSP_ATTRIBUTES *temp, *last = NULL, *CE;
 
 	working = 254 - space;

CVS commit: [netbsd-5] src/usr.sbin/makefs

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sat Jan  2 06:45:03 UTC 2010

Modified Files:
src/usr.sbin/makefs [netbsd-5]: cd9660.c cd9660.h
src/usr.sbin/makefs/cd9660 [netbsd-5]: cd9660_write.c iso9660_rrip.c
iso9660_rrip.h

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1198):
usr.sbin/makefs/cd9660.c: revision 1.25 via patch
usr.sbin/makefs/cd9660.h: revision 1.13 via patch
usr.sbin/makefs/cd9660/cd9660_write.c: revision 1.10
usr.sbin/makefs/cd9660/iso9660_rrip.c: revision 1.8
usr.sbin/makefs/cd9660/iso9660_rrip.h: revision 1.5
Add support for encoding RISC OS metadata into ISO 9660 filesystems.
This is done by adding the general ability to stuff non-SUSP data into
the end of the System Use field of a Directory Record, which required
some amount of rewriting of the SUSP support.  I think the result is
at least as good as what came before, and I've fixed at least one bug
along the way.  Tested against RISC OS 3.70 on my Risc PC.
Oh, why do we want it?  It should allow us to make acorn{26,32} CDs that
can be booted directly from RISC OS without mucking around copying the
bootloader to a native filing system.


To generate a diff of this commit:
cvs rdiff -u -r1.22.2.1 -r1.22.2.2 src/usr.sbin/makefs/cd9660.c
cvs rdiff -u -r1.12 -r1.12.4.1 src/usr.sbin/makefs/cd9660.h
cvs rdiff -u -r1.9 -r1.9.4.1 src/usr.sbin/makefs/cd9660/cd9660_write.c
cvs rdiff -u -r1.4.18.3 -r1.4.18.4 src/usr.sbin/makefs/cd9660/iso9660_rrip.c
cvs rdiff -u -r1.4 -r1.4.26.1 src/usr.sbin/makefs/cd9660/iso9660_rrip.h

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

Modified files:

Index: src/usr.sbin/makefs/cd9660.c
diff -u src/usr.sbin/makefs/cd9660.c:1.22.2.1 src/usr.sbin/makefs/cd9660.c:1.22.2.2
--- src/usr.sbin/makefs/cd9660.c:1.22.2.1	Mon Feb  2 03:32:34 2009
+++ src/usr.sbin/makefs/cd9660.c	Sat Jan  2 06:45:03 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660.c,v 1.22.2.1 2009/02/02 03:32:34 snj Exp $	*/
+/*	$NetBSD: cd9660.c,v 1.22.2.2 2010/01/02 06:45:03 snj Exp $	*/
 
 /*
  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -103,7 +103,7 @@
 
 #include sys/cdefs.h
 #if defined(__RCSID)  !defined(__lint)
-__RCSID($NetBSD: cd9660.c,v 1.22.2.1 2009/02/02 03:32:34 snj Exp $);
+__RCSID($NetBSD: cd9660.c,v 1.22.2.2 2010/01/02 06:45:03 snj Exp $);
 #endif  /* !__lint */
 
 #include string.h
@@ -187,6 +187,7 @@
 	temp-isoDirRecord = NULL;
 	temp-isoExtAttributes = NULL;
 	temp-rr_real_parent = temp-rr_relocated = NULL;
+	temp-su_tail_data = NULL;
 	return temp;
 }
 
@@ -1759,6 +1760,9 @@
 
 	if (diskStructure.rock_ridge_enabled)
 		size += node-susp_entry_size;
+	size += node-su_tail_size;
+	size += size  1; /* Ensure length of record is even. */
+	assert(size = 254);
 	return size;
 }
 

Index: src/usr.sbin/makefs/cd9660.h
diff -u src/usr.sbin/makefs/cd9660.h:1.12 src/usr.sbin/makefs/cd9660.h:1.12.4.1
--- src/usr.sbin/makefs/cd9660.h:1.12	Sun Jul 27 10:29:32 2008
+++ src/usr.sbin/makefs/cd9660.h	Sat Jan  2 06:45:03 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660.h,v 1.12 2008/07/27 10:29:32 reinoud Exp $	*/
+/*	$NetBSD: cd9660.h,v 1.12.4.1 2010/01/02 06:45:03 snj Exp $	*/
 
 /*
  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -208,6 +208,10 @@
 	int susp_dot_ce_length;
 	int susp_dot_dot_ce_length;
 
+	/* Data to put at the end of the System Use field */
+	int su_tail_size;
+	char *su_tail_data;
+
 	/*** PATH TABLE STUFF ***/
 	int level;			/*depth*/
 	int ptnumber;

Index: src/usr.sbin/makefs/cd9660/cd9660_write.c
diff -u src/usr.sbin/makefs/cd9660/cd9660_write.c:1.9 src/usr.sbin/makefs/cd9660/cd9660_write.c:1.9.4.1
--- src/usr.sbin/makefs/cd9660/cd9660_write.c:1.9	Sat May 10 19:00:07 2008
+++ src/usr.sbin/makefs/cd9660/cd9660_write.c	Sat Jan  2 06:45:03 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660_write.c,v 1.9 2008/05/10 19:00:07 skrll Exp $	*/
+/*	$NetBSD: cd9660_write.c,v 1.9.4.1 2010/01/02 06:45:03 snj Exp $	*/
 
 /*
  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -37,7 +37,7 @@
 
 #include sys/cdefs.h
 #if defined(__RCSID)  !defined(__lint)
-__RCSID($NetBSD: cd9660_write.c,v 1.9 2008/05/10 19:00:07 skrll Exp $);
+__RCSID($NetBSD: cd9660_write.c,v 1.9.4.1 2010/01/02 06:45:03 snj Exp $);
 #endif  /* !__lint */
 
 static int cd9660_write_volume_descriptors(FILE *);
@@ -48,7 +48,7 @@
 #if 0
 static int cd9660_write_buffered(FILE *, int, int, const unsigned char*);
 #endif
-static int cd9660_write_rr(FILE *, cd9660node *, int, int);
+static void cd9660_write_rr(FILE *, cd9660node *, int, int);
 
 /*
  * Write the image
@@ -271,7 +271,7 @@
 	int written;
 	iso_directory_record_cd9660 temp_record;
 	cd9660node *temp;
-	int ca = 0, rv = 0;
+	int rv = 0;
 
 	/* Todo : clean up variables */
 
@@ -343,31 +343,27 @@
 working_sector * diskStructure.sectorSize,
 SEEK_SET);
 			}
-
-			written = 

CVS commit: src/distrib

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Jan  2 06:46:09 UTC 2010

Modified Files:
src/distrib/hp300/miniroot: list
src/distrib/mac68k/miniroot: list
src/distrib/mvme68k/miniroot: list
src/distrib/pmax/miniroot: list
src/distrib/sgimips/miniroot: list
src/distrib/sparc/miniroot: list
src/distrib/vax/miniroot: list

Log Message:
No need to install /usr/share/zoneinfo into miniroot
because libc functions in libhack doesn't require it and
zoneinfo files seem to get larger since tzcode2009k import.
(due to 64bit time_t support?)

Briefly tested sysinst on sparc miniroot.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/hp300/miniroot/list
cvs rdiff -u -r1.9 -r1.10 src/distrib/mac68k/miniroot/list
cvs rdiff -u -r1.17 -r1.18 src/distrib/mvme68k/miniroot/list
cvs rdiff -u -r1.19 -r1.20 src/distrib/pmax/miniroot/list
cvs rdiff -u -r1.7 -r1.8 src/distrib/sgimips/miniroot/list
cvs rdiff -u -r1.32 -r1.33 src/distrib/sparc/miniroot/list
cvs rdiff -u -r1.10 -r1.11 src/distrib/vax/miniroot/list

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

Modified files:

Index: src/distrib/hp300/miniroot/list
diff -u src/distrib/hp300/miniroot/list:1.16 src/distrib/hp300/miniroot/list:1.17
--- src/distrib/hp300/miniroot/list:1.16	Sun Sep 20 23:19:52 2009
+++ src/distrib/hp300/miniroot/list	Sat Jan  2 06:46:09 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.16 2009/09/20 23:19:52 abs Exp $
+#	$NetBSD: list,v 1.17 2010/01/02 06:46:09 tsutsui Exp $
 
 # hp300 extra's
 PROG	sbin/disklabel
@@ -28,9 +28,6 @@
 # ensure installboot is executable
 MTREE	./usr/mdec/installboot	mode=0555
 
-# the zoneinfo
-COPYDIR	${DESTDIR}/usr/share/zoneinfo	usr/share/zoneinfo
-
 # and the termcap file
 COPY	${DISTRIBDIR}/common/termcap	usr/share/misc/termcap
 

Index: src/distrib/mac68k/miniroot/list
diff -u src/distrib/mac68k/miniroot/list:1.9 src/distrib/mac68k/miniroot/list:1.10
--- src/distrib/mac68k/miniroot/list:1.9	Sun Sep 20 23:19:54 2009
+++ src/distrib/mac68k/miniroot/list	Sat Jan  2 06:46:09 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.9 2009/09/20 23:19:54 abs Exp $
+#	$NetBSD: list,v 1.10 2010/01/02 06:46:09 tsutsui Exp $
 
 # mac68k extra's
 PROG	sbin/dmesg
@@ -21,9 +21,6 @@
 # Minimize use of MFS
 SYMLINK	/tmp	var/tmp
 
-# the zoneinfo
-#COPYDIR	${DESTDIR}/usr/share/zoneinfo	usr/share/zoneinfo
-
 # and the termcap file
 COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 

Index: src/distrib/mvme68k/miniroot/list
diff -u src/distrib/mvme68k/miniroot/list:1.17 src/distrib/mvme68k/miniroot/list:1.18
--- src/distrib/mvme68k/miniroot/list:1.17	Sun Sep 20 23:19:54 2009
+++ src/distrib/mvme68k/miniroot/list	Sat Jan  2 06:46:09 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.17 2009/09/20 23:19:54 abs Exp $
+#	$NetBSD: list,v 1.18 2010/01/02 06:46:09 tsutsui Exp $
 
 # mvme68k's extras
 PROG	sbin/disklabel
@@ -27,9 +27,6 @@
 # ensure installboot is executable
 MTREE	./usr/mdec/installboot	mode=0555
 
-# the zoneinfo
-COPYDIR	${DESTDIR}/usr/share/zoneinfo	usr/share/zoneinfo
-
 # and the termcap file
 COPY	${DISTRIBDIR}/common/termcap	usr/share/misc/termcap
 

Index: src/distrib/pmax/miniroot/list
diff -u src/distrib/pmax/miniroot/list:1.19 src/distrib/pmax/miniroot/list:1.20
--- src/distrib/pmax/miniroot/list:1.19	Sun Sep 20 23:19:55 2009
+++ src/distrib/pmax/miniroot/list	Sat Jan  2 06:46:09 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.19 2009/09/20 23:19:55 abs Exp $
+#	$NetBSD: list,v 1.20 2010/01/02 06:46:09 tsutsui Exp $
 
 # extras in bin
 PROG	bin/csh
@@ -32,9 +32,6 @@
 # and /boot.pmax
 COPY	${DESTDIR}/boot.pmax	boot.pmax
 
-# the zoneinfo (dont use)
-#COPYDIR	${DESTDIR}/usr/share/zoneinfo	usr/share/zoneinfo
-
 # a subset termcap file
 COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 

Index: src/distrib/sgimips/miniroot/list
diff -u src/distrib/sgimips/miniroot/list:1.7 src/distrib/sgimips/miniroot/list:1.8
--- src/distrib/sgimips/miniroot/list:1.7	Sun Sep 20 23:19:55 2009
+++ src/distrib/sgimips/miniroot/list	Sat Jan  2 06:46:09 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.7 2009/09/20 23:19:55 abs Exp $
+#	$NetBSD: list,v 1.8 2010/01/02 06:46:09 tsutsui Exp $
 
 # extras in bin
 PROG	bin/csh
@@ -33,9 +33,6 @@
 COPY	${DESTDIR}/usr/mdec/ip2xboot	usr/mdec/ip2xboot
 COPY	${DESTDIR}/usr/mdec/ip3xboot	usr/mdec/ip3xboot
 
-# the zoneinfo (dont use)
-#COPYDIR	${DESTDIR}/usr/share/zoneinfo	usr/share/zoneinfo
-
 # a subset termcap file
 COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 

Index: src/distrib/sparc/miniroot/list
diff -u src/distrib/sparc/miniroot/list:1.32 src/distrib/sparc/miniroot/list:1.33
--- src/distrib/sparc/miniroot/list:1.32	Sun Sep 20 23:19:55 2009
+++ src/distrib/sparc/miniroot/list	Sat Jan  2 06:46:09 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.32 2009/09/20 23:19:55 abs Exp $
+#	$NetBSD: list,v 1.33 2010/01/02 06:46:09 tsutsui Exp $
 
 # Sparc extra's
 

CVS commit: [netbsd-5] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sat Jan  2 06:47:51 UTC 2010

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

Log Message:
Ticket 1198.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.166 -r1.1.2.167 src/doc/CHANGES-5.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
diff -u src/doc/CHANGES-5.1:1.1.2.166 src/doc/CHANGES-5.1:1.1.2.167
--- src/doc/CHANGES-5.1:1.1.2.166	Thu Dec 24 04:57:14 2009
+++ src/doc/CHANGES-5.1	Sat Jan  2 06:47:51 2010
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.166 2009/12/24 04:57:14 snj Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.167 2010/01/02 06:47:51 snj Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -15713,3 +15713,14 @@
 	to hold disk sector numbers  2^31 and also -1.  Fixes PR/34807.
 	[dsl, ticket #1201]
 
+usr.sbin/makefs/cd9660.c			1.25 via patch
+usr.sbin/makefs/cd9660.h			1.13 via patch
+usr.sbin/makefs/cd9660/cd9660_write.c		1.10
+usr.sbin/makefs/cd9660/iso9660_rrip.c		1.5-1.8
+usr.sbin/makefs/cd9660/iso9660_rrip.h		1.5
+
+	Keep makefs(8) from creating invalid ISO format on rockridge support
+	which causes fatal errors in ARC BIOS firmware on MIPS Magnum R4000
+	while booting from arccd-5.0.1.iso as described in PR bin/42410.
+	[tsutsui, ticket #1198]
+

CVS commit: src/sys/arch/arm/arm32

[Havard Eidnes]

Module Name:src
Committed By:   he
Date:   Sat Jan  2 07:53:29 UTC 2010

Modified Files:
src/sys/arch/arm/arm32: pmap.c

Log Message:
Remove a shadowed and unused local declaration so that this builds again.


To generate a diff of this commit:
cvs rdiff -u -r1.210 -r1.211 src/sys/arch/arm/arm32/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/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.210 src/sys/arch/arm/arm32/pmap.c:1.211
--- src/sys/arch/arm/arm32/pmap.c:1.210	Fri Jan  1 02:32:28 2010
+++ src/sys/arch/arm/arm32/pmap.c	Sat Jan  2 07:53:29 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.210 2010/01/01 02:32:28 uebayasi Exp $	*/
+/*	$NetBSD: pmap.c,v 1.211 2010/01/02 07:53:29 he Exp $	*/
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -211,7 +211,7 @@
 #include machine/param.h
 #include arm/arm32/katelib.h
 
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.210 2010/01/01 02:32:28 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.211 2010/01/02 07:53:29 he Exp $);
 
 #ifdef PMAP_DEBUG
 
@@ -2357,7 +2357,7 @@
 static int
 pmap_clean_page(struct pv_entry *pv, bool is_src)
 {
-	pmap_t pm, pm_to_clean = NULL;
+	pmap_t pm_to_clean = NULL;
 	struct pv_entry *npv;
 	u_int cache_needs_cleaning = 0;
 	u_int flags = 0;