CVS commit: src/sys/kern
Module Name:src
Committed By: mrg
Date: Thu Jun 18 06:26:58 UTC 2009
Modified Files:
src/sys/kern: subr_prf.c
Log Message:
when printing a ddb stack trace when entering ddb, include the cpu number
To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 src/sys/kern/subr_prf.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_prf.c
diff -u src/sys/kern/subr_prf.c:1.133 src/sys/kern/subr_prf.c:1.134
--- src/sys/kern/subr_prf.c:1.133 Sat Apr 25 15:06:32 2009
+++ src/sys/kern/subr_prf.c Thu Jun 18 06:26:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_prf.c,v 1.133 2009/04/25 15:06:32 rmind Exp $ */
+/* $NetBSD: subr_prf.c,v 1.134 2009/06/18 06:26:58 mrg Exp $ */
/*-
* Copyright (c) 1986, 1988, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.133 2009/04/25 15:06:32 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.134 2009/06/18 06:26:58 mrg Exp $");
#include "opt_ddb.h"
#include "opt_ipkdb.h"
@@ -279,11 +279,11 @@
if (intrace == 0) {
intrace = 1;
- printf("Begin traceback...\n");
+ printf("cpu%d: Begin traceback...\n", cpu_number());
db_stack_trace_print(
(db_expr_t)(intptr_t)__builtin_frame_address(0),
true, 65535, "", printf);
- printf("End traceback...\n");
+ printf("cpu%d: End traceback...\n", cpu_number());
intrace = 0;
} else
printf("Faulted in mid-traceback; aborting...");
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mrg Date: Thu Jun 18 05:59:43 UTC 2009 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/xbase: mi Log Message: fix up for the current symbols/pc xkb map. To generate a diff of this commit: cvs rdiff -u -r1.817 -r1.818 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.76 -r1.77 src/distrib/sets/lists/xbase/mi 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/base/mi diff -u src/distrib/sets/lists/base/mi:1.817 src/distrib/sets/lists/base/mi:1.818 --- src/distrib/sets/lists/base/mi:1.817 Tue Jun 16 00:26:10 2009 +++ src/distrib/sets/lists/base/mi Thu Jun 18 05:59:42 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.817 2009/06/16 00:26:10 mrg Exp $ +# $NetBSD: mi,v 1.818 2009/06/18 05:59:42 mrg Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -626,7 +626,6 @@ ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr base-x11-root ./usr/X11R7/lib/X11/xkb/symbols/nec -obsolete- obsolete ./usr/X11R7/lib/X11/xkb/symbols/nec_vndr base-x11-root -./usr/X11R7/lib/X11/xkb/symbols/pc base-x11-root ./usr/X11R7/lib/X11/xkb/symbols/sgi -obsolete- obsolete ./usr/X11R7/lib/X11/xkb/symbols/sgi_vndr base-x11-root ./usr/X11R7/lib/X11/xkb/symbols/sharp -obsolete- obsolete Index: src/distrib/sets/lists/xbase/mi diff -u src/distrib/sets/lists/xbase/mi:1.76 src/distrib/sets/lists/xbase/mi:1.77 --- src/distrib/sets/lists/xbase/mi:1.76 Fri Jun 12 06:57:22 2009 +++ src/distrib/sets/lists/xbase/mi Thu Jun 18 05:59:43 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.76 2009/06/12 06:57:22 mrg Exp $ +# $NetBSD: mi,v 1.77 2009/06/18 05:59:43 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1890,6 +1890,7 @@ ./usr/X11R7/lib/X11/xkb/symbols/pk -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/rs -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/shift -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/pc -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/pc/al -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/pc/am -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/pc/ara -unknown- obsolete
CVS commit: src/distrib/sets/lists/xserver
Module Name:src Committed By: mrg Date: Thu Jun 18 05:57:35 UTC 2009 Modified Files: src/distrib/sets/lists/xserver: md.alpha md.amd64 md.macppc md.netwinder md.sgimips md.shark md.sparc md.sparc64 Log Message: unobsolete libglx To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/lists/xserver/md.alpha cvs rdiff -u -r1.48 -r1.49 src/distrib/sets/lists/xserver/md.amd64 \ src/distrib/sets/lists/xserver/md.macppc cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/xserver/md.netwinder cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/xserver/md.sgimips cvs rdiff -u -r1.27 -r1.28 src/distrib/sets/lists/xserver/md.shark cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/xserver/md.sparc cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/xserver/md.sparc64 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/xserver/md.alpha diff -u src/distrib/sets/lists/xserver/md.alpha:1.19 src/distrib/sets/lists/xserver/md.alpha:1.20 --- src/distrib/sets/lists/xserver/md.alpha:1.19 Tue Jun 16 00:26:11 2009 +++ src/distrib/sets/lists/xserver/md.alpha Thu Jun 18 05:57:34 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.alpha,v 1.19 2009/06/16 00:26:11 mrg Exp $ +# $NetBSD: md.alpha,v 1.20 2009/06/18 05:57:34 mrg Exp $ ./usr/X11R6/bin/X -unknown- x11 ./usr/X11R6/bin/XalphaNetBSD-unknown- x11 ./usr/X11R6/bin/XdecNetBSD-unknown- x11 @@ -132,10 +132,10 @@ ./usr/X11R7/lib/modules/extensions/libextmod.so -unknown- xorg ./usr/X11R7/lib/modules/extensions/libextmod.so.0 -unknown- xorg ./usr/X11R7/lib/modules/extensions/libextmod_pic.a -unknown- xorg -./usr/X11R7/lib/modules/extensions/libglx.a -unknown- obsolete -./usr/X11R7/lib/modules/extensions/libglx.so -unknown- obsolete -./usr/X11R7/lib/modules/extensions/libglx.so.0 -unknown- obsolete -./usr/X11R7/lib/modules/extensions/libglx_pic.a -unknown- obsolete +./usr/X11R7/lib/modules/extensions/libglx.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libglx.so -unknown- xorg +./usr/X11R7/lib/modules/extensions/libglx.so.0 -unknown- xorg +./usr/X11R7/lib/modules/extensions/libglx_pic.a -unknown- xorg ./usr/X11R7/lib/modules/extensions/libmfb.a -unknown- obsolete ./usr/X11R7/lib/modules/extensions/libmfb.so -unknown- obsolete ./usr/X11R7/lib/modules/extensions/libmfb.so.0 -unknown- obsolete Index: src/distrib/sets/lists/xserver/md.amd64 diff -u src/distrib/sets/lists/xserver/md.amd64:1.48 src/distrib/sets/lists/xserver/md.amd64:1.49 --- src/distrib/sets/lists/xserver/md.amd64:1.48 Tue Jun 16 00:26:11 2009 +++ src/distrib/sets/lists/xserver/md.amd64 Thu Jun 18 05:57:34 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.48 2009/06/16 00:26:11 mrg Exp $ +# $NetBSD: md.amd64,v 1.49 2009/06/18 05:57:34 mrg Exp $ ./usr/X11R6/bin/X -unknown- x11 ./usr/X11R6/bin/XFree86 -unknown- x11 ./usr/X11R6/bin/gtf -unknown- x11 @@ -511,10 +511,10 @@ ./usr/X11R7/lib/modules/extensions/libextmod.so -unknown- xorg ./usr/X11R7/lib/modules/extensions/libextmod.so.0 -unknown- xorg ./usr/X11R7/lib/modules/extensions/libextmod_pic.a -unknown- xorg -./usr/X11R7/lib/modules/extensions/libglx.a -unknown- obsolete -./usr/X11R7/lib/modules/extensions/libglx.so -unknown- obsolete -./usr/X11R7/lib/modules/extensions/libglx.so.0 -unknown- obsolete -./usr/X11R7/lib/modules/extensions/libglx_pic.a -unknown- obsolete +./usr/X11R7/lib/modules/extensions/libglx.a -unknown- xorg +./usr/X11R7/lib/modules/extensions/libglx.so -unknown- xorg +./usr/X11R7/lib/modules/extensions/libglx.so.0 -unknown- xorg +./usr/X11R7/lib/modules/extensions/libglx_pic.a -unknown- xorg ./usr/X11R7/lib/modules/extensions/libmfb.a -unknown- obsolete ./usr/X11R7/lib/modules/extensions/libmfb.so -unknown- obsolete ./usr/X11R7/lib/modules/extensions/libmfb.so.0 -unknown- obsolete Index: src/distrib/sets/lists/xserver/md.macppc diff -u src/distrib/sets/lists/xserver/md.macppc:1.48 src/distrib/sets/lists/xserver/md.macppc:1.49 --- src/distrib/sets/lists/xserver/md.macppc:1.48 Tue Jun 16 00:26:11 2009 +++ src/distrib/sets/lists/xserver/md.macppc Thu Jun 18 05:57:34 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.macppc,v 1.48 2009/06/16 00:26:11 mrg Exp $ +# $NetBSD: md.macppc,v 1.49 2009/06/18 05:57:34 mrg Exp $ ./usr/X11R6/bin/X -unknown- x11 ./usr/X11R6/bin/XFree86 -unknown- x11 ./usr/X11R6/bin/Xmacppc -unknown- x11 @@ -395,10 +395,11 @@ ./usr/X11R7/lib/modules/extensions/libextmod.so.0 -unknown- xorg ./usr/X11R7/lib/modules/extensions/libextmod_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/extensions/libextmod_pic.a -unknown- xorg -./usr/X11R7/lib/modules/extensions/libglx.a -unknown- obsolete -./usr/X11R7/lib/modules/extensions/libglx.so -unknown- obsolete -./usr/X11R7/lib/modules/extensions/libglx.so.0 -unknown- obsolete -./usr/X11R7/lib/modules/extensions/libglx_pic.a -unknown- obsolete +./usr/X11R7/lib/modules/ex
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods
Module Name:src Committed By: mrg Date: Thu Jun 18 03:32:42 UTC 2009 Modified Files: src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods: Makefile Log Message: actually build glx extension. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.7 src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.8 --- src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.7 Fri Jun 12 01:59:05 2009 +++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile Thu Jun 18 03:32:41 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2009/06/12 01:59:05 mrg Exp $ +# $NetBSD: Makefile,v 1.8 2009/06/18 03:32:41 mrg Exp $ .include "../../../Makefile.serverlib" .include "../../../Makefile.servermod" @@ -25,6 +25,7 @@ dbe \ extmod \ fb \ + glx \ record \ shadow \ wfb \
CVS commit: src/external/mit/xorg/share/fonts
Module Name:src
Committed By: mrg
Date: Thu Jun 18 03:20:14 UTC 2009
Modified Files:
src/external/mit/xorg/share/fonts: Makefile
Log Message:
remove dead code
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/share/fonts/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/share/fonts/Makefile
diff -u src/external/mit/xorg/share/fonts/Makefile:1.3 src/external/mit/xorg/share/fonts/Makefile:1.4
--- src/external/mit/xorg/share/fonts/Makefile:1.3 Sat Oct 25 22:27:34 2008
+++ src/external/mit/xorg/share/fonts/Makefile Thu Jun 18 03:20:14 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/10/25 22:27:34 apb Exp $
+# $NetBSD: Makefile,v 1.4 2009/06/18 03:20:14 mrg Exp $
.include
@@ -8,17 +8,4 @@
.include "${NETBSDSRCDIR}/external/mit/xorg/tools/fc-cache/Makefile.fc-cache"
-.if 0
-afterinstall:
- ${_MKMSG_CREATE} ${DESTDIR}${X11FONTDIR}/fonts.cache-1
- ${FCCACHE} -fv ${DESTDIR}${X11FONTDIR}
-.if ${MKUNPRIVED} != "no"
- cd ${DESTDIR} \
- && find ./${X11FONTDIR} -name fonts.cache-1 \
- | ${TOOL_SED} -e \
- 's/$$/ type=file mode=0444 uname=${BINOWN} gname=${BINGRP}/' \
- | ${METALOG.add}
-.endif
-.endif
-
.include
CVS commit: xsrc/external/mit/xf86-video-ag10e/dist/src
Module Name:xsrc Committed By: mrg Date: Thu Jun 18 02:47:23 UTC 2009 Modified Files: xsrc/external/mit/xf86-video-ag10e/dist/src: ag10e.h ag10e_driver.c Log Message: xf86_ansic.h is no more. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e.h \ xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e.h diff -u xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e.h:1.1 xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e.h:1.2 --- xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e.h:1.1 Tue Nov 11 03:36:25 2008 +++ xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e.h Thu Jun 18 02:47:23 2009 @@ -27,7 +27,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86RamDac.h" #include "Xmd.h" #include "gcstruct.h" Index: xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c diff -u xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c:1.1 xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c:1.2 --- xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c:1.1 Tue Nov 11 03:36:25 2008 +++ xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c Thu Jun 18 02:47:23 2009 @@ -37,7 +37,6 @@ #include #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Version.h" #include "mipointer.h" #include "mibstore.h"
CVS commit: src/external/mit/xorg/lib
Module Name:src
Committed By: mrg
Date: Thu Jun 18 02:46:58 UTC 2009
Modified Files:
src/external/mit/xorg/lib: Makefile
Log Message:
build pciaccess everywhere for now
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/mit/xorg/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.15 src/external/mit/xorg/lib/Makefile:1.16
--- src/external/mit/xorg/lib/Makefile:1.15 Thu Jun 11 05:15:06 2009
+++ src/external/mit/xorg/lib/Makefile Thu Jun 18 02:46:57 2009
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.15 2009/06/11 05:15:06 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2009/06/18 02:46:57 mrg Exp $
# build libraries for xorg
SUBDIR= expat libfontenc freetype libFS libICE libOSMesa \
- libXau libXdmcp libdrm
+ libXau libXdmcp libdrm libpciaccess
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-SUBDIR+=libdrm_intel libpciaccess
+SUBDIR+=libdrm_intel
.endif
SUBDIR+=pixman xkeyboard-config \
.WAIT \
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86
Module Name:src
Committed By: mrg
Date: Thu Jun 18 02:46:10 UTC 2009
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86: Makefile
Log Message:
only built int10 on x86. from macallan.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.27 src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.28
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.27 Fri Jun 12 01:59:04 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile Thu Jun 18 02:46:10 2009
@@ -1,10 +1,14 @@
-# $NetBSD: Makefile,v 1.27 2009/06/12 01:59:04 mrg Exp $
+# $NetBSD: Makefile,v 1.28 2009/06/18 02:46:10 mrg Exp $
-SUBDIR= common init ddc dixmods doc dri dri2 dummy i2c int10 loader \
+SUBDIR= common init ddc dixmods doc dri dri2 dummy i2c loader \
xf86modes exa \
xorgos ramdac shadowfb vbe vgahw \
x86emu xaa xf86config xf8_16bpp
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+SUBDIR+= int10
+.endif
+
SUBDIR+= .WAIT utils
.include
CVS commit: src/external/mit/xorg/server/xorg-server/dix
Module Name:src
Committed By: mrg
Date: Thu Jun 18 02:45:46 UTC 2009
Modified Files:
src/external/mit/xorg/server/xorg-server/dix: Makefile.common
Log Message:
remove non-existant subdirs from the default path list.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/dix/Makefile.common
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/dix/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server/dix/Makefile.common:1.1 src/external/mit/xorg/server/xorg-server/dix/Makefile.common:1.2
--- src/external/mit/xorg/server/xorg-server/dix/Makefile.common:1.1 Tue Oct 14 23:37:19 2008
+++ src/external/mit/xorg/server/xorg-server/dix/Makefile.common Thu Jun 18 02:45:46 2009
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.common,v 1.1 2008/10/14 23:37:19 cube Exp $
+# $NetBSD: Makefile.common,v 1.2 2009/06/18 02:45:46 mrg Exp $
-X11DEFAULTFONTPATH= ${X11FONTDIR}/misc/ ${X11FONTDIR}/TTF/ \
- ${X11FONTDIR}/Speedo/ ${X11FONTDIR}/Type1/ \
- ${X11FONTDIR}/CID/ ${X11FONTDIR}/75dpi/ \
+X11DEFAULTFONTPATH= ${X11FONTDIR}/misc/ \
+ ${X11FONTDIR}/TTF/ \
+ ${X11FONTDIR}/Type1/ \
+ ${X11FONTDIR}/75dpi/ \
${X11FONTDIR}/100dpi/
CVS commit: src/external/mit/xorg/bin/xfs
Module Name:src
Committed By: mrg
Date: Thu Jun 18 02:45:30 UTC 2009
Modified Files:
src/external/mit/xorg/bin/xfs: Makefile
Log Message:
remove non-existant subdirs from the default path list.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xfs/Makefile
diff -u src/external/mit/xorg/bin/xfs/Makefile:1.4 src/external/mit/xorg/bin/xfs/Makefile:1.5
--- src/external/mit/xorg/bin/xfs/Makefile:1.4 Wed Jun 10 08:30:55 2009
+++ src/external/mit/xorg/bin/xfs/Makefile Thu Jun 18 02:45:30 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/06/10 08:30:55 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2009/06/18 02:45:30 mrg Exp $
.include
@@ -47,7 +47,7 @@
BUILDSYMLINKS= config.cpp fsconfig.cpp
CPPSCRIPTS= fsconfig
-CPPSCRIPTFLAGS= -DDEFAULTFONTPATH=${X11FONTDIR}/misc/,${X11FONTDIR}/Speedo/,${X11FONTDIR}/Type1/,${X11FONTDIR}/CID/,${X11FONTDIR}/75dpi/,${X11FONTDIR}/100dpi/ \
+CPPSCRIPTFLAGS= -DDEFAULTFONTPATH=${X11FONTDIR}/misc/,${X11FONTDIR}/Type1/,${X11FONTDIR}/75dpi/,${X11FONTDIR}/100dpi/ \
-DFSERRORS=/var/log/xfs.log
CONFIGFILES= fsconfig
CVS commit: src/usr.bin/audio/common
Module Name:src
Committed By: mrg
Date: Thu Jun 18 02:37:27 UTC 2009
Modified Files:
src/usr.bin/audio/common: libaudio.h wav.c
Log Message:
- add extended WAVE header support
- attempt to play a bunch more WAV files
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/audio/common/libaudio.h
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/audio/common/wav.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/audio/common/libaudio.h
diff -u src/usr.bin/audio/common/libaudio.h:1.15 src/usr.bin/audio/common/libaudio.h:1.16
--- src/usr.bin/audio/common/libaudio.h:1.15 Thu May 29 14:51:27 2008
+++ src/usr.bin/audio/common/libaudio.h Thu Jun 18 02:37:27 2009
@@ -1,7 +1,7 @@
-/* $NetBSD: libaudio.h,v 1.15 2008/05/29 14:51:27 mrg Exp $ */
+/* $NetBSD: libaudio.h,v 1.16 2009/06/18 02:37:27 mrg Exp $ */
/*
- * Copyright (c) 1999 Matthew R. Green
+ * Copyright (c) 1999, 2009 Matthew R. Green
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -107,18 +107,30 @@
#define WAVAUDIO_FILE_MAGIC_FMT ((u_int32_t)0x666d7420)
#define WAVAUDIO_FILE_MAGIC_DATA ((u_int32_t)0x64617461)
-/* purloined from public Microsoft RIFF docs via sox */
+/* purloined from public Microsoft RIFF docs via sox or mplayer */
#define WAVE_FORMAT_UNKNOWN (0x)
#define WAVE_FORMAT_PCM (0x0001)
#define WAVE_FORMAT_ADPCM (0x0002)
#define WAVE_FORMAT_ALAW (0x0006)
#define WAVE_FORMAT_MULAW (0x0007)
#define WAVE_FORMAT_OKI_ADPCM (0x0010)
+#define WAVE_FORMAT_IMA_ADPCM (0x0011)
#define WAVE_FORMAT_DIGISTD (0x0015)
#define WAVE_FORMAT_DIGIFIX (0x0016)
+#define WAVE_FORMAT_DOLBY_AC2 (0x0030)
+#define WAVE_FORMAT_GSM610 (0x0031)
+#define WAVE_FORMAT_ROCKWELL_ADPCM (0x003b)
+#define WAVE_FORMAT_ROCKWELL_DIGITALK (0x003c)
+#define WAVE_FORMAT_G721_ADPCM (0x0040)
+#define WAVE_FORMAT_G728_CELP (0x0041)
+#define WAVE_FORMAT_MPEG (0x0050)
+#define WAVE_FORMAT_MPEGLAYER3 (0x0055)
+#define WAVE_FORMAT_G726_ADPCM (0x0064)
+#define WAVE_FORMAT_G722_ADPCM (0x0065)
#define IBM_FORMAT_MULAW (0x0101)
#define IBM_FORMAT_ALAW (0x0102)
#define IBM_FORMAT_ADPCM (0x0103)
+#define WAVE_FORMAT_EXTENSIBLE (0xfffe)
const char *wav_enc_from_val (int);
@@ -136,6 +148,14 @@
u_int16_t bits_per_sample;
} __packed wav_audioheaderfmt;
+typedef struct {
+ u_int16_t len;
+ u_int16_t valid_bits;
+ u_int32_t speaker_pos_mask;
+ u_int16_t sub_tag;
+ u_int8_t dummy[14];
+} __packed wav_audiohdrextensible;
+
/* returns size of header, or -ve for failure */
ssize_t audio_wav_parse_hdr (void *, size_t, u_int *, u_int *, u_int *, u_int *, size_t *);
Index: src/usr.bin/audio/common/wav.c
diff -u src/usr.bin/audio/common/wav.c:1.8 src/usr.bin/audio/common/wav.c:1.9
--- src/usr.bin/audio/common/wav.c:1.8 Thu May 29 14:51:27 2008
+++ src/usr.bin/audio/common/wav.c Thu Jun 18 02:37:27 2009
@@ -1,7 +1,7 @@
-/* $NetBSD: wav.c,v 1.8 2008/05/29 14:51:27 mrg Exp $ */
+/* $NetBSD: wav.c,v 1.9 2009/06/18 02:37:27 mrg Exp $ */
/*
- * Copyright (c) 2002 Matthew R. Green
+ * Copyright (c) 2002, 2009 Matthew R. Green
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -33,7 +33,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: wav.c,v 1.8 2008/05/29 14:51:27 mrg Exp $");
+__RCSID("$NetBSD: wav.c,v 1.9 2009/06/18 02:37:27 mrg Exp $");
#endif
@@ -47,6 +47,7 @@
#include
#include
#include
+#include
#include "libaudio.h"
@@ -76,6 +77,8 @@
return (wavencs[i].wname);
}
+extern int verbose;
+
/*
* sample header is:
*
@@ -101,8 +104,10 @@
char *where = hdr, *owhere;
wav_audioheaderpart part;
wav_audioheaderfmt fmt;
+ wav_audiohdrextensible ext;
char *end = (((char *)hdr) + sz);
u_int newenc, newprec;
+ u_int16_t fmttag;
static const char
strfmt[4] = "fmt ",
strRIFF[4] = "RIFF",
@@ -131,12 +136,23 @@
memcpy(&fmt, (owhere + 8), sizeof fmt);
- switch (getle16(fmt.tag)) {
+ fmttag = getle16(fmt.tag);
+ if (verbose)
+ printf("WAVE format tag: %x\n", fmttag);
+
+ if (fmttag == WAVE_FORMAT_EXTENSIBLE) {
+ if ((uintptr_t)(where - owhere) < sizeof(fmt) + sizeof(ext))
+ return (AUDIO_ESHORTHDR);
+ memcpy(&ext, owhere + sizeof fmt, sizeof ext);
+ if (getle16(ext.len) < sizeof(ext) - sizeof(ext.len))
+ return (AUDIO_ESHORTHDR);
+ fmttag = ext.sub_tag;
+ if (verbose)
+ printf("WAVE extensible sub tag: %x\n", fmttag);
+ }
+
+ switch (fmttag) {
case WAVE_FORMAT_UNKNOWN:
- case WAVE_FORMAT_ADPCM:
- case WAVE_FORMAT_OKI_ADPCM:
- case WAVE_FORMAT_DIGISTD:
- case WAVE_FORMAT_DIGIFIX:
case IBM_FORMAT_MULAW:
case IBM_FORMAT_ALAW:
case IBM_FORMAT_ADPCM:
@@ -144,6 +160,11 @@
return (AUDIO_EWAVUNSUPP);
case WAVE_FORMAT_PCM:
+ case WAVE_FORMAT_ADPCM:
+ case WAVE_FORMAT_OKI_ADPCM:
+ case WAVE_FORMAT_IMA_ADPCM:
+ case WAVE_FORMAT_DIGIFIX:
+ case WAVE_FORMAT_DIGISTD:
CVS commit: src/tools/compat
Module Name:src Committed By: christos Date: Wed Jun 17 23:34:45 UTC 2009 Modified Files: src/tools/compat: Makefile Log Message: add fpurge To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/tools/compat/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/compat/Makefile diff -u src/tools/compat/Makefile:1.52 src/tools/compat/Makefile:1.53 --- src/tools/compat/Makefile:1.52 Sat Oct 18 12:25:04 2008 +++ src/tools/compat/Makefile Wed Jun 17 19:34:45 2009 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.52 2008/10/18 16:25:04 tsutsui Exp $ +# $NetBSD: Makefile,v 1.53 2009/06/17 23:34:45 christos Exp $ HOSTLIB= nbcompat SRCS= atoll.c basename.c dirname.c fgetln.c flock.c fparseln.c \ - getmode.c getopt_long.c gettemp.c heapsort.c \ + fpurge.c getmode.c getopt_long.c gettemp.c heapsort.c \ issetugid.c lchflags.c lchmod.c lchown.c libyywrap.c \ md2.c md2hl.c md4c.c md4hl.c md5c.c md5hl.c mkdtemp.c \ mkstemp.c pread.c putc_unlocked.c pwcache.c pwrite.c \
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Wed Jun 17 21:34:46 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.1 Log Message: ticket 807 To generate a diff of this commit: cvs rdiff -u -r1.1.2.23 -r1.1.2.24 src/doc/CHANGES-5.0.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.0.1 diff -u src/doc/CHANGES-5.0.1:1.1.2.23 src/doc/CHANGES-5.0.1:1.1.2.24 --- src/doc/CHANGES-5.0.1:1.1.2.23 Wed Jun 17 20:49:39 2009 +++ src/doc/CHANGES-5.0.1 Wed Jun 17 21:34:45 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.1,v 1.1.2.23 2009/06/17 20:49:39 bouyer Exp $ +# $NetBSD: CHANGES-5.0.1,v 1.1.2.24 2009/06/17 21:34:45 bouyer Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.0.1 release: @@ -436,3 +436,10 @@ Updates to f_flag need to be made with atomics. [rmind, ticket #811] +sys/kern/tty_pty.c1.117 + + Writes on the controlling tty were not being awoken from blocks, + use the correct condvar to make this happen. + this fixes PR/41566 + [plunky, ticket #807] +
CVS commit: [netbsd-5-0] src/sys/kern
Module Name:src
Committed By: bouyer
Date: Wed Jun 17 21:34:04 UTC 2009
Modified Files:
src/sys/kern [netbsd-5-0]: tty_pty.c
Log Message:
Pull up following revision(s) (requested by plunky in ticket #807):
sys/kern/tty_pty.c: revision 1.117
Writes on the controlling tty were not being awoken from blocks,
use the correct condvar to make this happen.
this fixes PR/41566
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.112.6.1 src/sys/kern/tty_pty.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/tty_pty.c
diff -u src/sys/kern/tty_pty.c:1.112 src/sys/kern/tty_pty.c:1.112.6.1
--- src/sys/kern/tty_pty.c:1.112 Wed Sep 3 16:47:34 2008
+++ src/sys/kern/tty_pty.c Wed Jun 17 21:34:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_pty.c,v 1.112 2008/09/03 16:47:34 drochner Exp $ */
+/* $NetBSD: tty_pty.c,v 1.112.6.1 2009/06/17 21:34:04 bouyer Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tty_pty.c,v 1.112 2008/09/03 16:47:34 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_pty.c,v 1.112.6.1 2009/06/17 21:34:04 bouyer Exp $");
#include "opt_compat_sunos.h"
#include "opt_ptm.h"
@@ -779,7 +779,7 @@
error = cnt == 0 ? EWOULDBLOCK : 0;
goto out;
}
- error = cv_wait_sig(&tp->t_rawcv, &tty_lock);
+ error = cv_wait_sig(&tp->t_rawcvf, &tty_lock);
mutex_spin_exit(&tty_lock);
if (error) {
/* adjust for data copied in but not written */
CVS commit: src/sys
Module Name:src
Committed By: dyoung
Date: Wed Jun 17 21:04:25 UTC 2009
Modified Files:
src/sys/kern: kern_module.c subr_kobj.c
src/sys/sys: kobj.h
Log Message:
Make kobj_stat() return ENOSYS instead of panicking ("not modular")
on non-MODULAR kernels. Make a few kobj_stat() callers check for
a non-zero return code and deal gracefully.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/kern/kern_module.c
cvs rdiff -u -r1.38 -r1.39 src/sys/kern/subr_kobj.c
cvs rdiff -u -r1.11 -r1.12 src/sys/sys/kobj.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/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.48 src/sys/kern/kern_module.c:1.49
--- src/sys/kern/kern_module.c:1.48 Tue Jun 9 20:35:02 2009
+++ src/sys/kern/kern_module.c Wed Jun 17 21:04:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_module.c,v 1.48 2009/06/09 20:35:02 jnemeth Exp $ */
+/* $NetBSD: kern_module.c,v 1.49 2009/06/17 21:04:25 dyoung Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.48 2009/06/09 20:35:02 jnemeth Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.49 2009/06/17 21:04:25 dyoung Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -1072,7 +1072,8 @@
if (mod->mod_kobj == NULL) {
continue;
}
- kobj_stat(mod->mod_kobj, &maddr, &msize);
+ if (kobj_stat(mod->mod_kobj, &maddr, &msize) != 0)
+ continue;
if (addr < maddr || addr >= maddr + msize) {
continue;
}
@@ -1112,12 +1113,11 @@
src = "unknown";
break;
}
- if (mod->mod_kobj != NULL) {
- kobj_stat(mod->mod_kobj, &maddr, &msize);
- } else {
+ if (mod->mod_kobj == NULL) {
maddr = 0;
msize = 0;
- }
+ } else if (kobj_stat(mod->mod_kobj, &maddr, &msize) != 0)
+ continue;
(*pr)("%16s %16lx %8ld %8s\n", mod->mod_info->mi_name,
(long)maddr, (long)msize, src);
}
Index: src/sys/kern/subr_kobj.c
diff -u src/sys/kern/subr_kobj.c:1.38 src/sys/kern/subr_kobj.c:1.39
--- src/sys/kern/subr_kobj.c:1.38 Tue May 26 08:34:23 2009
+++ src/sys/kern/subr_kobj.c Wed Jun 17 21:04:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_kobj.c,v 1.38 2009/05/26 08:34:23 jnemeth Exp $ */
+/* $NetBSD: subr_kobj.c,v 1.39 2009/06/17 21:04:25 dyoung Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.38 2009/05/26 08:34:23 jnemeth Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.39 2009/06/17 21:04:25 dyoung Exp $");
#include "opt_modular.h"
@@ -622,7 +622,7 @@
*
* Return size and load address of an object.
*/
-void
+int
kobj_stat(kobj_t ko, vaddr_t *address, size_t *size)
{
@@ -632,6 +632,7 @@
if (size != NULL) {
*size = ko->ko_size;
}
+ return 0;
}
/*
@@ -1126,11 +1127,11 @@
panic("not modular");
}
-void
+int
kobj_stat(kobj_t ko, vaddr_t *base, size_t *size)
{
- panic("not modular");
+ return ENOSYS;
}
int
Index: src/sys/sys/kobj.h
diff -u src/sys/sys/kobj.h:1.11 src/sys/sys/kobj.h:1.12
--- src/sys/sys/kobj.h:1.11 Tue May 26 08:34:22 2009
+++ src/sys/sys/kobj.h Wed Jun 17 21:04:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kobj.h,v 1.11 2009/05/26 08:34:22 jnemeth Exp $ */
+/* $NetBSD: kobj.h,v 1.12 2009/06/17 21:04:25 dyoung Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
int kobj_load_mem(kobj_t *, void *, ssize_t);
int kobj_affix(kobj_t, const char *);
void kobj_unload(kobj_t);
-void kobj_stat(kobj_t, vaddr_t *, size_t *);
+int kobj_stat(kobj_t, vaddr_t *, size_t *);
int kobj_find_section(kobj_t, const char *, void **, size_t *);
/* MI-MD interface. */
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: bouyer Date: Wed Jun 17 20:56:24 UTC 2009 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: ticket 1324 To generate a diff of this commit: cvs rdiff -u -r1.1.2.155 -r1.1.2.156 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.155 src/doc/CHANGES-4.1:1.1.2.156 --- src/doc/CHANGES-4.1:1.1.2.155 Wed Jun 17 20:17:24 2009 +++ src/doc/CHANGES-4.1 Wed Jun 17 20:56:23 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.155 2009/06/17 20:17:24 jdc Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.156 2009/06/17 20:56:23 bouyer Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -3454,3 +3454,9 @@ problem, and checked that root can still change the root password.) [tonnerre, ticket #1326] +usr.bin/window/ttgeneric.c 1.11 + + PR/41581: Der mouse: window SEGV with certain terminals. does strcmp + first and then checks for null pointer for underline and bold. + [christos, ticket #1324] +
CVS commit: [netbsd-4] src/usr.bin/window
Module Name:src
Committed By: bouyer
Date: Wed Jun 17 20:55:59 UTC 2009
Modified Files:
src/usr.bin/window [netbsd-4]: ttgeneric.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1324):
usr.bin/window/ttgeneric.c: revision 1.11
PR/41581: Der mouse: window SEGV with certain terminals. does strcmp first
and then checks for null pointer for underline and bold.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.18.1 src/usr.bin/window/ttgeneric.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/window/ttgeneric.c
diff -u src/usr.bin/window/ttgeneric.c:1.9 src/usr.bin/window/ttgeneric.c:1.9.18.1
--- src/usr.bin/window/ttgeneric.c:1.9 Thu Aug 7 11:17:30 2003
+++ src/usr.bin/window/ttgeneric.c Wed Jun 17 20:55:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ttgeneric.c,v 1.9 2003/08/07 11:17:30 agc Exp $ */
+/* $NetBSD: ttgeneric.c,v 1.9.18.1 2009/06/17 20:55:58 bouyer Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)ttgeneric.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: ttgeneric.c,v 1.9 2003/08/07 11:17:30 agc Exp $");
+__RCSID("$NetBSD: ttgeneric.c,v 1.9.18.1 2009/06/17 20:55:58 bouyer Exp $");
#endif
#endif /* not lint */
@@ -169,8 +169,8 @@
} else
if (gen_SE) {
ttxputs(gen_SE);
-if (!strcmp(gen_SE->ts_str, gen_UE->ts_str) &&
-gen_UE && gen_US && new & WWM_UL)
+if (gen_UE && gen_US && new & WWM_UL &&
+!strcmp(gen_SE->ts_str, gen_UE->ts_str))
ttxputs(gen_US);
}
}
@@ -181,8 +181,8 @@
} else
if (gen_UE) {
ttxputs(gen_UE);
-if (!strcmp(gen_UE->ts_str, gen_SE->ts_str) &&
-gen_SE && gen_SO && new & WWM_REV)
+if (gen_SE && gen_SO && new & WWM_REV &&
+!strcmp(gen_UE->ts_str, gen_SE->ts_str))
ttxputs(gen_SO);
}
}
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Wed Jun 17 20:49:39 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.1 Log Message: ticket 811 To generate a diff of this commit: cvs rdiff -u -r1.1.2.22 -r1.1.2.23 src/doc/CHANGES-5.0.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.0.1 diff -u src/doc/CHANGES-5.0.1:1.1.2.22 src/doc/CHANGES-5.0.1:1.1.2.23 --- src/doc/CHANGES-5.0.1:1.1.2.22 Wed Jun 17 20:44:32 2009 +++ src/doc/CHANGES-5.0.1 Wed Jun 17 20:49:39 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.1,v 1.1.2.22 2009/06/17 20:44:32 bouyer Exp $ +# $NetBSD: CHANGES-5.0.1,v 1.1.2.23 2009/06/17 20:49:39 bouyer Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.0.1 release: @@ -431,3 +431,8 @@ may change the root password. [tonnerre, ticket #817] +sys/kern/sys_generic.c1.122 via patch + + Updates to f_flag need to be made with atomics. + [rmind, ticket #811] +
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: bouyer Date: Wed Jun 17 20:49:26 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: ticket 811 To generate a diff of this commit: cvs rdiff -u -r1.1.2.31 -r1.1.2.32 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.31 src/doc/CHANGES-5.1:1.1.2.32 --- src/doc/CHANGES-5.1:1.1.2.31 Wed Jun 17 20:37:27 2009 +++ src/doc/CHANGES-5.1 Wed Jun 17 20:49:26 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.31 2009/06/17 20:37:27 bouyer Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.32 2009/06/17 20:49:26 bouyer Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -1054,3 +1054,8 @@ may change the root password. [tonnerre, ticket #817] +sys/kern/sys_generic.c1.122 via patch + + Updates to f_flag need to be made with atomics. + [rmind, ticket #811] +
CVS commit: [netbsd-5-0] src/sys/kern
Module Name:src
Committed By: bouyer
Date: Wed Jun 17 20:48:57 UTC 2009
Modified Files:
src/sys/kern [netbsd-5-0]: sys_generic.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #811):
sys/kern/sys_generic.c: revision 1.122 via patch
Updates to f_flag need to be made with atomics.
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.120.12.1 src/sys/kern/sys_generic.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/sys_generic.c
diff -u src/sys/kern/sys_generic.c:1.120 src/sys/kern/sys_generic.c:1.120.12.1
--- src/sys/kern/sys_generic.c:1.120 Wed Jul 2 16:45:20 2008
+++ src/sys/kern/sys_generic.c Wed Jun 17 20:48:57 2009
@@ -1,7 +1,7 @@
-/* $NetBSD: sys_generic.c,v 1.120 2008/07/02 16:45:20 matt Exp $ */
+/* $NetBSD: sys_generic.c,v 1.120.12.1 2009/06/17 20:48:57 bouyer Exp $ */
/*-
- * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
+ * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sys_generic.c,v 1.120 2008/07/02 16:45:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_generic.c,v 1.120.12.1 2009/06/17 20:48:57 bouyer Exp $");
#include
#include
@@ -89,6 +89,7 @@
#include
#include
#include
+#include
#include
@@ -593,22 +594,20 @@
switch (com) {
case FIONBIO:
- FILE_LOCK(fp);
+ /* XXX Code block is not atomic */
if (*(int *)data != 0)
- fp->f_flag |= FNONBLOCK;
+ atomic_or_uint(&fp->f_flag, FNONBLOCK);
else
- fp->f_flag &= ~FNONBLOCK;
- FILE_UNLOCK(fp);
+ atomic_and_uint(&fp->f_flag, ~FNONBLOCK);
error = (*fp->f_ops->fo_ioctl)(fp, FIONBIO, data);
break;
case FIOASYNC:
- FILE_LOCK(fp);
+ /* XXX Code block is not atomic */
if (*(int *)data != 0)
- fp->f_flag |= FASYNC;
+ atomic_or_uint(&fp->f_flag, FASYNC);
else
- fp->f_flag &= ~FASYNC;
- FILE_UNLOCK(fp);
+ atomic_and_uint(&fp->f_flag, ~FASYNC);
error = (*fp->f_ops->fo_ioctl)(fp, FIOASYNC, data);
break;
CVS commit: [netbsd-5] src/sys/kern
Module Name:src
Committed By: bouyer
Date: Wed Jun 17 20:49:00 UTC 2009
Modified Files:
src/sys/kern [netbsd-5]: sys_generic.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #811):
sys/kern/sys_generic.c: revision 1.122 via patch
Updates to f_flag need to be made with atomics.
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.120.6.1 src/sys/kern/sys_generic.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/sys_generic.c
diff -u src/sys/kern/sys_generic.c:1.120 src/sys/kern/sys_generic.c:1.120.6.1
--- src/sys/kern/sys_generic.c:1.120 Wed Jul 2 16:45:20 2008
+++ src/sys/kern/sys_generic.c Wed Jun 17 20:49:00 2009
@@ -1,7 +1,7 @@
-/* $NetBSD: sys_generic.c,v 1.120 2008/07/02 16:45:20 matt Exp $ */
+/* $NetBSD: sys_generic.c,v 1.120.6.1 2009/06/17 20:49:00 bouyer Exp $ */
/*-
- * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
+ * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sys_generic.c,v 1.120 2008/07/02 16:45:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_generic.c,v 1.120.6.1 2009/06/17 20:49:00 bouyer Exp $");
#include
#include
@@ -89,6 +89,7 @@
#include
#include
#include
+#include
#include
@@ -593,22 +594,20 @@
switch (com) {
case FIONBIO:
- FILE_LOCK(fp);
+ /* XXX Code block is not atomic */
if (*(int *)data != 0)
- fp->f_flag |= FNONBLOCK;
+ atomic_or_uint(&fp->f_flag, FNONBLOCK);
else
- fp->f_flag &= ~FNONBLOCK;
- FILE_UNLOCK(fp);
+ atomic_and_uint(&fp->f_flag, ~FNONBLOCK);
error = (*fp->f_ops->fo_ioctl)(fp, FIONBIO, data);
break;
case FIOASYNC:
- FILE_LOCK(fp);
+ /* XXX Code block is not atomic */
if (*(int *)data != 0)
- fp->f_flag |= FASYNC;
+ atomic_or_uint(&fp->f_flag, FASYNC);
else
- fp->f_flag &= ~FASYNC;
- FILE_UNLOCK(fp);
+ atomic_and_uint(&fp->f_flag, ~FASYNC);
error = (*fp->f_ops->fo_ioctl)(fp, FIOASYNC, data);
break;
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Wed Jun 17 20:44:32 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.1 Log Message: tickets 805, 806, 809, 812, 814, 817 To generate a diff of this commit: cvs rdiff -u -r1.1.2.21 -r1.1.2.22 src/doc/CHANGES-5.0.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.0.1 diff -u src/doc/CHANGES-5.0.1:1.1.2.21 src/doc/CHANGES-5.0.1:1.1.2.22 --- src/doc/CHANGES-5.0.1:1.1.2.21 Wed Jun 10 19:20:28 2009 +++ src/doc/CHANGES-5.0.1 Wed Jun 17 20:44:32 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.1,v 1.1.2.21 2009/06/10 19:20:28 bouyer Exp $ +# $NetBSD: CHANGES-5.0.1,v 1.1.2.22 2009/06/17 20:44:32 bouyer Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.0.1 release: @@ -394,3 +394,40 @@ or ENAMETOOLONG. [uwe, ticket #802] +distrib/sets/lists/xbase/mi 1.76 +external/mit/xorg/bin/xvidtune/Makefile 1.2 + + fix xsrc/41577: install the Xvidtune app-defaults file, after the + necessary preprocessing and sed processing it needs. + [mrg, ticket #805] + +sys/compat/linux/common/linux_socket.c 1.100 + + In sendmsg(2), do copy the msghdr structure before trying to use it. + [njoly, ticket #806] + +sys/kern/subr_kobj.c1.35 + + Fix a crash observed when trying to load a corrupted ELF kernel module. + [rmind, ticket #809] + +sys/netinet/tcp_usrreq.c 1.155 + + sysctl_inpcblist: fix a lock leak in error path + [rmind, ticket #812] + +sys/dev/pci/ehci_pci.c1.45 + + Apply hw workaround required for all SB600 revisions and SB700 + revisions A12 and A13 to avoid USB subsystem hang symptom. + The USB subsystem hang symptom is observed when the system has + multiple USB devices connected to it or one USB device is often + re-connected. + [cegger, ticket #814] + +lib/libpam/modules/pam_unix/pam_unix.c 1.13 + + Restore the good old UNIX behavior of root password changing: only root + may change the root password. + [tonnerre, ticket #817] +
CVS commit: [netbsd-5] src/doc
Module Name:src
Committed By: bouyer
Date: Wed Jun 17 20:37:28 UTC 2009
Modified Files:
src/doc [netbsd-5]: CHANGES-5.1
Log Message:
tickets 805-809, 812-814, 817
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.30 -r1.1.2.31 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.30 src/doc/CHANGES-5.1:1.1.2.31
--- src/doc/CHANGES-5.1:1.1.2.30 Tue Jun 16 02:25:41 2009
+++ src/doc/CHANGES-5.1 Wed Jun 17 20:37:27 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.30 2009/06/16 02:25:41 snj Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.31 2009/06/17 20:37:27 bouyer Exp $
A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
release:
@@ -997,3 +997,60 @@
- Family 17, model 3
[rmind, ticket #789]
+distrib/sets/lists/xbase/mi 1.76
+external/mit/xorg/bin/xvidtune/Makefile 1.2
+
+ fix xsrc/41577: install the Xvidtune app-defaults file, after the
+ necessary preprocessing and sed processing it needs.
+ [mrg, ticket #805]
+
+sys/compat/linux/common/linux_socket.c 1.100
+
+ In sendmsg(2), do copy the msghdr structure before trying to use it.
+ [njoly, ticket #806]
+
+sys/kern/tty_pty.c1.117
+
+ Writes on the controlling tty were not being awoken from blocks,
+ use the correct condvar to make this happen.
+ this fixes PR/41566
+ [plunky, ticket #807]
+
+external/bsd/am-utils/lib/libamu/mkconf 1.2
+
+ PR/41580: Hauke Fath: am-utils uses "netbsd${OSVER}" selector, still.
+ Changed to "netbsd"
+ [christos, ticket #808]
+
+sys/kern/subr_kobj.c1.35
+
+ Fix a crash observed when trying to load a corrupted ELF kernel module.
+ [rmind, ticket #809]
+
+sys/netinet/tcp_usrreq.c 1.155
+
+ sysctl_inpcblist: fix a lock leak in error path
+ [rmind, ticket #812]
+
+usr.bin/window/ttgeneric.c 1.11
+
+ PR/41581: Der mouse: window SEGV with certain terminals.
+ does strcmp first and then checks for null pointer for
+ underline and bold.
+ [christos, ticket #813]
+
+sys/dev/pci/ehci_pci.c1.45
+
+ Apply hw workaround required for all SB600 revisions and SB700
+ revisions A12 and A13 to avoid USB subsystem hang symptom.
+ The USB subsystem hang symptom is observed when the system has
+ multiple USB devices connected to it or one USB device is often
+ re-connected.
+ [cegger, ticket #814]
+
+lib/libpam/modules/pam_unix/pam_unix.c 1.13
+
+ Restore the good old UNIX behavior of root password changing: only root
+ may change the root password.
+ [tonnerre, ticket #817]
+
CVS commit: [netbsd-5-0] src/lib/libpam/modules/pam_unix
Module Name:src
Committed By: bouyer
Date: Wed Jun 17 20:35:12 UTC 2009
Modified Files:
src/lib/libpam/modules/pam_unix [netbsd-5-0]: pam_unix.c
Log Message:
Pull up following revision(s) (requested by tonnerre in ticket #817):
lib/libpam/modules/pam_unix/pam_unix.c: revision 1.13
Restore the good old UNIX behavior of root password changing: only root
may change the root password.
(Checked that everybody else's password can be changed without any problem,
and checked that root can still change the root password.)
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.28.1 src/lib/libpam/modules/pam_unix/pam_unix.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/libpam/modules/pam_unix/pam_unix.c
diff -u src/lib/libpam/modules/pam_unix/pam_unix.c:1.11 src/lib/libpam/modules/pam_unix/pam_unix.c:1.11.28.1
--- src/lib/libpam/modules/pam_unix/pam_unix.c:1.11 Tue May 30 19:48:07 2006
+++ src/lib/libpam/modules/pam_unix/pam_unix.c Wed Jun 17 20:35:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pam_unix.c,v 1.11 2006/05/30 19:48:07 jnemeth Exp $ */
+/* $NetBSD: pam_unix.c,v 1.11.28.1 2009/06/17 20:35:12 bouyer Exp $ */
/*-
* Copyright 1998 Juniper Networks, Inc.
@@ -40,7 +40,7 @@
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_unix/pam_unix.c,v 1.49 2004/02/10 10:13:21 des Exp $");
#else
-__RCSID("$NetBSD: pam_unix.c,v 1.11 2006/05/30 19:48:07 jnemeth Exp $");
+__RCSID("$NetBSD: pam_unix.c,v 1.11.28.1 2009/06/17 20:35:12 bouyer Exp $");
#endif
@@ -508,6 +508,14 @@
/* Root doesn't need the old password. */
return (pam_set_item(pamh, PAM_OLDAUTHTOK, ""));
}
+ /*
+ * Apparently we're not root, so let's forbid editing
+ * root.
+ * XXX Check for some flag to indicate if this
+ * XXX is the desired behavior.
+ */
+ if (pwd->pw_uid == 0)
+return (PAM_PERM_DENIED);
}
if (pwd->pw_passwd[0] == '\0') {
CVS commit: [netbsd-5] src/lib/libpam/modules/pam_unix
Module Name:src
Committed By: bouyer
Date: Wed Jun 17 20:35:08 UTC 2009
Modified Files:
src/lib/libpam/modules/pam_unix [netbsd-5]: pam_unix.c
Log Message:
Pull up following revision(s) (requested by tonnerre in ticket #817):
lib/libpam/modules/pam_unix/pam_unix.c: revision 1.13
Restore the good old UNIX behavior of root password changing: only root
may change the root password.
(Checked that everybody else's password can be changed without any problem,
and checked that root can still change the root password.)
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.26.1 src/lib/libpam/modules/pam_unix/pam_unix.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/libpam/modules/pam_unix/pam_unix.c
diff -u src/lib/libpam/modules/pam_unix/pam_unix.c:1.11 src/lib/libpam/modules/pam_unix/pam_unix.c:1.11.26.1
--- src/lib/libpam/modules/pam_unix/pam_unix.c:1.11 Tue May 30 19:48:07 2006
+++ src/lib/libpam/modules/pam_unix/pam_unix.c Wed Jun 17 20:35:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pam_unix.c,v 1.11 2006/05/30 19:48:07 jnemeth Exp $ */
+/* $NetBSD: pam_unix.c,v 1.11.26.1 2009/06/17 20:35:08 bouyer Exp $ */
/*-
* Copyright 1998 Juniper Networks, Inc.
@@ -40,7 +40,7 @@
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_unix/pam_unix.c,v 1.49 2004/02/10 10:13:21 des Exp $");
#else
-__RCSID("$NetBSD: pam_unix.c,v 1.11 2006/05/30 19:48:07 jnemeth Exp $");
+__RCSID("$NetBSD: pam_unix.c,v 1.11.26.1 2009/06/17 20:35:08 bouyer Exp $");
#endif
@@ -508,6 +508,14 @@
/* Root doesn't need the old password. */
return (pam_set_item(pamh, PAM_OLDAUTHTOK, ""));
}
+ /*
+ * Apparently we're not root, so let's forbid editing
+ * root.
+ * XXX Check for some flag to indicate if this
+ * XXX is the desired behavior.
+ */
+ if (pwd->pw_uid == 0)
+return (PAM_PERM_DENIED);
}
if (pwd->pw_passwd[0] == '\0') {
CVS commit: [netbsd-5] src/sys/dev/pci
Module Name:src
Committed By: bouyer
Date: Wed Jun 17 20:33:39 UTC 2009
Modified Files:
src/sys/dev/pci [netbsd-5]: ehci_pci.c
Log Message:
Pull up following revision(s) (requested by cegger in ticket #814):
sys/dev/pci/ehci_pci.c: revision 1.45
Apply hw workaround required for all SB600 revisions and SB700 revisions
A12 and A13 to avoid USB subsystem hang symptom. The USB subsystem hang
symptom is observed when the system has multiple USB devices connected to it
or one USB device is often re-connected. In some cases a USB hub may be
required to observe this symptom.
This patch works around the problem by correcting the internal register setting
that will help by changing the behavior of the internal logic to avoid the
USB subsystem hang issue. The change in the behavior of the logic does not
impact the normal operation of the USB subsystem.
This fix has been discussed, developped, reviewed, polished up
and tested on current-users by several people. Thread starts at:
http://mail-index.netbsd.org/current-users/2009/05/17/msg009460.html
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.38.10.1 src/sys/dev/pci/ehci_pci.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/ehci_pci.c
diff -u src/sys/dev/pci/ehci_pci.c:1.38 src/sys/dev/pci/ehci_pci.c:1.38.10.1
--- src/sys/dev/pci/ehci_pci.c:1.38 Mon Apr 28 20:23:54 2008
+++ src/sys/dev/pci/ehci_pci.c Wed Jun 17 20:33:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_pci.c,v 1.38 2008/04/28 20:23:54 martin Exp $ */
+/* $NetBSD: ehci_pci.c,v 1.38.10.1 2009/06/17 20:33:39 bouyer Exp $ */
/*
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.38 2008/04/28 20:23:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.38.10.1 2009/06/17 20:33:39 bouyer Exp $");
#include
#include
@@ -60,6 +60,18 @@
#define DPRINTF(x)
#endif
+enum ehci_pci_quirk_flags {
+ EHCI_PCI_QUIRK_AMD_SB600 = 0x1, /* always need a quirk */
+ EHCI_PCI_QUIRK_AMD_SB700 = 0x2, /* depends on the SMB revision */
+};
+
+static const struct pci_quirkdata ehci_pci_quirks[] = {
+ { PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_USB_EHCI,
+ EHCI_PCI_QUIRK_AMD_SB600 },
+ { PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_USB_EHCI,
+ EHCI_PCI_QUIRK_AMD_SB700 },
+};
+
static void ehci_release_ownership(ehci_softc_t *sc, pci_chipset_tag_t pc,
pcitag_t tag);
static void ehci_get_ownership(ehci_softc_t *sc, pci_chipset_tag_t pc,
@@ -74,7 +86,15 @@
void *sc_ih; /* interrupt vectoring */
};
+static int ehci_sb700_match(struct pci_attach_args *pa);
+static int ehci_apply_amd_quirks(struct ehci_pci_softc *sc);
+enum ehci_pci_quirk_flags ehci_pci_lookup_quirkdata(pci_vendor_id_t,
+ pci_product_id_t);
+
#define EHCI_MAX_BIOS_WAIT 1000 /* ms */
+#define EHCI_SBx00_WORKAROUND_REG 0x50
+#define EHCI_SBx00_WORKAROUND_ENABLE __BIT(27)
+
static int
ehci_pci_match(struct device *parent, struct cfdata *match,
@@ -106,6 +126,7 @@
usbd_status r;
int ncomp;
struct usb_pci *up;
+ int quirk;
sc->sc.sc_dev = self;
sc->sc.sc_bus.hci_private = sc;
@@ -116,6 +137,10 @@
aprint_normal(": %s (rev. 0x%02x)\n", devinfo,
PCI_REVISION(pa->pa_class));
+ /* Check for quirks */
+ quirk = ehci_pci_lookup_quirkdata(PCI_VENDOR(pa->pa_id),
+ PCI_PRODUCT(pa->pa_id));
+
/* Map I/O registers */
if (pci_mapreg_map(pa, PCI_CBMEM, PCI_MAPREG_TYPE_MEM, 0,
&sc->sc.iot, &sc->sc.ioh, NULL, &sc->sc.sc_size)) {
@@ -127,6 +152,17 @@
sc->sc_tag = tag;
sc->sc.sc_bus.dmatag = pa->pa_dmat;
+ /* Handle quirks */
+ switch (quirk) {
+ case EHCI_PCI_QUIRK_AMD_SB600:
+ ehci_apply_amd_quirks(sc);
+ break;
+ case EHCI_PCI_QUIRK_AMD_SB700:
+ if (pci_find_device(NULL, ehci_sb700_match))
+ ehci_apply_amd_quirks(sc);
+ break;
+ }
+
/* Enable the device. */
csr = pci_conf_read(pc, tag, PCI_COMMAND_STATUS_REG);
pci_conf_write(pc, tag, PCI_COMMAND_STATUS_REG,
@@ -381,3 +417,47 @@
ehci_get_ownership(&sc->sc, sc->sc_pc, sc->sc_tag);
return ehci_resume(dv PMF_FN_CALL);
}
+
+static int
+ehci_sb700_match(struct pci_attach_args *pa)
+{
+ if (!(PCI_VENDOR(pa->pa_id) == PCI_VENDOR_ATI &&
+ PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_ATI_SB600_SMB))
+ return 0;
+
+ switch (PCI_REVISION(pa->pa_class)) {
+ case 0x3a:
+ case 0x3b:
+ return 1;
+ }
+
+ return 0;
+}
+
+static int
+ehci_apply_amd_quirks(struct ehci_pci_softc *sc)
+{
+ pcireg_t value;
+
+ aprint_normal_dev(sc->sc.sc_dev,
+ "applying AMD SB600/SB700 USB freeze workaround\n");
+ value = pci_conf_read(sc->sc_pc, sc->sc_tag, EHCI_SBx00_WORKAROUND_REG);
+ pci_conf_write(sc->sc_pc, sc->sc_tag, EHCI_SBx00_WORKAROUND_REG,
+ value | EHCI_SBx00_WORKAROUND_ENABLE);
+
+ return 0;
+}
+
+enum ehci_pci_quirk_flags
+ehci_pci_lookup_quirkdata(pci_vendor_id_t vendor, pci_product_id_t product)
+{
+ int i;
+
+ for (i = 0; i <
CVS commit: [netbsd-5-0] src/sys/dev/pci
Module Name:src
Committed By: bouyer
Date: Wed Jun 17 20:33:36 UTC 2009
Modified Files:
src/sys/dev/pci [netbsd-5-0]: ehci_pci.c
Log Message:
Pull up following revision(s) (requested by cegger in ticket #814):
sys/dev/pci/ehci_pci.c: revision 1.45
Apply hw workaround required for all SB600 revisions and SB700 revisions
A12 and A13 to avoid USB subsystem hang symptom. The USB subsystem hang
symptom is observed when the system has multiple USB devices connected to it
or one USB device is often re-connected. In some cases a USB hub may be
required to observe this symptom.
This patch works around the problem by correcting the internal register setting
that will help by changing the behavior of the internal logic to avoid the
USB subsystem hang issue. The change in the behavior of the logic does not
impact the normal operation of the USB subsystem.
This fix has been discussed, developped, reviewed, polished up
and tested on current-users by several people. Thread starts at:
http://mail-index.netbsd.org/current-users/2009/05/17/msg009460.html
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.38.16.1 src/sys/dev/pci/ehci_pci.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/ehci_pci.c
diff -u src/sys/dev/pci/ehci_pci.c:1.38 src/sys/dev/pci/ehci_pci.c:1.38.16.1
--- src/sys/dev/pci/ehci_pci.c:1.38 Mon Apr 28 20:23:54 2008
+++ src/sys/dev/pci/ehci_pci.c Wed Jun 17 20:33:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_pci.c,v 1.38 2008/04/28 20:23:54 martin Exp $ */
+/* $NetBSD: ehci_pci.c,v 1.38.16.1 2009/06/17 20:33:36 bouyer Exp $ */
/*
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.38 2008/04/28 20:23:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.38.16.1 2009/06/17 20:33:36 bouyer Exp $");
#include
#include
@@ -60,6 +60,18 @@
#define DPRINTF(x)
#endif
+enum ehci_pci_quirk_flags {
+ EHCI_PCI_QUIRK_AMD_SB600 = 0x1, /* always need a quirk */
+ EHCI_PCI_QUIRK_AMD_SB700 = 0x2, /* depends on the SMB revision */
+};
+
+static const struct pci_quirkdata ehci_pci_quirks[] = {
+ { PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_USB_EHCI,
+ EHCI_PCI_QUIRK_AMD_SB600 },
+ { PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_USB_EHCI,
+ EHCI_PCI_QUIRK_AMD_SB700 },
+};
+
static void ehci_release_ownership(ehci_softc_t *sc, pci_chipset_tag_t pc,
pcitag_t tag);
static void ehci_get_ownership(ehci_softc_t *sc, pci_chipset_tag_t pc,
@@ -74,7 +86,15 @@
void *sc_ih; /* interrupt vectoring */
};
+static int ehci_sb700_match(struct pci_attach_args *pa);
+static int ehci_apply_amd_quirks(struct ehci_pci_softc *sc);
+enum ehci_pci_quirk_flags ehci_pci_lookup_quirkdata(pci_vendor_id_t,
+ pci_product_id_t);
+
#define EHCI_MAX_BIOS_WAIT 1000 /* ms */
+#define EHCI_SBx00_WORKAROUND_REG 0x50
+#define EHCI_SBx00_WORKAROUND_ENABLE __BIT(27)
+
static int
ehci_pci_match(struct device *parent, struct cfdata *match,
@@ -106,6 +126,7 @@
usbd_status r;
int ncomp;
struct usb_pci *up;
+ int quirk;
sc->sc.sc_dev = self;
sc->sc.sc_bus.hci_private = sc;
@@ -116,6 +137,10 @@
aprint_normal(": %s (rev. 0x%02x)\n", devinfo,
PCI_REVISION(pa->pa_class));
+ /* Check for quirks */
+ quirk = ehci_pci_lookup_quirkdata(PCI_VENDOR(pa->pa_id),
+ PCI_PRODUCT(pa->pa_id));
+
/* Map I/O registers */
if (pci_mapreg_map(pa, PCI_CBMEM, PCI_MAPREG_TYPE_MEM, 0,
&sc->sc.iot, &sc->sc.ioh, NULL, &sc->sc.sc_size)) {
@@ -127,6 +152,17 @@
sc->sc_tag = tag;
sc->sc.sc_bus.dmatag = pa->pa_dmat;
+ /* Handle quirks */
+ switch (quirk) {
+ case EHCI_PCI_QUIRK_AMD_SB600:
+ ehci_apply_amd_quirks(sc);
+ break;
+ case EHCI_PCI_QUIRK_AMD_SB700:
+ if (pci_find_device(NULL, ehci_sb700_match))
+ ehci_apply_amd_quirks(sc);
+ break;
+ }
+
/* Enable the device. */
csr = pci_conf_read(pc, tag, PCI_COMMAND_STATUS_REG);
pci_conf_write(pc, tag, PCI_COMMAND_STATUS_REG,
@@ -381,3 +417,47 @@
ehci_get_ownership(&sc->sc, sc->sc_pc, sc->sc_tag);
return ehci_resume(dv PMF_FN_CALL);
}
+
+static int
+ehci_sb700_match(struct pci_attach_args *pa)
+{
+ if (!(PCI_VENDOR(pa->pa_id) == PCI_VENDOR_ATI &&
+ PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_ATI_SB600_SMB))
+ return 0;
+
+ switch (PCI_REVISION(pa->pa_class)) {
+ case 0x3a:
+ case 0x3b:
+ return 1;
+ }
+
+ return 0;
+}
+
+static int
+ehci_apply_amd_quirks(struct ehci_pci_softc *sc)
+{
+ pcireg_t value;
+
+ aprint_normal_dev(sc->sc.sc_dev,
+ "applying AMD SB600/SB700 USB freeze workaround\n");
+ value = pci_conf_read(sc->sc_pc, sc->sc_tag, EHCI_SBx00_WORKAROUND_REG);
+ pci_conf_write(sc->sc_pc, sc->sc_tag, EHCI_SBx00_WORKAROUND_REG,
+ value | EHCI_SBx00_WORKAROUND_ENABLE);
+
+ return 0;
+}
+
+enum ehci_pci_quirk_flags
+ehci_pci_lookup_quirkdata(pci_vendor_id_t vendor, pci_product_id_t product)
+{
+ int i;
+
+ for (i = 0; i
CVS commit: [netbsd-5] src/usr.bin/window
Module Name:src
Committed By: bouyer
Date: Wed Jun 17 20:30:59 UTC 2009
Modified Files:
src/usr.bin/window [netbsd-5]: ttgeneric.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #813):
usr.bin/window/ttgeneric.c: revision 1.11
PR/41581: Der mouse: window SEGV with certain terminals. does strcmp first
and then checks for null pointer for underline and bold.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.40.1 src/usr.bin/window/ttgeneric.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/window/ttgeneric.c
diff -u src/usr.bin/window/ttgeneric.c:1.9 src/usr.bin/window/ttgeneric.c:1.9.40.1
--- src/usr.bin/window/ttgeneric.c:1.9 Thu Aug 7 11:17:30 2003
+++ src/usr.bin/window/ttgeneric.c Wed Jun 17 20:30:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ttgeneric.c,v 1.9 2003/08/07 11:17:30 agc Exp $ */
+/* $NetBSD: ttgeneric.c,v 1.9.40.1 2009/06/17 20:30:59 bouyer Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)ttgeneric.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: ttgeneric.c,v 1.9 2003/08/07 11:17:30 agc Exp $");
+__RCSID("$NetBSD: ttgeneric.c,v 1.9.40.1 2009/06/17 20:30:59 bouyer Exp $");
#endif
#endif /* not lint */
@@ -169,8 +169,8 @@
} else
if (gen_SE) {
ttxputs(gen_SE);
-if (!strcmp(gen_SE->ts_str, gen_UE->ts_str) &&
-gen_UE && gen_US && new & WWM_UL)
+if (gen_UE && gen_US && new & WWM_UL &&
+!strcmp(gen_SE->ts_str, gen_UE->ts_str))
ttxputs(gen_US);
}
}
@@ -181,8 +181,8 @@
} else
if (gen_UE) {
ttxputs(gen_UE);
-if (!strcmp(gen_UE->ts_str, gen_SE->ts_str) &&
-gen_SE && gen_SO && new & WWM_REV)
+if (gen_SE && gen_SO && new & WWM_REV &&
+!strcmp(gen_UE->ts_str, gen_SE->ts_str))
ttxputs(gen_SO);
}
}
CVS commit: [netbsd-5-0] src/sys/netinet
Module Name:src
Committed By: bouyer
Date: Wed Jun 17 20:29:37 UTC 2009
Modified Files:
src/sys/netinet [netbsd-5-0]: tcp_usrreq.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #812):
sys/netinet/tcp_usrreq.c: revision 1.155
sysctl_inpcblist: fix a lock leak in error path (hi ).
To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.149.6.1 src/sys/netinet/tcp_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/netinet/tcp_usrreq.c
diff -u src/sys/netinet/tcp_usrreq.c:1.149 src/sys/netinet/tcp_usrreq.c:1.149.6.1
--- src/sys/netinet/tcp_usrreq.c:1.149 Sat Oct 11 13:40:57 2008
+++ src/sys/netinet/tcp_usrreq.c Wed Jun 17 20:29:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_usrreq.c,v 1.149 2008/10/11 13:40:57 pooka Exp $ */
+/* $NetBSD: tcp_usrreq.c,v 1.149.6.1 2009/06/17 20:29:37 bouyer Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -95,7 +95,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.149 2008/10/11 13:40:57 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.149.6.1 2009/06/17 20:29:37 bouyer Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -1553,8 +1553,10 @@
if (len >= elem_size && elem_count > 0) {
error = copyout(&pcb, dp, out_size);
- if (error)
+ if (error) {
+mutex_exit(softnet_lock);
return (error);
+ }
dp += elem_size;
len -= elem_size;
}
CVS commit: [netbsd-5] src/sys/netinet
Module Name:src
Committed By: bouyer
Date: Wed Jun 17 20:29:33 UTC 2009
Modified Files:
src/sys/netinet [netbsd-5]: tcp_usrreq.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #812):
sys/netinet/tcp_usrreq.c: revision 1.155
sysctl_inpcblist: fix a lock leak in error path (hi ).
To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.149.4.1 src/sys/netinet/tcp_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/netinet/tcp_usrreq.c
diff -u src/sys/netinet/tcp_usrreq.c:1.149 src/sys/netinet/tcp_usrreq.c:1.149.4.1
--- src/sys/netinet/tcp_usrreq.c:1.149 Sat Oct 11 13:40:57 2008
+++ src/sys/netinet/tcp_usrreq.c Wed Jun 17 20:29:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_usrreq.c,v 1.149 2008/10/11 13:40:57 pooka Exp $ */
+/* $NetBSD: tcp_usrreq.c,v 1.149.4.1 2009/06/17 20:29:33 bouyer Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -95,7 +95,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.149 2008/10/11 13:40:57 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.149.4.1 2009/06/17 20:29:33 bouyer Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -1553,8 +1553,10 @@
if (len >= elem_size && elem_count > 0) {
error = copyout(&pcb, dp, out_size);
- if (error)
+ if (error) {
+mutex_exit(softnet_lock);
return (error);
+ }
dp += elem_size;
len -= elem_size;
}
CVS commit: [netbsd-5-0] src/sys/kern
Module Name:src
Committed By: bouyer
Date: Wed Jun 17 20:21:15 UTC 2009
Modified Files:
src/sys/kern [netbsd-5-0]: subr_kobj.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #809):
sys/kern/subr_kobj.c: revision 1.35
Fix a crash observed when trying to load a corrupted ELF image.
To generate a diff of this commit:
cvs rdiff -u -r1.24.4.1 -r1.24.4.1.2.1 src/sys/kern/subr_kobj.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_kobj.c
diff -u src/sys/kern/subr_kobj.c:1.24.4.1 src/sys/kern/subr_kobj.c:1.24.4.1.2.1
--- src/sys/kern/subr_kobj.c:1.24.4.1 Mon Feb 2 02:27:22 2009
+++ src/sys/kern/subr_kobj.c Wed Jun 17 20:21:14 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_kobj.c,v 1.24.4.1 2009/02/02 02:27:22 snj Exp $ */
+/* $NetBSD: subr_kobj.c,v 1.24.4.1.2.1 2009/06/17 20:21:14 bouyer Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
#include "opt_modular.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.24.4.1 2009/02/02 02:27:22 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.24.4.1.2.1 2009/06/17 20:21:14 bouyer Exp $");
#define ELFSIZE ARCH_ELFSIZE
@@ -803,25 +803,25 @@
{
int i;
- for (i = 0; i < ko->ko_nrel; i++) {
- if (ko->ko_reltab[i].rel) {
- kobj_free(ko, ko->ko_reltab[i].rel,
- ko->ko_reltab[i].size);
- }
- }
- for (i = 0; i < ko->ko_nrela; i++) {
- if (ko->ko_relatab[i].rela) {
- kobj_free(ko, ko->ko_relatab[i].rela,
- ko->ko_relatab[i].size);
- }
- }
if (ko->ko_reltab != NULL) {
+ for (i = 0; i < ko->ko_nrel; i++) {
+ if (ko->ko_reltab[i].rel) {
+kobj_free(ko, ko->ko_reltab[i].rel,
+ko->ko_reltab[i].size);
+ }
+ }
kobj_free(ko, ko->ko_reltab, ko->ko_nrel *
sizeof(*ko->ko_reltab));
ko->ko_reltab = NULL;
ko->ko_nrel = 0;
}
if (ko->ko_relatab != NULL) {
+ for (i = 0; i < ko->ko_nrela; i++) {
+ if (ko->ko_relatab[i].rela) {
+kobj_free(ko, ko->ko_relatab[i].rela,
+ko->ko_relatab[i].size);
+ }
+ }
kobj_free(ko, ko->ko_relatab, ko->ko_nrela *
sizeof(*ko->ko_relatab));
ko->ko_relatab = NULL;
CVS commit: [netbsd-5] src/sys/kern
Module Name:src
Committed By: bouyer
Date: Wed Jun 17 20:20:54 UTC 2009
Modified Files:
src/sys/kern [netbsd-5]: subr_kobj.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #809):
sys/kern/subr_kobj.c: revision 1.35
Fix a crash observed when trying to load a corrupted ELF image.
To generate a diff of this commit:
cvs rdiff -u -r1.24.4.1 -r1.24.4.2 src/sys/kern/subr_kobj.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_kobj.c
diff -u src/sys/kern/subr_kobj.c:1.24.4.1 src/sys/kern/subr_kobj.c:1.24.4.2
--- src/sys/kern/subr_kobj.c:1.24.4.1 Mon Feb 2 02:27:22 2009
+++ src/sys/kern/subr_kobj.c Wed Jun 17 20:20:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_kobj.c,v 1.24.4.1 2009/02/02 02:27:22 snj Exp $ */
+/* $NetBSD: subr_kobj.c,v 1.24.4.2 2009/06/17 20:20:54 bouyer Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
#include "opt_modular.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.24.4.1 2009/02/02 02:27:22 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.24.4.2 2009/06/17 20:20:54 bouyer Exp $");
#define ELFSIZE ARCH_ELFSIZE
@@ -803,25 +803,25 @@
{
int i;
- for (i = 0; i < ko->ko_nrel; i++) {
- if (ko->ko_reltab[i].rel) {
- kobj_free(ko, ko->ko_reltab[i].rel,
- ko->ko_reltab[i].size);
- }
- }
- for (i = 0; i < ko->ko_nrela; i++) {
- if (ko->ko_relatab[i].rela) {
- kobj_free(ko, ko->ko_relatab[i].rela,
- ko->ko_relatab[i].size);
- }
- }
if (ko->ko_reltab != NULL) {
+ for (i = 0; i < ko->ko_nrel; i++) {
+ if (ko->ko_reltab[i].rel) {
+kobj_free(ko, ko->ko_reltab[i].rel,
+ko->ko_reltab[i].size);
+ }
+ }
kobj_free(ko, ko->ko_reltab, ko->ko_nrel *
sizeof(*ko->ko_reltab));
ko->ko_reltab = NULL;
ko->ko_nrel = 0;
}
if (ko->ko_relatab != NULL) {
+ for (i = 0; i < ko->ko_nrela; i++) {
+ if (ko->ko_relatab[i].rela) {
+kobj_free(ko, ko->ko_relatab[i].rela,
+ko->ko_relatab[i].size);
+ }
+ }
kobj_free(ko, ko->ko_relatab, ko->ko_nrela *
sizeof(*ko->ko_relatab));
ko->ko_relatab = NULL;
CVS commit: [netbsd-5] src/external/bsd/am-utils/lib/libamu
Module Name:src
Committed By: bouyer
Date: Wed Jun 17 20:18:33 UTC 2009
Modified Files:
src/external/bsd/am-utils/lib/libamu [netbsd-5]: mkconf
Log Message:
Pull up following revision(s) (requested by christos in ticket #808):
external/bsd/am-utils/lib/libamu/mkconf: revision 1.2
PR/41580: Hauke Fath: am-utils uses "netbsd${OSVER}" selector, still.
Changed to "netbsd"
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.6.1 src/external/bsd/am-utils/lib/libamu/mkconf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/am-utils/lib/libamu/mkconf
diff -u src/external/bsd/am-utils/lib/libamu/mkconf:1.1 src/external/bsd/am-utils/lib/libamu/mkconf:1.1.6.1
--- src/external/bsd/am-utils/lib/libamu/mkconf:1.1 Fri Sep 19 21:38:41 2008
+++ src/external/bsd/am-utils/lib/libamu/mkconf Wed Jun 17 20:18:33 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mkconf,v 1.1 2008/09/19 21:38:41 christos Exp $
+# $NetBSD: mkconf,v 1.1.6.1 2009/06/17 20:18:33 bouyer Exp $
#
# mkconf
# Generate local configuration parameters for amd
@@ -23,7 +23,7 @@
#define HOST_OS "netbsd$1"
/* Define only name of host machine OS (eg. solaris2) */
-#define HOST_OS_NAME "netbsd`echo $1 | cut -d. -f 1`"
+#define HOST_OS_NAME "netbsd"
/* Define only version of host machine (eg. 2.5.1) */
#define HOST_OS_VERSION "$1"
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: jdc Date: Wed Jun 17 20:17:40 UTC 2009 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket #1326. To generate a diff of this commit: cvs rdiff -u -r1.1.2.34 -r1.1.2.35 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.34 src/doc/CHANGES-4.0.2:1.1.2.35 --- src/doc/CHANGES-4.0.2:1.1.2.34 Wed Jun 10 19:24:35 2009 +++ src/doc/CHANGES-4.0.2 Wed Jun 17 20:17:40 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.34 2009/06/10 19:24:35 bouyer Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.35 2009/06/17 20:17:40 jdc Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -617,3 +617,11 @@ or ENAMETOOLONG. [uwe, ticket #1323] +lib/libpam/modules/pam_unix/pam_unix.c 1.13 + Restore the good old UNIX behavior of root password changing: only root + may change the root password. + + (Checked that everybody else's password can be changed without any + problem, and checked that root can still change the root password.) + [tonnerre, ticket #1326] +
CVS commit: [netbsd-5] src/sys/kern
Module Name:src
Committed By: bouyer
Date: Wed Jun 17 20:17:37 UTC 2009
Modified Files:
src/sys/kern [netbsd-5]: tty_pty.c
Log Message:
Pull up following revision(s) (requested by plunky in ticket #807):
sys/kern/tty_pty.c: revision 1.117
Writes on the controlling tty were not being awoken from blocks,
use the correct condvar to make this happen.
this fixes PR/41566
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.112.4.1 src/sys/kern/tty_pty.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/tty_pty.c
diff -u src/sys/kern/tty_pty.c:1.112 src/sys/kern/tty_pty.c:1.112.4.1
--- src/sys/kern/tty_pty.c:1.112 Wed Sep 3 16:47:34 2008
+++ src/sys/kern/tty_pty.c Wed Jun 17 20:17:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_pty.c,v 1.112 2008/09/03 16:47:34 drochner Exp $ */
+/* $NetBSD: tty_pty.c,v 1.112.4.1 2009/06/17 20:17:37 bouyer Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tty_pty.c,v 1.112 2008/09/03 16:47:34 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_pty.c,v 1.112.4.1 2009/06/17 20:17:37 bouyer Exp $");
#include "opt_compat_sunos.h"
#include "opt_ptm.h"
@@ -779,7 +779,7 @@
error = cnt == 0 ? EWOULDBLOCK : 0;
goto out;
}
- error = cv_wait_sig(&tp->t_rawcv, &tty_lock);
+ error = cv_wait_sig(&tp->t_rawcvf, &tty_lock);
mutex_spin_exit(&tty_lock);
if (error) {
/* adjust for data copied in but not written */
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: jdc Date: Wed Jun 17 20:17:24 UTC 2009 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: Ticket #1326. To generate a diff of this commit: cvs rdiff -u -r1.1.2.154 -r1.1.2.155 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.154 src/doc/CHANGES-4.1:1.1.2.155 --- src/doc/CHANGES-4.1:1.1.2.154 Wed Jun 10 19:24:05 2009 +++ src/doc/CHANGES-4.1 Wed Jun 17 20:17:24 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.154 2009/06/10 19:24:05 bouyer Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.155 2009/06/17 20:17:24 jdc Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -3446,3 +3446,11 @@ or ENAMETOOLONG. [uwe, ticket #1323] +lib/libpam/modules/pam_unix/pam_unix.c 1.13 + Restore the good old UNIX behavior of root password changing: only root + may change the root password. + + (Checked that everybody else's password can be changed without any + problem, and checked that root can still change the root password.) + [tonnerre, ticket #1326] +
CVS commit: [netbsd-5-0] src/sys/compat/linux/common
Module Name:src Committed By: bouyer Date: Wed Jun 17 20:15:57 UTC 2009 Modified Files: src/sys/compat/linux/common [netbsd-5-0]: linux_socket.c Log Message: Pull up following revision(s) (requested by njoly in ticket #806): sys/compat/linux/common/linux_socket.c: revision 1.100 In sendmsg(2), do copy the msghdr structure before trying to use it. To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.98.6.1 src/sys/compat/linux/common/linux_socket.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/compat/linux/common/linux_socket.c diff -u src/sys/compat/linux/common/linux_socket.c:1.98 src/sys/compat/linux/common/linux_socket.c:1.98.6.1 --- src/sys/compat/linux/common/linux_socket.c:1.98 Wed Aug 6 15:01:23 2008 +++ src/sys/compat/linux/common/linux_socket.c Wed Jun 17 20:15:56 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_socket.c,v 1.98 2008/08/06 15:01:23 plunky Exp $ */ +/* $NetBSD: linux_socket.c,v 1.98.6.1 2009/06/17 20:15:56 bouyer Exp $ */ /*- * Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.98 2008/08/06 15:01:23 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.98.6.1 2009/06/17 20:15:56 bouyer Exp $"); #if defined(_KERNEL_OPT) #include "opt_inet.h" @@ -411,6 +411,10 @@ u_int8_t *control; struct mbuf *ctl_mbuf = NULL; + error = copyin(SCARG(uap, msg), &msg, sizeof(msg)); + if (error) + return error; + msg.msg_flags = MSG_IOVUSRSPACE; /*
CVS commit: [netbsd-5] src/sys/compat/linux/common
Module Name:src Committed By: bouyer Date: Wed Jun 17 20:15:54 UTC 2009 Modified Files: src/sys/compat/linux/common [netbsd-5]: linux_socket.c Log Message: Pull up following revision(s) (requested by njoly in ticket #806): sys/compat/linux/common/linux_socket.c: revision 1.100 In sendmsg(2), do copy the msghdr structure before trying to use it. To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.98.4.1 src/sys/compat/linux/common/linux_socket.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/compat/linux/common/linux_socket.c diff -u src/sys/compat/linux/common/linux_socket.c:1.98 src/sys/compat/linux/common/linux_socket.c:1.98.4.1 --- src/sys/compat/linux/common/linux_socket.c:1.98 Wed Aug 6 15:01:23 2008 +++ src/sys/compat/linux/common/linux_socket.c Wed Jun 17 20:15:53 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_socket.c,v 1.98 2008/08/06 15:01:23 plunky Exp $ */ +/* $NetBSD: linux_socket.c,v 1.98.4.1 2009/06/17 20:15:53 bouyer Exp $ */ /*- * Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.98 2008/08/06 15:01:23 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.98.4.1 2009/06/17 20:15:53 bouyer Exp $"); #if defined(_KERNEL_OPT) #include "opt_inet.h" @@ -411,6 +411,10 @@ u_int8_t *control; struct mbuf *ctl_mbuf = NULL; + error = copyin(SCARG(uap, msg), &msg, sizeof(msg)); + if (error) + return error; + msg.msg_flags = MSG_IOVUSRSPACE; /*
CVS commit: [netbsd-5-0] src
Module Name:src
Committed By: bouyer
Date: Wed Jun 17 20:13:47 UTC 2009
Modified Files:
src/distrib/sets/lists/xbase [netbsd-5-0]: mi
src/external/mit/xorg/bin/xvidtune [netbsd-5-0]: Makefile
Log Message:
Pull up following revision(s) (requested by mrg in ticket #805):
external/mit/xorg/bin/xvidtune/Makefile: revision 1.2
distrib/sets/lists/xbase/mi: revision 1.76
fix xsrc/41577: install the Xvidtune app-defaults file, after the
necessary preprocessing and sed processing it needs.
To generate a diff of this commit:
cvs rdiff -u -r1.69.2.2 -r1.69.2.2.2.1 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.12.1 \
src/external/mit/xorg/bin/xvidtune/Makefile
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/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.69.2.2 src/distrib/sets/lists/xbase/mi:1.69.2.2.2.1
--- src/distrib/sets/lists/xbase/mi:1.69.2.2 Wed Feb 18 01:10:57 2009
+++ src/distrib/sets/lists/xbase/mi Wed Jun 17 20:13:47 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.69.2.2 2009/02/18 01:10:57 snj Exp $
+# $NetBSD: mi,v 1.69.2.2.2.1 2009/06/17 20:13:47 bouyer Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1348,6 +1348,7 @@
./usr/X11R7/lib/X11/app-defaults/Xmessage -unknown- xorg
./usr/X11R7/lib/X11/app-defaults/Xmessage-color -unknown- xorg
./usr/X11R7/lib/X11/app-defaults/Xmh -unknown- xorg
+./usr/X11R7/lib/X11/app-defaults/Xvidtune -unknown- xorg
./usr/X11R7/lib/X11/locale/C/Compose -unknown- xorg
./usr/X11R7/lib/X11/locale/C/XI18N_OBJS -unknown- xorg
./usr/X11R7/lib/X11/locale/C/XLC_LOCALE -unknown- xorg
Index: src/external/mit/xorg/bin/xvidtune/Makefile
diff -u src/external/mit/xorg/bin/xvidtune/Makefile:1.1.1.1 src/external/mit/xorg/bin/xvidtune/Makefile:1.1.1.1.12.1
--- src/external/mit/xorg/bin/xvidtune/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xvidtune/Makefile Wed Jun 17 20:13:47 2009
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.1.1.1.12.1 2009/06/17 20:13:47 bouyer Exp $
.include
PROG= xvidtune
-#APPDEFS= Xvidtune.ad
+APPDEFS= Xvidtune.ad
SRCS= xvidtune.c
@@ -13,6 +13,14 @@
.PATH: ${X11SRCDIR.${PROG}}
+VENDOR_NAME=The Xorg Foundation
+
+Xvidtune.ad: Xvidtune.cpp Makefile
+ $(CC) -E ${X11SRCDIR.xvidtune}/Xvidtune.cpp | \
+ sed -e 's/^\#.*$$//g' -e 's|__VENDOR__|$(VENDOR_NAME)|' > ${.TARGET}
+
+CLEANFILES+= Xvidtune.ad
+
.include
.include
#XTODO= Xvidtune.ad
CVS commit: [netbsd-5] src
Module Name:src
Committed By: bouyer
Date: Wed Jun 17 20:13:35 UTC 2009
Modified Files:
src/distrib/sets/lists/xbase [netbsd-5]: mi
src/external/mit/xorg/bin/xvidtune [netbsd-5]: Makefile
Log Message:
Pull up following revision(s) (requested by mrg in ticket #805):
external/mit/xorg/bin/xvidtune/Makefile: revision 1.2
distrib/sets/lists/xbase/mi: revision 1.76
fix xsrc/41577: install the Xvidtune app-defaults file, after the
necessary preprocessing and sed processing it needs.
To generate a diff of this commit:
cvs rdiff -u -r1.69.2.2 -r1.69.2.3 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.8.1 \
src/external/mit/xorg/bin/xvidtune/Makefile
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/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.69.2.2 src/distrib/sets/lists/xbase/mi:1.69.2.3
--- src/distrib/sets/lists/xbase/mi:1.69.2.2 Wed Feb 18 01:10:57 2009
+++ src/distrib/sets/lists/xbase/mi Wed Jun 17 20:13:35 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.69.2.2 2009/02/18 01:10:57 snj Exp $
+# $NetBSD: mi,v 1.69.2.3 2009/06/17 20:13:35 bouyer Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1348,6 +1348,7 @@
./usr/X11R7/lib/X11/app-defaults/Xmessage -unknown- xorg
./usr/X11R7/lib/X11/app-defaults/Xmessage-color -unknown- xorg
./usr/X11R7/lib/X11/app-defaults/Xmh -unknown- xorg
+./usr/X11R7/lib/X11/app-defaults/Xvidtune -unknown- xorg
./usr/X11R7/lib/X11/locale/C/Compose -unknown- xorg
./usr/X11R7/lib/X11/locale/C/XI18N_OBJS -unknown- xorg
./usr/X11R7/lib/X11/locale/C/XLC_LOCALE -unknown- xorg
Index: src/external/mit/xorg/bin/xvidtune/Makefile
diff -u src/external/mit/xorg/bin/xvidtune/Makefile:1.1.1.1 src/external/mit/xorg/bin/xvidtune/Makefile:1.1.1.1.8.1
--- src/external/mit/xorg/bin/xvidtune/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xvidtune/Makefile Wed Jun 17 20:13:35 2009
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.1.1.1.8.1 2009/06/17 20:13:35 bouyer Exp $
.include
PROG= xvidtune
-#APPDEFS= Xvidtune.ad
+APPDEFS= Xvidtune.ad
SRCS= xvidtune.c
@@ -13,6 +13,14 @@
.PATH: ${X11SRCDIR.${PROG}}
+VENDOR_NAME=The Xorg Foundation
+
+Xvidtune.ad: Xvidtune.cpp Makefile
+ $(CC) -E ${X11SRCDIR.xvidtune}/Xvidtune.cpp | \
+ sed -e 's/^\#.*$$//g' -e 's|__VENDOR__|$(VENDOR_NAME)|' > ${.TARGET}
+
+CLEANFILES+= Xvidtune.ad
+
.include
.include
#XTODO= Xvidtune.ad
CVS commit: [netbsd-4-0] src/lib/libpam/modules/pam_unix
Module Name:src
Committed By: jdc
Date: Wed Jun 17 20:13:11 UTC 2009
Modified Files:
src/lib/libpam/modules/pam_unix [netbsd-4-0]: pam_unix.c
Log Message:
Pull up revision 1.13 (requested by tonnerre in ticket #1326).
Restore the good old UNIX behavior of root password changing: only root
may change the root password.
(Checked that everybody else's password can be changed without any problem,
and checked that root can still change the root password.)
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.14.1 src/lib/libpam/modules/pam_unix/pam_unix.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/libpam/modules/pam_unix/pam_unix.c
diff -u src/lib/libpam/modules/pam_unix/pam_unix.c:1.11 src/lib/libpam/modules/pam_unix/pam_unix.c:1.11.14.1
--- src/lib/libpam/modules/pam_unix/pam_unix.c:1.11 Tue May 30 19:48:07 2006
+++ src/lib/libpam/modules/pam_unix/pam_unix.c Wed Jun 17 20:13:10 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pam_unix.c,v 1.11 2006/05/30 19:48:07 jnemeth Exp $ */
+/* $NetBSD: pam_unix.c,v 1.11.14.1 2009/06/17 20:13:10 jdc Exp $ */
/*-
* Copyright 1998 Juniper Networks, Inc.
@@ -40,7 +40,7 @@
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_unix/pam_unix.c,v 1.49 2004/02/10 10:13:21 des Exp $");
#else
-__RCSID("$NetBSD: pam_unix.c,v 1.11 2006/05/30 19:48:07 jnemeth Exp $");
+__RCSID("$NetBSD: pam_unix.c,v 1.11.14.1 2009/06/17 20:13:10 jdc Exp $");
#endif
@@ -508,6 +508,14 @@
/* Root doesn't need the old password. */
return (pam_set_item(pamh, PAM_OLDAUTHTOK, ""));
}
+ /*
+ * Apparently we're not root, so let's forbid editing
+ * root.
+ * XXX Check for some flag to indicate if this
+ * XXX is the desired behavior.
+ */
+ if (pwd->pw_uid == 0)
+return (PAM_PERM_DENIED);
}
if (pwd->pw_passwd[0] == '\0') {
CVS commit: [netbsd-4] src/lib/libpam/modules/pam_unix
Module Name:src
Committed By: jdc
Date: Wed Jun 17 20:12:31 UTC 2009
Modified Files:
src/lib/libpam/modules/pam_unix [netbsd-4]: pam_unix.c
Log Message:
Pull up revision 1.13 (requested by tonnerre in ticket #1326).
Restore the good old UNIX behavior of root password changing: only root
may change the root password.
(Checked that everybody else's password can be changed without any problem,
and checked that root can still change the root password.)
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.4.1 src/lib/libpam/modules/pam_unix/pam_unix.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/libpam/modules/pam_unix/pam_unix.c
diff -u src/lib/libpam/modules/pam_unix/pam_unix.c:1.11 src/lib/libpam/modules/pam_unix/pam_unix.c:1.11.4.1
--- src/lib/libpam/modules/pam_unix/pam_unix.c:1.11 Tue May 30 19:48:07 2006
+++ src/lib/libpam/modules/pam_unix/pam_unix.c Wed Jun 17 20:12:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pam_unix.c,v 1.11 2006/05/30 19:48:07 jnemeth Exp $ */
+/* $NetBSD: pam_unix.c,v 1.11.4.1 2009/06/17 20:12:31 jdc Exp $ */
/*-
* Copyright 1998 Juniper Networks, Inc.
@@ -40,7 +40,7 @@
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_unix/pam_unix.c,v 1.49 2004/02/10 10:13:21 des Exp $");
#else
-__RCSID("$NetBSD: pam_unix.c,v 1.11 2006/05/30 19:48:07 jnemeth Exp $");
+__RCSID("$NetBSD: pam_unix.c,v 1.11.4.1 2009/06/17 20:12:31 jdc Exp $");
#endif
@@ -508,6 +508,14 @@
/* Root doesn't need the old password. */
return (pam_set_item(pamh, PAM_OLDAUTHTOK, ""));
}
+ /*
+ * Apparently we're not root, so let's forbid editing
+ * root.
+ * XXX Check for some flag to indicate if this
+ * XXX is the desired behavior.
+ */
+ if (pwd->pw_uid == 0)
+return (PAM_PERM_DENIED);
}
if (pwd->pw_passwd[0] == '\0') {
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: cegger
Date: Wed Jun 17 19:12:49 UTC 2009
Modified Files:
src/sys/dev/ic: siisata.c
Log Message:
make this build w/o SIISATA_DEBUG
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/ic/siisata.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/siisata.c
diff -u src/sys/dev/ic/siisata.c:1.3 src/sys/dev/ic/siisata.c:1.4
--- src/sys/dev/ic/siisata.c:1.3 Wed Jun 17 04:37:57 2009
+++ src/sys/dev/ic/siisata.c Wed Jun 17 19:12:48 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: siisata.c,v 1.3 2009/06/17 04:37:57 jakllsch Exp $ */
+/* $NetBSD: siisata.c,v 1.4 2009/06/17 19:12:48 cegger Exp $ */
/* from ahcisata_core.c */
@@ -876,8 +876,10 @@
int
siisata_cmd_complete(struct ata_channel *chp, struct ata_xfer *xfer, int slot)
{
- struct siisata_softc *sc = (struct siisata_softc *)chp->ch_atac;
struct ata_command *ata_c = xfer->c_cmd;
+#ifdef SIISATA_DEBUG
+ struct siisata_softc *sc = (struct siisata_softc *)chp->ch_atac;
+#endif
SIISATA_DEBUG_PRINT(
("%s: %s\n", SIISATANAME(sc), __func__), DEBUG_FUNCS);
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: tsutsui
Date: Wed Jun 17 15:43:17 UTC 2009
Modified Files:
src/sys/dev/mii: brgphy.c
Log Message:
Unwrap not so long lines.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/mii/brgphy.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/mii/brgphy.c
diff -u src/sys/dev/mii/brgphy.c:1.47 src/sys/dev/mii/brgphy.c:1.48
--- src/sys/dev/mii/brgphy.c:1.47 Wed Jun 17 15:42:00 2009
+++ src/sys/dev/mii/brgphy.c Wed Jun 17 15:43:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: brgphy.c,v 1.47 2009/06/17 15:42:00 tsutsui Exp $ */
+/* $NetBSD: brgphy.c,v 1.48 2009/06/17 15:43:16 tsutsui Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.47 2009/06/17 15:42:00 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.48 2009/06/17 15:43:16 tsutsui Exp $");
#include
#include
@@ -187,8 +187,7 @@
};
static int
-brgphymatch(device_t parent, cfdata_t match,
-void *aux)
+brgphymatch(device_t parent, cfdata_t match, void *aux)
{
struct mii_attach_args *ma = aux;
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: tsutsui
Date: Wed Jun 17 15:42:00 UTC 2009
Modified Files:
src/sys/dev/mii: brgphy.c
Log Message:
- no need to use device_parent() because device_t parent is passed
via config_attach(9)
- use device_is_a() rather than strcmp() for readability
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/mii/brgphy.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/mii/brgphy.c
diff -u src/sys/dev/mii/brgphy.c:1.46 src/sys/dev/mii/brgphy.c:1.47
--- src/sys/dev/mii/brgphy.c:1.46 Tue May 12 14:31:27 2009
+++ src/sys/dev/mii/brgphy.c Wed Jun 17 15:42:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: brgphy.c,v 1.46 2009/05/12 14:31:27 cegger Exp $ */
+/* $NetBSD: brgphy.c,v 1.47 2009/06/17 15:42:00 tsutsui Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.46 2009/05/12 14:31:27 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.47 2009/06/17 15:42:00 tsutsui Exp $");
#include
#include
@@ -207,7 +207,6 @@
struct mii_data *mii = ma->mii_data;
const struct mii_phydesc *mpd;
prop_dictionary_t dict;
- const char *devname;
mpd = mii_phy_match(ma, brgphys);
aprint_naive(": Media interface\n");
@@ -238,14 +237,12 @@
mii_phy_add_media(sc);
aprint_normal("\n");
- parent = device_parent(sc->mii_dev);
- devname = parent->dv_cfdriver->cd_name;
- if (strcmp(devname, "bge") == 0) {
+ if (device_is_a(parent, "bge")) {
bsc->sc_isbge = 1;
dict = device_properties(parent);
prop_dictionary_get_uint32(dict, "phyflags",
&bsc->sc_bge_flags);
- } else if (strcmp(devname, "bnx") == 0) {
+ } else if (device_is_a(parent, "bnx")) {
bsc->sc_isbnx = 1;
dict = device_properties(parent);
prop_dictionary_get_uint32(dict, "phyflags",
CVS commit: src/sys/compat/linux/arch
Module Name:src
Committed By: njoly
Date: Wed Jun 17 14:20:08 UTC 2009
Modified Files:
src/sys/compat/linux/arch/alpha: linux_syscall.h linux_syscallargs.h
linux_syscalls.c linux_sysent.c
src/sys/compat/linux/arch/amd64: linux_syscall.h linux_syscallargs.h
linux_syscalls.c linux_sysent.c
src/sys/compat/linux/arch/mips: linux_syscall.h linux_syscallargs.h
linux_syscalls.c linux_sysent.c
Log Message:
Regen for sendmsg/recvmsg definitions update.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/compat/linux/arch/alpha/linux_syscall.h \
src/sys/compat/linux/arch/alpha/linux_sysent.c
cvs rdiff -u -r1.73 -r1.74 \
src/sys/compat/linux/arch/alpha/linux_syscallargs.h
cvs rdiff -u -r1.75 -r1.76 src/sys/compat/linux/arch/alpha/linux_syscalls.c
cvs rdiff -u -r1.33 -r1.34 src/sys/compat/linux/arch/amd64/linux_syscall.h \
src/sys/compat/linux/arch/amd64/linux_syscallargs.h \
src/sys/compat/linux/arch/amd64/linux_syscalls.c \
src/sys/compat/linux/arch/amd64/linux_sysent.c
cvs rdiff -u -r1.39 -r1.40 src/sys/compat/linux/arch/mips/linux_syscall.h
cvs rdiff -u -r1.38 -r1.39 src/sys/compat/linux/arch/mips/linux_syscallargs.h \
src/sys/compat/linux/arch/mips/linux_syscalls.c \
src/sys/compat/linux/arch/mips/linux_sysent.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/compat/linux/arch/alpha/linux_syscall.h
diff -u src/sys/compat/linux/arch/alpha/linux_syscall.h:1.74 src/sys/compat/linux/arch/alpha/linux_syscall.h:1.75
--- src/sys/compat/linux/arch/alpha/linux_syscall.h:1.74 Mon Jun 8 13:29:00 2009
+++ src/sys/compat/linux/arch/alpha/linux_syscall.h Wed Jun 17 14:20:08 2009
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscall.h,v 1.74 2009/06/08 13:29:00 njoly Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.75 2009/06/17 14:20:08 njoly Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.69 2009/06/08 13:26:57 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.70 2009/06/17 14:18:51 njoly Exp
*/
#ifndef _LINUX_SYS_SYSCALL_H_
@@ -216,10 +216,10 @@
/* syscall: "sigstack" ret: "int" args: "struct sigstack *" "struct sigstack *" */
#define LINUX_SYS_sigstack 112
-/* syscall: "recvmsg" ret: "ssize_t" args: "int" "struct msghdr *" "int" */
+/* syscall: "recvmsg" ret: "ssize_t" args: "int" "struct linux_msghdr *" "int" */
#define LINUX_SYS_recvmsg 113
-/* syscall: "sendmsg" ret: "ssize_t" args: "int" "const struct msghdr *" "int" */
+/* syscall: "sendmsg" ret: "ssize_t" args: "int" "const struct linux_msghdr *" "int" */
#define LINUX_SYS_sendmsg 114
/* syscall: "getsockopt" ret: "int" args: "int" "int" "int" "void *" "int *" */
Index: src/sys/compat/linux/arch/alpha/linux_sysent.c
diff -u src/sys/compat/linux/arch/alpha/linux_sysent.c:1.74 src/sys/compat/linux/arch/alpha/linux_sysent.c:1.75
--- src/sys/compat/linux/arch/alpha/linux_sysent.c:1.74 Mon Jun 8 13:29:00 2009
+++ src/sys/compat/linux/arch/alpha/linux_sysent.c Wed Jun 17 14:20:08 2009
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_sysent.c,v 1.74 2009/06/08 13:29:00 njoly Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.75 2009/06/17 14:20:08 njoly Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.69 2009/06/08 13:26:57 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.70 2009/06/17 14:18:51 njoly Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.74 2009/06/08 13:29:00 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.75 2009/06/17 14:20:08 njoly Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sysv.h"
Index: src/sys/compat/linux/arch/alpha/linux_syscallargs.h
diff -u src/sys/compat/linux/arch/alpha/linux_syscallargs.h:1.73 src/sys/compat/linux/arch/alpha/linux_syscallargs.h:1.74
--- src/sys/compat/linux/arch/alpha/linux_syscallargs.h:1.73 Mon Jun 8 13:29:00 2009
+++ src/sys/compat/linux/arch/alpha/linux_syscallargs.h Wed Jun 17 14:20:08 2009
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscallargs.h,v 1.73 2009/06/08 13:29:00 njoly Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.74 2009/06/17 14:20:08 njoly Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.69 2009/06/08 13:26:57 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.70 2009/06/17 14:18:51 njoly Exp
*/
#ifndef _LINUX_SYS_SYSCALLARGS_H_
@@ -300,14 +300,14 @@
struct linux_sys_recvmsg_args {
syscallarg(int) s;
- syscallarg(struct msghdr *) msg;
+ syscallarg(struct linux_msghdr *) msg;
syscallarg(int) flags;
};
check_syscall_args(linux_sys_recvmsg)
struct linux_sys_sendmsg_args {
syscallarg(int) s;
- syscallarg(const struct msghdr *) msg;
+ syscallarg(const s
CVS commit: src/sys/compat/linux
Module Name:src
Committed By: njoly
Date: Wed Jun 17 14:18:51 UTC 2009
Modified Files:
src/sys/compat/linux/arch/alpha: syscalls.master
src/sys/compat/linux/arch/amd64: syscalls.master
src/sys/compat/linux/arch/mips: syscalls.master
src/sys/compat/linux/common: linux_socket.c linux_socket.h
linux_socketcall.h
Log Message:
Add a new linux_msghdr structure, as its size differs on 64bit archs.
Do the needed conversions in sendmsg/recvmsg syscalls, and adjust
their definitions accordingly.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/compat/linux/arch/alpha/syscalls.master
cvs rdiff -u -r1.31 -r1.32 src/sys/compat/linux/arch/amd64/syscalls.master
cvs rdiff -u -r1.35 -r1.36 src/sys/compat/linux/arch/mips/syscalls.master
cvs rdiff -u -r1.103 -r1.104 src/sys/compat/linux/common/linux_socket.c
cvs rdiff -u -r1.17 -r1.18 src/sys/compat/linux/common/linux_socket.h
cvs rdiff -u -r1.15 -r1.16 src/sys/compat/linux/common/linux_socketcall.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/linux/arch/alpha/syscalls.master
diff -u src/sys/compat/linux/arch/alpha/syscalls.master:1.69 src/sys/compat/linux/arch/alpha/syscalls.master:1.70
--- src/sys/compat/linux/arch/alpha/syscalls.master:1.69 Mon Jun 8 13:26:57 2009
+++ src/sys/compat/linux/arch/alpha/syscalls.master Wed Jun 17 14:18:51 2009
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.69 2009/06/08 13:26:57 njoly Exp $
+ $NetBSD: syscalls.master,v 1.70 2009/06/17 14:18:51 njoly Exp $
;
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -233,10 +233,10 @@
;112 ALIAS osf1_sys_sigstack
112 NOARGS { int|compat_43_sys||sigstack(struct sigstack *nss, \
struct sigstack *oss); }
-113 STD { ssize_t|linux_sys||recvmsg(int s, struct msghdr *msg, \
-int flags); }
+113 STD { ssize_t|linux_sys||recvmsg(int s, \
+ struct linux_msghdr *msg, int flags); }
114 STD { ssize_t|linux_sys||sendmsg(int s, \
-const struct msghdr *msg, int flags); }
+const struct linux_msghdr *msg, int flags); }
115 UNIMPL
116 NODEF { int|osf1_sys||gettimeofday(struct osf1_timeval *tv, \
struct osf1_timezone *tzp); }
Index: src/sys/compat/linux/arch/amd64/syscalls.master
diff -u src/sys/compat/linux/arch/amd64/syscalls.master:1.31 src/sys/compat/linux/arch/amd64/syscalls.master:1.32
--- src/sys/compat/linux/arch/amd64/syscalls.master:1.31 Mon Jun 8 13:26:57 2009
+++ src/sys/compat/linux/arch/amd64/syscalls.master Wed Jun 17 14:18:51 2009
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.31 2009/06/08 13:26:57 njoly Exp $
+ $NetBSD: syscalls.master,v 1.32 2009/06/17 14:18:51 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -154,9 +154,9 @@
size_t len, int flags, struct osockaddr *from, \
unsigned int *fromlenaddr); }
46 STD { int|linux_sys||sendmsg(int s, \
- const struct msghdr *msg, int flags); }
+ const struct linux_msghdr *msg, int flags); }
47 STD { ssize_t|linux_sys||recvmsg(int s, \
- struct msghdr *msg, int flags); }
+ struct linux_msghdr *msg, int flags); }
48 NOARGS { int|sys||shutdown(int s, int how); }
49 STD { int|linux_sys||bind(int s, \
const struct osockaddr *name, \
Index: src/sys/compat/linux/arch/mips/syscalls.master
diff -u src/sys/compat/linux/arch/mips/syscalls.master:1.35 src/sys/compat/linux/arch/mips/syscalls.master:1.36
--- src/sys/compat/linux/arch/mips/syscalls.master:1.35 Mon Jun 8 13:26:57 2009
+++ src/sys/compat/linux/arch/mips/syscalls.master Wed Jun 17 14:18:51 2009
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.35 2009/06/08 13:26:57 njoly Exp $
+ $NetBSD: syscalls.master,v 1.36 2009/06/17 14:18:51 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -298,12 +298,12 @@
176 NOARGS { int|linux_sys||recvfrom(int s, void *buf, int len, \
int flags, struct osockaddr *from, \
int *fromlenaddr); }
-177 NOARGS { int|linux_sys||recvmsg(int s, struct msghdr *msg, \
- u_int flags); }
+177 NOARGS { int|linux_sys||recvmsg(int s, \
+ struct linux_msghdr *msg, u_int flags); }
178 NOARGS { int|linux_sys||send(int s, void *buf, int len, \
int flags); }
-179 NOARGS { int|linux_sys||sendmsg(int s, struct msghdr *msg, \
- u_int flags); }
+179 NOARGS { int|linux_sys||sendmsg(int s, \
+ struct linux_msghdr *msg, u_int flags); }
180 NOARGS { int|linux_sys||sendto(int s, void *msg, \
int len, int flags, struct osockaddr *to, \
int tolen); }
Index: src/sys/compat/linux/common/linux_socket.c
diff -u src/sys/compat/linux/common/linux_socket.c:1.103 src/sys/compat/linux/common/linux_socket.c:1.104
--- src/sys/compat/linux/common/linux_socket.c:1.103 Tue Jun 16 23:17:02 2009
+++ src/sys/compat/linux/common/linux_socket.c Wed Jun 17 14:18:51 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_socket.c,v 1.103 2009/06/16 23:17:
