CVS commit: src/bin/test

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Fri Aug 12 03:17:41 UTC 2016

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

Log Message:
Document the version test first appeared.
Bump date.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/bin/test/test.1

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

Modified files:

Index: src/bin/test/test.1
diff -u src/bin/test/test.1:1.29 src/bin/test/test.1:1.30
--- src/bin/test/test.1:1.29	Fri May 27 05:50:07 2016
+++ src/bin/test/test.1	Fri Aug 12 03:17:41 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: test.1,v 1.29 2016/05/27 05:50:07 dholland Exp $
+.\"	$NetBSD: test.1,v 1.30 2016/08/12 03:17:41 sevan Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\" @(#)test.1	8.1 (Berkeley) 5/31/93
 .\"
-.Dd December 16, 2012
+.Dd August 12, 2016
 .Dt TEST 1
 .Os
 .Sh NAME
@@ -313,6 +313,11 @@ The
 utility implements a superset of the
 .St -p1003.2
 specification.
+.Sh HISTORY
+A
+.Nm
+utility appeared in
+.At v7 .
 .Sh CAVEATS
 The
 .Nm

CVS commit: src/bin/sync

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Fri Aug 12 02:59:23 UTC 2016

Modified Files:
src/bin/sync: sync.8

Log Message:
sync was there from v4.
Confirmed from the TUHS hosted copies of man pages.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/bin/sync/sync.8

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

Modified files:

Index: src/bin/sync/sync.8
diff -u src/bin/sync/sync.8:1.15 src/bin/sync/sync.8:1.16
--- src/bin/sync/sync.8:1.15	Thu Aug  7 09:05:42 2003
+++ src/bin/sync/sync.8	Fri Aug 12 02:59:23 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sync.8,v 1.15 2003/08/07 09:05:42 agc Exp $
+.\"	$NetBSD: sync.8,v 1.16 2016/08/12 02:59:23 sevan Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	@(#)sync.8	8.1 (Berkeley) 5/31/93
 .\"
-.Dd May 31, 1993
+.Dd August 12, 2016
 .Dt SYNC 8
 .Os
 .Sh NAME
@@ -69,4 +69,4 @@ system call.
 A
 .Nm
 command appeared in
-.At v6 .
+.At v4 .

CVS commit: src/bin/stty

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Fri Aug 12 02:49:18 UTC 2016

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

Log Message:
Document the version stty first appeared.
Bump date.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/bin/stty/stty.1

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

Modified files:

Index: src/bin/stty/stty.1
diff -u src/bin/stty/stty.1:1.41 src/bin/stty/stty.1:1.42
--- src/bin/stty/stty.1:1.41	Wed Jun 20 14:19:39 2012
+++ src/bin/stty/stty.1	Fri Aug 12 02:49:18 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: stty.1,v 1.41 2012/06/20 14:19:39 wiz Exp $
+.\"	$NetBSD: stty.1,v 1.42 2016/08/12 02:49:18 sevan Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\" @(#)stty.1	8.5 (Berkeley) 6/1/94
 .\"
-.Dd June 16, 2012
+.Dd August 12, 2016
 .Dt STTY 1
 .Os
 .Sh NAME
@@ -633,3 +633,8 @@ and
 flags are
 extensions to the standard, as are the operands mentioned in the control
 operations section.
+.Sh HISTORY
+An
+.Nm
+utility appeared in
+.At v3 .

CVS commit: src/bin/sleep

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Fri Aug 12 02:36:38 UTC 2016

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

Log Message:
Document the version sleep first appeared.
Bump date.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/bin/sleep/sleep.1

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

Modified files:

Index: src/bin/sleep/sleep.1
diff -u src/bin/sleep/sleep.1:1.22 src/bin/sleep/sleep.1:1.23
--- src/bin/sleep/sleep.1:1.22	Mon Aug 15 14:45:36 2011
+++ src/bin/sleep/sleep.1	Fri Aug 12 02:36:38 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sleep.1,v 1.22 2011/08/15 14:45:36 wiz Exp $
+.\"	$NetBSD: sleep.1,v 1.23 2016/08/12 02:36:38 sevan Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"	@(#)sleep.1	8.3 (Berkeley) 4/18/94
 .\"
-.Dd August 13, 2011
+.Dd August 12, 2016
 .Dt SLEEP 1
 .Os
 .Sh NAME
@@ -121,3 +121,8 @@ The
 command is expected to be
 .St -p1003.2
 compatible.
+.Sh HISTORY
+A
+.Nm
+utility appeared in
+.At v4 .

CVS commit: src/bin/rmdir

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Fri Aug 12 02:30:37 UTC 2016

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

Log Message:
Document the version rmdir first appeared.
Bump date.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/bin/rmdir/rmdir.1

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

Modified files:

Index: src/bin/rmdir/rmdir.1
diff -u src/bin/rmdir/rmdir.1:1.15 src/bin/rmdir/rmdir.1:1.16
--- src/bin/rmdir/rmdir.1:1.15	Thu Aug  7 09:05:29 2003
+++ src/bin/rmdir/rmdir.1	Fri Aug 12 02:30:37 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: rmdir.1,v 1.15 2003/08/07 09:05:29 agc Exp $
+.\"	$NetBSD: rmdir.1,v 1.16 2016/08/12 02:30:37 sevan Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"	@(#)rmdir.1	8.1 (Berkeley) 5/31/93
 .\"
-.Dd May 31, 1993
+.Dd August 12, 2016
 .Dt RMDIR 1
 .Os
 .Sh NAME
@@ -88,3 +88,8 @@ The
 utility is expected to be
 .St -p1003.2
 compatible.
+.Sh HISTORY
+An
+.Nm
+utility appeared in
+.At v1 .

CVS commit: src/bin/rm

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Fri Aug 12 02:26:42 UTC 2016

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

Log Message:
Document the version rm first appeared.
Bump date.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/bin/rm/rm.1

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

Modified files:

Index: src/bin/rm/rm.1
diff -u src/bin/rm/rm.1:1.27 src/bin/rm/rm.1:1.28
--- src/bin/rm/rm.1:1.27	Fri Apr 26 19:34:34 2013
+++ src/bin/rm/rm.1	Fri Aug 12 02:26:42 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: rm.1,v 1.27 2013/04/26 19:34:34 wiz Exp $
+.\"	$NetBSD: rm.1,v 1.28 2016/08/12 02:26:42 sevan Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994, 2003
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"	@(#)rm.1	8.5 (Berkeley) 12/5/94
 .\"
-.Dd April 26, 2013
+.Dd August 12, 2016
 .Dt RM 1
 .Os
 .Sh NAME
@@ -190,6 +190,11 @@ magnetic disk.
 .Em Because these requirements are not met, the
 .Fl P
 .Em option does not conform to the standard .
+.Sh HISTORY
+An
+.Nm
+utility appeared in
+.At v1 .
 .Sh BUGS
 The
 .Fl P

CVS commit: src/sys/arch/ia64/ia64

[Sean Cole]

Module Name:src
Committed By:   scole
Date:   Fri Aug 12 02:08:20 UTC 2016

Modified Files:
src/sys/arch/ia64/ia64: vm_machdep.c

Log Message:
Add volatile flag which might help with ski emulator and longjmp, ok'ed by 



To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ia64/ia64/vm_machdep.c

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

Modified files:

Index: src/sys/arch/ia64/ia64/vm_machdep.c
diff -u src/sys/arch/ia64/ia64/vm_machdep.c:1.11 src/sys/arch/ia64/ia64/vm_machdep.c:1.12
--- src/sys/arch/ia64/ia64/vm_machdep.c:1.11	Thu Feb 10 14:46:46 2011
+++ src/sys/arch/ia64/ia64/vm_machdep.c	Fri Aug 12 02:08:20 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.11 2011/02/10 14:46:46 pooka Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.12 2016/08/12 02:08:20 scole Exp $	*/
 
 /*
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -84,7 +84,7 @@ cpu_lwp_fork(struct lwp *l1, struct lwp 
 void (*func)(void *), void *arg)
 {
 	struct pcb *pcb1, *pcb2;
-	struct trapframe *tf;
+	struct trapframe * volatile tf;
 
 	pcb1 = lwp_getpcb(l1);
 	pcb2 = lwp_getpcb(l2);

CVS commit: src/bin/pwd

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Fri Aug 12 02:03:26 UTC 2016

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

Log Message:
Document the version pwd first appeared.
Bump date.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/bin/pwd/pwd.1

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

Modified files:

Index: src/bin/pwd/pwd.1
diff -u src/bin/pwd/pwd.1:1.24 src/bin/pwd/pwd.1:1.25
--- src/bin/pwd/pwd.1:1.24	Thu Oct 30 14:58:23 2003
+++ src/bin/pwd/pwd.1	Fri Aug 12 02:03:26 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pwd.1,v 1.24 2003/10/30 14:58:23 wiz Exp $
+.\"	$NetBSD: pwd.1,v 1.25 2016/08/12 02:03:26 sevan Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\" @(#)pwd.1	8.2 (Berkeley) 4/28/95
 .\"
-.Dd October 30, 2003
+.Dd August 12, 2016
 .Dt PWD 1
 .Os
 .Sh NAME
@@ -87,6 +87,11 @@ except that the default is
 .Fl P
 not
 .Fl L .
+.Sh HISTORY
+A
+.Nm
+utility appeared in
+.At v5 .
 .Sh BUGS
 In
 .Xr csh 1

CVS commit: src/bin/pax

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Fri Aug 12 01:52:22 UTC 2016

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

Log Message:
Document the version pax first appeared.
Bump date.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/bin/pax/pax.1

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

Modified files:

Index: src/bin/pax/pax.1
diff -u src/bin/pax/pax.1:1.67 src/bin/pax/pax.1:1.68
--- src/bin/pax/pax.1:1.67	Sat Dec 19 18:48:41 2015
+++ src/bin/pax/pax.1	Fri Aug 12 01:52:22 2016
@@ -1,4 +1,4 @@
-.\"$NetBSD: pax.1,v 1.67 2015/12/19 18:48:41 wiz Exp $
+.\"$NetBSD: pax.1,v 1.68 2016/08/12 01:52:22 sevan Exp $
 .\"
 .\" Copyright (c) 1992 Keith Muller.
 .\" Copyright (c) 1992, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"	@(#)pax.1	8.4 (Berkeley) 4/18/94
 .\"
-.Dd December 19, 2015
+.Dd August 12, 2016
 .Dt PAX 1
 .Os
 .Sh NAME
@@ -1290,6 +1290,11 @@ and
 operations are extensions to the
 .Tn POSIX
 standard.
+.Sh HISTORY
+A
+.Nm
+utility appeared in
+.Bx 4.4 .
 .Sh AUTHORS
 .An -nosplit
 .An Keith Muller

CVS commit: src/external/mit/xorg/server/xorg-server

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Fri Aug 12 01:15:52 UTC 2016

Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile Makefile.Xserver
src/external/mit/xorg/server/xorg-server/fb: Makefile.fb
src/external/mit/xorg/server/xorg-server/glx: Makefile.glx
src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/fb:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/wfb:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/i2c: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/vbe: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86config:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile
src/external/mit/xorg/server/xorg-server/include: Makefile
src/external/mit/xorg/server/xorg-server/mi: Makefile
src/external/mit/xorg/server/xorg-server/os: Makefile
src/external/mit/xorg/server/xorg-server/randr: Makefile
Added Files:
src/external/mit/xorg/server/xorg-server/dri3: Makefile
src/external/mit/xorg/server/xorg-server/present: Makefile
src/external/mit/xorg/server/xorg-server/pseudoramiX: Makefile
Removed Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/GLcore:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/afb:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/cfb:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/cfb32:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/freetype:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/mfb:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/record:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/type1:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xtrap:
Makefile

Log Message:
round do of reach over updates for xorg-server 1.18.  again, untested,
but this should be much closer to complete for the necessary changes.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/external/mit/xorg/server/xorg-server/Makefile
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/xorg-server/Makefile.Xserver
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/server/xorg-server/dri3/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/xorg-server/fb/Makefile.fb
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
cvs rdiff -u -r1.1 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/GLcore/Makefile
cvs rdiff -u -r1.1 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/afb/Makefile
cvs rdiff -u -r1.2 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/cfb/Makefile
cvs rdiff -u -r1.2 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/cfb32/Makefile
cvs rdiff -u -r1.6 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile
cvs rdiff -u -r1.11 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/fb/Makefile
cvs rdiff -u -r1.3 -r0 \

src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/freetype/Makefile
cvs rdiff -u -r1.3 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/mfb/Makefile
cvs rdiff -u -r1.3 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/record/Makefile
cvs rdiff -u -r1.2 -r0 \

CVS commit: src/bin/kill

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Thu Aug 11 22:10:01 UTC 2016

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

Log Message:
Bump date


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/bin/kill/kill.1

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

Modified files:

Index: src/bin/kill/kill.1
diff -u src/bin/kill/kill.1:1.24 src/bin/kill/kill.1:1.25
--- src/bin/kill/kill.1:1.24	Thu Aug 11 21:56:55 2016
+++ src/bin/kill/kill.1	Thu Aug 11 22:10:01 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: kill.1,v 1.24 2016/08/11 21:56:55 sevan Exp $
+.\"	$NetBSD: kill.1,v 1.25 2016/08/11 22:10:01 sevan Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"	@(#)kill.1	8.2 (Berkeley) 4/28/95
 .\"
-.Dd April 28, 1995
+.Dd August 11, 2016
 .Dt KILL 1
 .Os
 .Sh NAME

CVS commit: src/bin/kill

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Thu Aug 11 21:56:55 UTC 2016

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

Log Message:
Earliest reference of kill in the TUHS archive is v3 AT UNIX.
Unfortunately only the source code for the compiler is present for that
release. The v2 archive is missing the manuals & only contains a some of the
commands.
Switch to v3 and reference manual category eight.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/bin/kill/kill.1

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

Modified files:

Index: src/bin/kill/kill.1
diff -u src/bin/kill/kill.1:1.23 src/bin/kill/kill.1:1.24
--- src/bin/kill/kill.1:1.23	Thu Aug 11 21:41:17 2016
+++ src/bin/kill/kill.1	Thu Aug 11 21:56:55 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: kill.1,v 1.23 2016/08/11 21:41:17 sevan Exp $
+.\"	$NetBSD: kill.1,v 1.24 2016/08/11 21:56:55 sevan Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -147,4 +147,5 @@ compatible.
 A
 .Nm
 command appeared in
-.At v6 .
+.At v3
+in section 8 of the manual.

CVS commit: src/bin/kill

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Thu Aug 11 21:41:17 UTC 2016

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

Log Message:
Pp not required before Bd, picked up by mandoc lint


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/bin/kill/kill.1

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

Modified files:

Index: src/bin/kill/kill.1
diff -u src/bin/kill/kill.1:1.22 src/bin/kill/kill.1:1.23
--- src/bin/kill/kill.1:1.22	Thu Mar 22 07:58:17 2012
+++ src/bin/kill/kill.1	Thu Aug 11 21:41:17 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: kill.1,v 1.22 2012/03/22 07:58:17 wiz Exp $
+.\"	$NetBSD: kill.1,v 1.23 2016/08/11 21:41:17 sevan Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -63,7 +63,6 @@ by the pid operand(s).
 Only the super-user may send signals to other users' processes.
 .Pp
 The options are as follows:
-.Pp
 .Bl -tag -width Ds
 .It Fl s Ar signal_name
 A symbolic signal name specifying the signal to be sent instead of the

CVS commit: src/tests/lib/libc/gen

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Thu Aug 11 21:34:11 UTC 2016

Modified Files:
src/tests/lib/libc/gen: t_sleep.c

Log Message:
Correct use of incorrect errno - should have no real practical effect.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/lib/libc/gen/t_sleep.c

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

Modified files:

Index: src/tests/lib/libc/gen/t_sleep.c
diff -u src/tests/lib/libc/gen/t_sleep.c:1.8 src/tests/lib/libc/gen/t_sleep.c:1.9
--- src/tests/lib/libc/gen/t_sleep.c:1.8	Tue Jul 15 14:56:34 2014
+++ src/tests/lib/libc/gen/t_sleep.c	Thu Aug 11 21:34:11 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: t_sleep.c,v 1.8 2014/07/15 14:56:34 gson Exp $ */
+/* $NetBSD: t_sleep.c,v 1.9 2016/08/11 21:34:11 kre Exp $ */
 
 /*-
  * Copyright (c) 2006 Frank Kardel
@@ -171,7 +171,8 @@ do_kevent(struct timespec *delay, struct
 	(void)close(kq);
 
 	if (rtc == -1) {
-		ATF_REQUIRE_MSG(kerrno == EINTR, "kevent: %s", strerror(errno));
+		ATF_REQUIRE_MSG(kerrno == EINTR, "kevent: %s",
+		strerror(kerrno));
 		return 0;
 	}
 

CVS commit: src/tests/lib/librumphijack

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Thu Aug 11 21:29:44 UTC 2016

Modified Files:
src/tests/lib/librumphijack: t_tcpip.sh

Log Message:
One more -lrumpdev


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/tests/lib/librumphijack/t_tcpip.sh

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

Modified files:

Index: src/tests/lib/librumphijack/t_tcpip.sh
diff -u src/tests/lib/librumphijack/t_tcpip.sh:1.16 src/tests/lib/librumphijack/t_tcpip.sh:1.17
--- src/tests/lib/librumphijack/t_tcpip.sh:1.16	Tue Dec 29 07:17:19 2015
+++ src/tests/lib/librumphijack/t_tcpip.sh	Thu Aug 11 21:29:44 2016
@@ -1,4 +1,4 @@
-#   $NetBSD: t_tcpip.sh,v 1.16 2015/12/29 07:17:19 pgoyette Exp $
+#   $NetBSD: t_tcpip.sh,v 1.17 2016/08/11 21:29:44 kre Exp $
 #
 # Copyright (c) 2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -25,7 +25,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-rumpnetsrv='rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet'
+rumpnetsrv='rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpdev'
 export RUMP_SERVER=unix://csock
 
 atf_test_case http cleanup
@@ -205,7 +205,7 @@ test_nfs()
 	unset LD_PRELOAD
 
 	# at least the kernel server is easier
-	atf_check -s exit:0 rump_server -lrumpvfs -lrumpnet		\
+	atf_check -s exit:0 rump_server -lrumpvfs -lrumpnet -lrumpdev	\
 	-lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif -lrumpfs_nfs\
 	${RUMP_SERVER}
 
@@ -232,7 +232,7 @@ nfs_head()
 nfs_body()
 {
 	test_nfs -lrumpvfs -lrumpdev -lrumpnet -lrumpnet_net		\
-	-lrumpnet_netinet -lrumpnet_local -lrumpnet_shmif		\
+	-lrumpnet_netinet -lrumpnet_local -lrumpnet_shmif -lrumpdev	\
 	-lrumpdev_disk -lrumpfs_ffs -lrumpfs_nfs -lrumpfs_nfsserver	\
 	-d key=/dk,hostpath=ffs.img,size=host
 }
@@ -254,7 +254,7 @@ nfs_autoload_body()
 {
 	[ `uname -m` = "i386" ] || atf_skip "test currently valid only on i386"
 	test_nfs -lrumpvfs -lrumpdev -lrumpnet -lrumpnet_net		\
-	-lrumpnet_netinet -lrumpnet_local -lrumpnet_shmif		\
+	-lrumpnet_netinet -lrumpnet_local -lrumpnet_shmif -lrumpdev	\
 	-lrumpdev_disk -d key=/dk,hostpath=ffs.img,size=host
 }
 

CVS commit: src/usr.bin/make

[Simon J. Gerraty]

Module Name:src
Committed By:   sjg
Date:   Thu Aug 11 19:53:18 UTC 2016

Modified Files:
src/usr.bin/make: main.c

Log Message:
PR: 51405
Description:

addErrorCMD: in compat mode, cmdp may be NULL, skip it
and stop the calls (return 1).


To generate a diff of this commit:
cvs rdiff -u -r1.249 -r1.250 src/usr.bin/make/main.c

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

Modified files:

Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.249 src/usr.bin/make/main.c:1.250
--- src/usr.bin/make/main.c:1.249	Wed Aug 10 23:49:12 2016
+++ src/usr.bin/make/main.c	Thu Aug 11 19:53:17 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.249 2016/08/10 23:49:12 sjg Exp $	*/
+/*	$NetBSD: main.c,v 1.250 2016/08/11 19:53:17 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.249 2016/08/10 23:49:12 sjg Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.250 2016/08/11 19:53:17 sjg Exp $";
 #else
 #include 
 #ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
 #if 0
 static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.249 2016/08/10 23:49:12 sjg Exp $");
+__RCSID("$NetBSD: main.c,v 1.250 2016/08/11 19:53:17 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1892,6 +1892,8 @@ PrintAddr(void *a, void *b)
 static int
 addErrorCMD(void *cmdp, void *gnp)
 {
+if (cmdp == NULL)
+	return 1;			/* stop */
 Var_Append(".ERROR_CMD", cmdp, VAR_GLOBAL);
 return 0;
 }

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

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Thu Aug 11 15:45:39 UTC 2016

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

Log Message:
Use absolute addressing mode, just like the rest.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amd64/include/i82093reg.h

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

Modified files:

Index: src/sys/arch/amd64/include/i82093reg.h
diff -u src/sys/arch/amd64/include/i82093reg.h:1.5 src/sys/arch/amd64/include/i82093reg.h:1.6
--- src/sys/arch/amd64/include/i82093reg.h:1.5	Thu Jul  3 14:02:25 2008
+++ src/sys/arch/amd64/include/i82093reg.h	Thu Aug 11 15:45:39 2016
@@ -1,4 +1,4 @@
-/*	 $NetBSD: i82093reg.h,v 1.5 2008/07/03 14:02:25 drochner Exp $ */
+/*	 $NetBSD: i82093reg.h,v 1.6 2016/08/11 15:45:39 maxv Exp $ */
 
 #include 
 
@@ -9,7 +9,7 @@
 #endif
 
 #define ioapic_asm_ack(num) \
-	movl	$0,(_C_LABEL(local_apic)+LAPIC_EOI)(%rip)
+	movl	$0,_C_LABEL(local_apic)+LAPIC_EOI
 
 #ifdef MULTIPROCESSOR
 

CVS commit: src/sys/arch/xen/x86

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Thu Aug 11 15:35:10 UTC 2016

Modified Files:
src/sys/arch/xen/x86: x86_xpmap.c

Log Message:
Make the I/O area non-executable on Xen.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/xen/x86/x86_xpmap.c

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

Modified files:

Index: src/sys/arch/xen/x86/x86_xpmap.c
diff -u src/sys/arch/xen/x86/x86_xpmap.c:1.58 src/sys/arch/xen/x86/x86_xpmap.c:1.59
--- src/sys/arch/xen/x86/x86_xpmap.c:1.58	Wed Aug  3 11:51:18 2016
+++ src/sys/arch/xen/x86/x86_xpmap.c	Thu Aug 11 15:35:10 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: x86_xpmap.c,v 1.58 2016/08/03 11:51:18 maxv Exp $	*/
+/*	$NetBSD: x86_xpmap.c,v 1.59 2016/08/11 15:35:10 maxv Exp $	*/
 
 /*
  * Copyright (c) 2006 Mathieu Ropert 
@@ -69,7 +69,7 @@
 
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.58 2016/08/03 11:51:18 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.59 2016/08/11 15:35:10 maxv Exp $");
 
 #include "opt_xen.h"
 #include "opt_ddb.h"
@@ -913,6 +913,7 @@ xen_bootstrap_tables(vaddr_t old_pgd, va
 			page < (vaddr_t)atdevbase + IOM_SIZE) {
 pte[pl1_pi(page)] =
 IOM_BEGIN + (page - (vaddr_t)atdevbase);
+pte[pl1_pi(page)] |= pg_nx;
 			}
 #endif
 

CVS commit: src/sys/net

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Aug 11 15:16:07 UTC 2016

Modified Files:
src/sys/net: if_pppoe.c

Log Message:
kill unknown sessions ifdef, link set for sysctl.


To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/sys/net/if_pppoe.c

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

Modified files:

Index: src/sys/net/if_pppoe.c
diff -u src/sys/net/if_pppoe.c:1.116 src/sys/net/if_pppoe.c:1.117
--- src/sys/net/if_pppoe.c:1.116	Mon Aug  8 03:23:27 2016
+++ src/sys/net/if_pppoe.c	Thu Aug 11 11:16:07 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.c,v 1.116 2016/08/08 07:23:27 roy Exp $ */
+/* $NetBSD: if_pppoe.c,v 1.117 2016/08/11 15:16:07 christos Exp $ */
 
 /*-
  * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.116 2016/08/08 07:23:27 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.117 2016/08/11 15:16:07 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "pppoe.h"
@@ -64,9 +64,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v
 
 #include "ioconf.h"
 
-#undef PPPOE_DEBUG		/* XXX - remove this or make it an option */
-/* #define PPPOE_DEBUG 1 */
-
 struct pppoehdr {
 	uint8_t vertype;
 	uint8_t code;
@@ -205,15 +202,10 @@ static LIST_HEAD(pppoe_softc_head, pppoe
 static int	pppoe_clone_create(struct if_clone *, int);
 static int	pppoe_clone_destroy(struct ifnet *);
 
-#ifdef PPPOE_TERM_UNKNOWN_SESSIONS
 static bool	pppoe_term_unknown = false;
-#endif
 
-#ifdef _MODULE
 static struct sysctllog	*pppoe_sysctl_clog;
-#endif
-
-SYSCTL_SETUP_PROTO(sysctl_net_pppoe_setup);
+static void sysctl_net_pppoe_setup(struct sysctllog **);
 
 static struct if_clone pppoe_cloner =
 IF_CLONE_INITIALIZER("pppoe", pppoe_clone_create, pppoe_clone_destroy);
@@ -238,9 +230,7 @@ pppoeinit(void)
 
 	pppoe_softintr = softint_establish(SOFTINT_NET, pppoe_softintr_handler,
 	NULL);
-#ifdef _MODULE
 	sysctl_net_pppoe_setup(_sysctl_clog);
-#endif
 }
 
 static int
@@ -255,9 +245,7 @@ pppoedetach(void)
 		if_clone_detach(_cloner);
 		softint_disestablish(pppoe_softintr);
 		/* Remove our sysctl sub-tree */
-#ifdef _MODULE
 		sysctl_teardown(_sysctl_clog);
-#endif
 	}
 
 	return error;
@@ -815,15 +803,13 @@ pppoe_data_input(struct mbuf *m)
 	struct pppoehdr *ph;
 	struct ifnet *rcvif;
 	struct psref psref;
-#ifdef PPPOE_TERM_UNKNOWN_SESSIONS
 	uint8_t shost[ETHER_ADDR_LEN];
-#endif
 
 	KASSERT(m->m_flags & M_PKTHDR);
 
-#ifdef PPPOE_TERM_UNKNOWN_SESSIONS
-	memcpy(shost, mtod(m, struct ether_header*)->ether_shost, ETHER_ADDR_LEN);
-#endif
+	if (pppoe_term_unknown)
+		memcpy(shost, mtod(m, struct ether_header*)->ether_shost,
+		ETHER_ADDR_LEN);
 	m_adj(m, sizeof(struct ether_header));
 	if (m->m_pkthdr.len <= PPPOE_HEADERLEN) {
 		printf("pppoe (data): dropping too short packet: %d bytes\n",
@@ -854,13 +840,11 @@ pppoe_data_input(struct mbuf *m)
 		goto drop;
 	sc = pppoe_find_softc_by_session(session, rcvif);
 	if (sc == NULL) {
-#ifdef PPPOE_TERM_UNKNOWN_SESSIONS
 		if (pppoe_term_unknown) {
-			printf("pppoe: input for unknown session 0x%x, "
+			printf("pppoe: input for unknown session %#x, "
 			"sending PADT\n", session);
 			pppoe_send_padt(rcvif, session, shost);
 		}
-#endif
 		m_put_rcvif_psref(rcvif, );
 		goto drop;
 	}
@@ -1671,7 +1655,8 @@ pppoedisc_input(struct ifnet *ifp, struc
 	return;
 }
 
-SYSCTL_SETUP(sysctl_net_pppoe_setup, "sysctl net.pppoe subtree setup")
+static void
+sysctl_net_pppoe_setup(struct sysctllog **clog)
 {
 	const struct sysctlnode *node = NULL;
 
@@ -1685,14 +1670,12 @@ SYSCTL_SETUP(sysctl_net_pppoe_setup, "sy
 	if (node == NULL)
 		return;
 
-#ifdef PPPOE_TERM_UNKNOWN_SESSIONS
 	sysctl_createv(clog, 0, , NULL,
 	CTLFLAG_PERMANENT | CTLFLAG_READONLY,
 	CTLTYPE_BOOL, "term_unknown",
 	SYSCTL_DESCR("Terminate unknown sessions"),
 	NULL, 0, _term_unknown, sizeof(pppoe_term_unknown),
 	CTL_CREATE, CTL_EOL);
-#endif
 }
 
 /*

CVS commit: src/sys/conf

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Aug 11 15:16:54 UTC 2016

Modified Files:
src/sys/conf: files

Log Message:
defopt PPPOE_DEBUG kill unknown sessions


To generate a diff of this commit:
cvs rdiff -u -r1.1161 -r1.1162 src/sys/conf/files

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

Modified files:

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1161 src/sys/conf/files:1.1162
--- src/sys/conf/files:1.1161	Sun Aug  7 06:44:04 2016
+++ src/sys/conf/files	Thu Aug 11 11:16:54 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1161 2016/08/07 10:44:04 christos Exp $
+#	$NetBSD: files,v 1.1162 2016/08/11 15:16:54 christos Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20150846
@@ -246,7 +246,7 @@ defflag	opt_ppp.h		PPP_DEFLATE PPP_BSDCO
 		# Include deflate or bsd
 		# compression, enable pppd
 		# packet filtering support
-defflag opt_pppoe.h		PPPOE_SERVER PPPOE_TERM_UNKNOWN_SESSIONS
+defflag opt_pppoe.h		PPPOE_SERVER PPPOE_DEBUG
 
 # networking options
 #

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

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Thu Aug 11 15:03:23 UTC 2016

Modified Files:
src/sys/arch/i386/i386: trap.c

Log Message:
This should be VM_MIN_KERNEL_ADDRESS, not KERNBASE.


To generate a diff of this commit:
cvs rdiff -u -r1.277 -r1.278 src/sys/arch/i386/i386/trap.c

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

Modified files:

Index: src/sys/arch/i386/i386/trap.c
diff -u src/sys/arch/i386/i386/trap.c:1.277 src/sys/arch/i386/i386/trap.c:1.278
--- src/sys/arch/i386/i386/trap.c:1.277	Thu Aug 11 14:58:29 2016
+++ src/sys/arch/i386/i386/trap.c	Thu Aug 11 15:03:23 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.277 2016/08/11 14:58:29 maxv Exp $	*/
+/*	$NetBSD: trap.c,v 1.278 2016/08/11 15:03:23 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000, 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.277 2016/08/11 14:58:29 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.278 2016/08/11 15:03:23 maxv Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -582,7 +582,7 @@ faultcommon:
 		 * The last can occur during an exec() copyin where the
 		 * argument space is lazy-allocated.
 		 */
-		if (type == T_PAGEFLT && va >= KERNBASE)
+		if (type == T_PAGEFLT && va >= VM_MIN_KERNEL_ADDRESS)
 			map = kernel_map;
 		else
 			map = >vm_map;

CVS commit: src/sys/arch

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Thu Aug 11 14:58:29 UTC 2016

Modified Files:
src/sys/arch/amd64/amd64: trap.c
src/sys/arch/i386/i386: trap.c

Log Message:
Reduce the diff, and typo.


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/amd64/amd64/trap.c
cvs rdiff -u -r1.276 -r1.277 src/sys/arch/i386/i386/trap.c

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

Modified files:

Index: src/sys/arch/amd64/amd64/trap.c
diff -u src/sys/arch/amd64/amd64/trap.c:1.83 src/sys/arch/amd64/amd64/trap.c:1.84
--- src/sys/arch/amd64/amd64/trap.c:1.83	Sun Dec 13 15:53:05 2015
+++ src/sys/arch/amd64/amd64/trap.c	Thu Aug 11 14:58:29 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.83 2015/12/13 15:53:05 maxv Exp $	*/
+/*	$NetBSD: trap.c,v 1.84 2016/08/11 14:58:29 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.83 2015/12/13 15:53:05 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.84 2016/08/11 14:58:29 maxv Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -374,7 +374,7 @@ kernelfault:
 		case 0x848e:	/* mov 0xa8(%rsp),%es (8e 84 24 a8 00 00 00) */
 		case 0x9c8e:	/* mov 0xb0(%rsp),%ds (8e 9c 24 b0 00 00 00) */
 			/*
-			 * We faulted loading one if the user segment registers.
+			 * We faulted loading one of the user segment registers.
 			 * The stack frame containing the user registers is
 			 * still valid and pointed to by tf_rsp.
 			 * Maybe we should check the iretq follows.

Index: src/sys/arch/i386/i386/trap.c
diff -u src/sys/arch/i386/i386/trap.c:1.276 src/sys/arch/i386/i386/trap.c:1.277
--- src/sys/arch/i386/i386/trap.c:1.276	Wed Dec 16 18:54:03 2015
+++ src/sys/arch/i386/i386/trap.c	Thu Aug 11 14:58:29 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.276 2015/12/16 18:54:03 maxv Exp $	*/
+/*	$NetBSD: trap.c,v 1.277 2016/08/11 14:58:29 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000, 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.276 2015/12/16 18:54:03 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.277 2016/08/11 14:58:29 maxv Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -116,7 +116,7 @@ __KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.2
 #include 
 
 /*
- * This is a hook which is initialised by the dtrace module
+ * This is a hook which is initialized by the dtrace module
  * to handle traps which might occur during DTrace probe
  * execution.
  */
@@ -291,8 +291,7 @@ trap(struct trapframe *frame)
 		trap_print(frame, l);
 	}
 #endif
-	if (type != T_NMI &&
-	!KERNELMODE(frame->tf_cs, frame->tf_eflags)) {
+	if (type != T_NMI && !KERNELMODE(frame->tf_cs, frame->tf_eflags)) {
 		type |= T_USER;
 		l->l_md.md_regs = frame;
 		pcb->pcb_cr2 = 0;
@@ -322,9 +321,6 @@ trap(struct trapframe *frame)
 
 	switch (type) {
 
-	case T_ASTFLT:
-		/*FALLTHROUGH*/
-
 	default:
 	we_re_toast:
 		if (type == T_TRCTRAP)
@@ -409,7 +405,7 @@ kernelfault:
 goto we_re_toast;
 			}
 			/*
-			 * We faulted loading one if the user segment registers.
+			 * We faulted loading one of the user segment registers.
 			 * The stack frame containing the user registers is
 			 * still valid and is just below the %eip:%cs:%fl of
 			 * the kernel fault frame.

CVS commit: src/distrib/sets/lists/comp

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Aug 11 14:48:48 UTC 2016

Modified Files:
src/distrib/sets/lists/comp: mi

Log Message:
finally got rid of lint in osnet files.


To generate a diff of this commit:
cvs rdiff -u -r1.2055 -r1.2056 src/distrib/sets/lists/comp/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/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2055 src/distrib/sets/lists/comp/mi:1.2056
--- src/distrib/sets/lists/comp/mi:1.2055	Fri Aug  5 20:02:33 2016
+++ src/distrib/sets/lists/comp/mi	Thu Aug 11 10:48:47 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2055 2016/08/06 00:02:33 jakllsch Exp $
+#	$NetBSD: mi,v 1.2056 2016/08/11 14:48:47 christos Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.compcomp-sys-root
@@ -3667,7 +3667,7 @@
 ./usr/libdata/lint/llib-lcrypto_idea.ln		comp-obsolete		obsolete
 ./usr/libdata/lint/llib-lcrypto_mdc2.ln		comp-obsolete		obsolete
 ./usr/libdata/lint/llib-lcrypto_rc5.ln		comp-c-lintlib		lint,crypto_rc5
-./usr/libdata/lint/llib-lctf.ln			comp-c-lintlib		lint,ctf
+./usr/libdata/lint/llib-lctf.ln			comp-obsolete		obsolete
 ./usr/libdata/lint/llib-lcurses.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-ldes.ln			comp-c-lintlib		lint,crypto
 ./usr/libdata/lint/llib-ldm.ln			comp-c-lintlib		lint

CVS commit: src/sys/net

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Thu Aug 11 13:57:02 UTC 2016

Modified Files:
src/sys/net: if_loop.c

Log Message:
Avoid init'ing lo0 twice ... which rump kernels do without this hack.
If rump gets fixed, this could be removed (though it is harmless in
any case.)

This should fix several more of the currently failing ATF tests.


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/net/if_loop.c

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

Modified files:

Index: src/sys/net/if_loop.c
diff -u src/sys/net/if_loop.c:1.91 src/sys/net/if_loop.c:1.92
--- src/sys/net/if_loop.c:1.91	Wed Aug 10 10:09:42 2016
+++ src/sys/net/if_loop.c	Thu Aug 11 13:57:02 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_loop.c,v 1.91 2016/08/10 10:09:42 kre Exp $	*/
+/*	$NetBSD: if_loop.c,v 1.92 2016/08/11 13:57:02 kre Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -65,7 +65,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_loop.c,v 1.91 2016/08/10 10:09:42 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_loop.c,v 1.92 2016/08/11 13:57:02 kre Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -154,6 +154,9 @@ void
 loopinit(void)
 {
 
+	if (lo0ifp != NULL)	/* can happen in rump kernel */
+		return;
+
 	(void)loop_clone_create(_cloner, 0);	/* lo0 always exists */
 	if_clone_attach(_cloner);
 }

CVS commit: src/lib/librumphijack

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Thu Aug 11 09:48:57 UTC 2016

Modified Files:
src/lib/librumphijack: hijack.c

Log Message:
Object to dup2() if target fd is in the range of fd's that
librumphijack reserves for rump to use.

This is not normally a problem, as most applications don't attempt
to use very high fds - but /bin/sh does.

This fix is something of a kludge - really the apparent fd resource limit
ought to be lowered as well, but this is sufficient to allow the shell
to work (when its dup2() gets rejected, it just tries again with a smaller
target fd until it eventually succeeds.)   This fixes the librumphijack
shell ATF tests.

A better, more comprehensive, fix would be good...


To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/lib/librumphijack/hijack.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/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.119 src/lib/librumphijack/hijack.c:1.120
--- src/lib/librumphijack/hijack.c:1.119	Tue Aug 25 13:50:19 2015
+++ src/lib/librumphijack/hijack.c	Thu Aug 11 09:48:57 2016
@@ -1,4 +1,4 @@
-/*  $NetBSD: hijack.c,v 1.119 2015/08/25 13:50:19 pooka Exp $	*/
+/*  $NetBSD: hijack.c,v 1.120 2016/08/11 09:48:57 kre Exp $	*/
 
 /*-
  * Copyright (c) 2011 Antti Kantee.  All Rights Reserved.
@@ -34,7 +34,7 @@
 #include 
 
 #if !defined(lint)
-__RCSID("$NetBSD: hijack.c,v 1.119 2015/08/25 13:50:19 pooka Exp $");
+__RCSID("$NetBSD: hijack.c,v 1.120 2016/08/11 09:48:57 kre Exp $");
 #endif
 
 #include 
@@ -1064,6 +1064,10 @@ dodup(int oldd, int minfd)
 			minfd -= hijack_fdoff;
 		isrump = 1;
 	} else {
+		if (minfd >= hijack_fdoff) {
+			errno = EINVAL;
+			return -1;
+		}
 		op_fcntl = GETSYSCALL(host, FCNTL);
 		isrump = 0;
 	}

CVS commit: src/distrib/sets/lists/man

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Aug 11 09:06:49 UTC 2016

Modified Files:
src/distrib/sets/lists/man: mi

Log Message:
new tcu man pages


To generate a diff of this commit:
cvs rdiff -u -r1.1530 -r1.1531 src/distrib/sets/lists/man/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/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1530 src/distrib/sets/lists/man/mi:1.1531
--- src/distrib/sets/lists/man/mi:1.1530	Fri Jul  1 18:52:06 2016
+++ src/distrib/sets/lists/man/mi	Thu Aug 11 05:06:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1530 2016/07/01 22:52:06 christos Exp $
+# $NetBSD: mi,v 1.1531 2016/08/11 09:06:49 christos Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1764,6 +1764,7 @@
 ./usr/share/man/cat4/tcic.0			man-sys-catman		.cat
 ./usr/share/man/cat4/tcom.0			man-sys-catman		.cat
 ./usr/share/man/cat4/tcp.0			man-sys-catman		.cat
+./usr/share/man/cat4/tcu.0			man-sys-catman		.cat
 ./usr/share/man/cat4/tdfxdrm.0			man-sys-catman		.cat
 ./usr/share/man/cat4/tdvfb.0			man-sys-catman		.cat
 ./usr/share/man/cat4/termios.0			man-sys-catman		.cat
@@ -4768,6 +4769,7 @@
 ./usr/share/man/html4/tcic.html			man-sys-htmlman		html
 ./usr/share/man/html4/tcom.html			man-sys-htmlman		html
 ./usr/share/man/html4/tcp.html			man-sys-htmlman		html
+./usr/share/man/html4/tcu.html			man-sys-htmlman		html
 ./usr/share/man/html4/tdfxdrm.html		man-sys-htmlman		html
 ./usr/share/man/html4/tdvfb.html		man-sys-htmlman		html
 ./usr/share/man/html4/termios.html		man-sys-htmlman		html
@@ -7692,6 +7694,7 @@
 ./usr/share/man/man4/tcic.4			man-sys-man		.man
 ./usr/share/man/man4/tcom.4			man-sys-man		.man
 ./usr/share/man/man4/tcp.4			man-sys-man		.man
+./usr/share/man/man4/tcu.4			man-sys-man		.man
 ./usr/share/man/man4/tdfxdrm.4			man-sys-man		.man
 ./usr/share/man/man4/tdvfb.4			man-sys-man		.man
 ./usr/share/man/man4/termios.4			man-sys-man		.man

CVS commit: src/share/man/man4

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Aug 11 09:06:20 UTC 2016

Modified Files:
src/share/man/man4: Makefile
Added Files:
src/share/man/man4: tcu.4

Log Message:
TURBOchannel usb/gpio driver from Felix Deichmann


To generate a diff of this commit:
cvs rdiff -u -r1.628 -r1.629 src/share/man/man4/Makefile
cvs rdiff -u -r0 -r1.1 src/share/man/man4/tcu.4

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

Modified files:

Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.628 src/share/man/man4/Makefile:1.629
--- src/share/man/man4/Makefile:1.628	Sun May  1 06:21:01 2016
+++ src/share/man/man4/Makefile	Thu Aug 11 05:06:20 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.628 2016/05/01 10:21:01 nonaka Exp $
+#	$NetBSD: Makefile,v 1.629 2016/08/11 09:06:20 christos Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
 
 MAN=	aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -61,7 +61,7 @@ MAN=	aac.4 ac97.4 acardide.4 aceride.4 a
 	sm.4 smsh.4 sn.4 sony.4 spc.4 speaker.4 spif.4 sqphy.4 ss.4 \
 	st.4 ste.4 stge.4 sti.4 stpcide.4 sv.4 strip.4 \
 	svwsata.4 swsensor.4 swwdog.4 sysmon.4 \
-	tap.4 tc.4 tcds.4 tcp.4 tdvfb.4 termios.4 tfb.4 thinkpad.4 \
+	tap.4 tc.4 tcds.4 tcp.4 tcu.4 tdvfb.4 termios.4 tfb.4 thinkpad.4 \
 	ti.4 tl.4 tlp.4 tlphy.4 tpm.4 tprof.4 tr.4 tra.4 \
 	trm.4 tty.4 tun.4 tqphy.4 twa.4 twe.4 txp.4 \
 	uark.4 ubsec.4 udp.4 uep.4 ug.4 uha.4 uk.4 ukphy.4 unix.4 userconf.4 \

Added files:

Index: src/share/man/man4/tcu.4
diff -u /dev/null src/share/man/man4/tcu.4:1.1
--- /dev/null	Thu Aug 11 05:06:20 2016
+++ src/share/man/man4/tcu.4	Thu Aug 11 05:06:20 2016
@@ -0,0 +1,57 @@
+.\" $NetBSD: tcu.4,v 1.1 2016/08/11 09:06:20 christos Exp $
+.\"
+.\" Copyright (c) 2001 The NetBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by Gregory McGarry.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"notice, this list of conditions and the following disclaimer in the
+.\"documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd August 9, 2016
+.Dt TCU 4
+.Os
+.Sh NAME
+.Nm tcu
+.Nd TURBOchannel USB host options
+.Sh SYNOPSIS
+.Cd "tcu*at tc? slot ? offset ?"
+.Pp
+.Cd "slhci*  at tcu?"
+.Cd "usb*at slhci?"
+.Pp
+.Cd "gpio*   at gpiobus?"
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for the flxd TC-USB TURBOchannel USB host options based
+upon a Cypress SL811HST USB 1.1 host controller and a glue logic CPLD. USB is
+handled by the
+.Xr slhci 4
+driver. Eight GPIO pins provided by the CPLD can be accessed through the
+.Xr gpio 4
+driver.
+.Sh SEE ALSO
+.Xr gpio 4 ,
+.Xr slhci 4 ,
+.Xr tc 4 ,
+.Xr usb 4

CVS commit: src/sys/dev/tc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Aug 11 09:05:43 UTC 2016

Modified Files:
src/sys/dev/tc: files.tc tcdevs
Added Files:
src/sys/dev/tc: slhci_tcu.c tcu.c

Log Message:
TURBOchannel usb/gpio driver from Felix Deichmann


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/tc/files.tc
cvs rdiff -u -r0 -r1.1 src/sys/dev/tc/slhci_tcu.c src/sys/dev/tc/tcu.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/tc/tcdevs

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/tc/files.tc
diff -u src/sys/dev/tc/files.tc:1.33 src/sys/dev/tc/files.tc:1.34
--- src/sys/dev/tc/files.tc:1.33	Wed Feb 27 18:49:11 2008
+++ src/sys/dev/tc/files.tc	Thu Aug 11 05:05:42 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: files.tc,v 1.33 2008/02/27 23:49:11 matt Exp $
+#	$NetBSD: files.tc,v 1.34 2016/08/11 09:05:42 christos Exp $
 #
 # Config file and device description for machine-independent
 # TURBOchannel code.  Included by ports that need it.
@@ -100,3 +100,11 @@ file   dev/tc/pxg.cp
 device	sfbp: wsemuldisplaydev, rasops32, rasops8
 attach	sfbp at tc
 file	dev/tc/sfbplus.c		sfbp needs-flag
+
+# TC-USB
+device	tcu { } : gpiobus
+attach	tcu at tc
+file	dev/tc/tcu.c			tcu
+
+attach	slhci at tcu with slhci_tcu
+file	dev/tc/slhci_tcu.c		slhci_tcu needs-flag

Index: src/sys/dev/tc/tcdevs
diff -u src/sys/dev/tc/tcdevs:1.21 src/sys/dev/tc/tcdevs:1.22
--- src/sys/dev/tc/tcdevs:1.21	Wed Jan 21 09:34:18 2009
+++ src/sys/dev/tc/tcdevs	Thu Aug 11 05:05:42 2016
@@ -1,4 +1,4 @@
-$NetBSD: tcdevs,v 1.21 2009/01/21 14:34:18 jnemeth Exp $
+$NetBSD: tcdevs,v 1.22 2016/08/11 09:05:42 christos Exp $
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou
@@ -83,6 +83,7 @@ device	PMAZC-AA	tcds	53c94 TCDS Fast SCS
 device	PMTNV-AA	???	Non-volatile RAM option card
 device	T1D4PKT		ds	DECWRL Turbochannel T1
 device	T3PKT		tt	DECWRL Turbochannel T3
+device	TC-USB  	tcu	flxd TC-USB
 
 # the following entries are unconfirmed
 #device	PMAF-CA		fza	DEC FDDIcontroller 700C (DEFZA; copper)

Added files:

Index: src/sys/dev/tc/slhci_tcu.c
diff -u /dev/null src/sys/dev/tc/slhci_tcu.c:1.1
--- /dev/null	Thu Aug 11 05:05:43 2016
+++ src/sys/dev/tc/slhci_tcu.c	Thu Aug 11 05:05:42 2016
@@ -0,0 +1,101 @@
+/* $NetBSD: slhci_tcu.c,v 1.1 2016/08/11 09:05:42 christos Exp $ */
+
+/*-
+ * Copyright (c) 2016, Felix Deichmann
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * flxd TC-USB - TURBOchannel USB host option
+ */
+
+#include 
+__KERNEL_RCSID(0, "$NetBSD: slhci_tcu.c,v 1.1 2016/08/11 09:05:42 christos Exp $");
+
+#include 
+#include 
+#include 
+
+#include 
+
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+#include 
+
+struct slhci_tcu_softc {
+	struct slhci_softc sc;
+};
+
+static int  slhci_tcu_match(device_t, cfdata_t, void *);
+static void slhci_tcu_attach(device_t, device_t, void *);
+
+CFATTACH_DECL_NEW(slhci_tcu, sizeof(struct slhci_tcu_softc),
+slhci_tcu_match, slhci_tcu_attach, NULL, slhci_activate);
+
+static int
+slhci_tcu_match(device_t parent, cfdata_t cf, void *aux)
+{
+
+	/* Always match. */
+	return 1;
+}
+
+#define SLHCI_TCU_STRIDE	4
+#define SLHCI_TCU_IMAX		500 /* mA */
+
+static void
+slhci_tcu_attach(device_t parent, device_t self, void *aux)
+{
+	struct slhci_tcu_softc *tsc = device_private(self);
+	struct slhci_softc *sc = >sc;
+	struct tc_attach_args *ta = aux;
+	bus_space_tag_t iot = ta->ta_memt;
+	bus_space_handle_t ioh;
+	int error;
+
+	sc->sc_dev = self;
+	sc->sc_bus.ub_hcpriv = sc;
+
+	aprint_normal("\n");
+
+	error = bus_space_map(iot, ta->ta_addr,
+	SLHCI_TCU_STRIDE * 

CVS commit: src/external/mit/xorg/server/xorg-server

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Thu Aug 11 08:32:45 UTC 2016

Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.Xserver
src/external/mit/xorg/server/xorg-server/Xext: Makefile.Xext
src/external/mit/xorg/server/xorg-server/Xi: Makefile
src/external/mit/xorg/server/xorg-server/config: Makefile
src/external/mit/xorg/server/xorg-server/dix: Makefile
src/external/mit/xorg/server/xorg-server/exa: Makefile.exa
src/external/mit/xorg/server/xorg-server/fb: Makefile.fb
src/external/mit/xorg/server/xorg-server/glx: Makefile.glx
src/external/mit/xorg/server/xorg-server/hw/xfree86: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/record:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/init: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf1bpp: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf4bpp: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_32bpp: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile
src/external/mit/xorg/server/xorg-server/include: Makefile
src/external/mit/xorg/server/xorg-server/mi: Makefile
src/external/mit/xorg/server/xorg-server/miext: Makefile
src/external/mit/xorg/server/xorg-server/miext/damage: Makefile.damage
src/external/mit/xorg/server/xorg-server/miext/rootless:
Makefile.rootless
src/external/mit/xorg/server/xorg-server/miext/shadow: Makefile.shadow
src/external/mit/xorg/server/xorg-server/miext/sync: Makefile.sync
src/external/mit/xorg/server/xorg-server/randr: Makefile
src/external/mit/xorg/server/xorg-server/xkb: Makefile
src/external/mit/xorg/server/xorg-server/xkbstubs: Makefile
Removed Files:
src/external/mit/xorg/server/xorg-server/miext/cw: Makefile Makefile.cw

Log Message:
first merge of xorg-server 1.18.4 reach over.  not tested, and
missing at these new subdirs, some which may not be needed:

dri2
glamor
hw/xfree86/drivers/modesetting
hw/xfree86/parser
present
pseudoramiX


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/xorg-server/Makefile.Xserver
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/server/xorg-server/Xi/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/config/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/xorg-server/dix/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/exa/Makefile.exa
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/fb/Makefile.fb
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
cvs rdiff -u -r1.33 -r1.34 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.21 -r1.22 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/record/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile
cvs rdiff -u -r1.7 -r1.8 \