date:20120209

CVS commit: src/distrib/notes/ofppc

2012-02-09 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Thu Feb  9 11:58:35 UTC 2012

Modified Files:
src/distrib/notes/ofppc: contents

Log Message:
Fix a typo.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/notes/ofppc/contents

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

Modified files:

Index: src/distrib/notes/ofppc/contents
diff -u src/distrib/notes/ofppc/contents:1.1 src/distrib/notes/ofppc/contents:1.2
--- src/distrib/notes/ofppc/contents:1.1	Sun Jan 29 15:54:35 2012
+++ src/distrib/notes/ofppc/contents	Thu Feb  9 11:58:35 2012
@@ -1,4 +1,4 @@
-.\	$NetBSD: contents,v 1.1 2012/01/29 15:54:35 phx Exp $
+.\	$NetBSD: contents,v 1.2 2012/02/09 11:58:35 wiz Exp $
 .\
 .\ Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -82,7 +82,7 @@ see below.
 .
 .		It Pa netboot/
 .
-.		(tag netboot -compact \ installtion/netboot
+.		(tag netboot -compact \ installation/netboot
 .
 .			It Pa netbsd-GENERIC.gz
 A gzipped

CVS commit: src/etc

2012-02-09 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Thu Feb  9 13:38:45 UTC 2012

Modified Files:
src/etc: daily

Log Message:
Don't overwrite run_makemandb. The default is already set in daily.conf.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/etc/daily

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

Modified files:

Index: src/etc/daily
diff -u src/etc/daily:1.79 src/etc/daily:1.80
--- src/etc/daily:1.79	Tue Feb  7 19:13:30 2012
+++ src/etc/daily	Thu Feb  9 13:38:44 2012
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$NetBSD: daily,v 1.79 2012/02/07 19:13:30 joerg Exp $
+#	$NetBSD: daily,v 1.80 2012/02/09 13:38:44 joerg Exp $
 #	@(#)daily	8.2 (Berkeley) 1/25/94
 #
 
@@ -290,8 +290,6 @@ if checkyesno run_skeyaudit; then
 	fi
 fi
 
-run_makemandb=YES
-
 if checkyesno run_makemandb; then
 	if [ -f /etc/man.conf -a -x /usr/sbin/makemandb ]; then
 		echo

CVS commit: src/external/gpl3/gdb/lib/libgdb/arch/vax

2012-02-09 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Thu Feb  9 15:05:00 UTC 2012

Modified Files:
src/external/gpl3/gdb/lib/libgdb/arch/vax: defs.mk init.c

Log Message:
Re-re-run mknative for vax on gdb7.

vax isn't currently using gdb7 so this doesn't hurt anyone and I'm going
to ride my previous OK from releng :)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/lib/libgdb/arch/vax/defs.mk \
src/external/gpl3/gdb/lib/libgdb/arch/vax/init.c

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

Modified files:

Index: src/external/gpl3/gdb/lib/libgdb/arch/vax/defs.mk
diff -u src/external/gpl3/gdb/lib/libgdb/arch/vax/defs.mk:1.3 src/external/gpl3/gdb/lib/libgdb/arch/vax/defs.mk:1.4
--- src/external/gpl3/gdb/lib/libgdb/arch/vax/defs.mk:1.3	Mon Feb  6 10:55:41 2012
+++ src/external/gpl3/gdb/lib/libgdb/arch/vax/defs.mk	Thu Feb  9 15:05:00 2012
@@ -3,5 +3,5 @@
 # Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp 
 #
 G_INTERNAL_CFLAGS=-I. -I${GNUHOSTDIST}/gdb -I${GNUHOSTDIST}/gdb/common -I${GNUHOSTDIST}/gdb/config  -DLOCALEDIR=\/usr/share/locale\ -DHAVE_CONFIG_H -I${GNUHOSTDIST}/gdb/../include/opcode -I${GNUHOSTDIST}/gdb/../opcodes/.. -I${GNUHOSTDIST}/gdb/../readline/..  -I../bfd -I${GNUHOSTDIST}/gdb/../bfd -I${GNUHOSTDIST}/gdb/../include -I../libdecnumber -I${GNUHOSTDIST}/gdb/../libdecnumber  -I./../intl -I${GNUHOSTDIST}/gdb/gnulib -Ignulib  -DMI_OUT=1 -DTUI=1  -Wall -Wdeclaration-after-statement -Wpointer-arith -Wformat-nonliteral -Wno-pointer-sign -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts 
-G_LIBGDB_OBS=vax-tdep.o vaxnbsd-tdep.o vaxnbsd-nat.o corelow.o solib.o solib-svr4.o ser-base.o ser-unix.o ser-pipe.o ser-tcp.o fork-child.o inf-ptrace.o  nbsd-nat.o vaxbsd-nat.o bsd-kvm.o  remote.o dcache.o tracepoint.o ax-general.o ax-gdb.o remote-fileio.o  cli-dump.o  cli-decode.o cli-script.o cli-cmds.o cli-setshow.o  cli-logging.o  cli-interp.o cli-utils.o mi-out.o mi-console.o  mi-cmds.o mi-cmd-env.o mi-cmd-var.o mi-cmd-break.o mi-cmd-stack.o  mi-cmd-file.o mi-cmd-disas.o mi-symbol-cmds.o mi-cmd-target.o  mi-interp.o  mi-main.o mi-parse.o mi-getopt.o tui-command.o  tui-data.o  tui-disasm.o  tui-file.o tui.o  tui-hooks.o  tui-interp.o  tui-io.o  tui-layout.o  tui-out.o  tui-main.o  tui-regs.o  tui-source.o  tui-stack.o  tui-win.o  tui-windata.o  tui-wingeneral.o  tui-winsource.o  tui.o python.o py-value.o py-prettyprint.o py-auto-load.o elfread.o posix-hdep.o c-exp.o  cp-name-parser.o  objc-exp.o  ada-exp.o  jv-exp.o  f-exp.o m2-exp.o p-exp.o  version.o  annotate.o  addr
map.o  auxv.o  bfd-target.o  blockframe.o breakpoint.o findvar.o regcache.o  charset.o disasm.o dummy-frame.o dfp.o  source.o value.o eval.o valops.o valarith.o valprint.o printcmd.o  block.o symtab.o psymtab.o symfile.o symmisc.o linespec.o dictionary.o  infcall.o  infcmd.o infrun.o  expprint.o environ.o stack.o thread.o  exceptions.o  filesystem.o  inf-child.o  interps.o  main.o  macrotab.o macrocmd.o macroexp.o macroscope.o  mi-common.o  event-loop.o event-top.o inf-loop.o completer.o  gdbarch.o arch-utils.o gdbtypes.o osabi.o copying.o  memattr.o mem-break.o target.o parse.o language.o buildsym.o  findcmd.o  std-regs.o  signals.o  exec.o reverse.o  bcache.o objfiles.o observer.o minsyms.o maint.o demangle.o  dbxread.o coffread.o coff-pe-read.o  dwarf2read.o mipsread.o stabsread.o corefile.o  dwarf2expr.o dwarf2loc.o dwarf2-frame.o  ada-lang.o c-lang.o d-lang.o f-lang.o objc-lang.o  ada-tasks.o  ui-out.o cli-out.o  varobj.o vec.o wrapper.o  jv-lang.o jv-valprint.o jv-typep
 rint.o  m2-lang.o opencl-lang.o p-lang.o p-typeprint.o p-valprint.o  sentinel-frame.o  complaints.o typeprint.o  ada-typeprint.o c-typeprint.o f-typeprint.o m2-typeprint.o  ada-valprint.o c-valprint.o cp-valprint.o d-valprint.o f-valprint.o  m2-valprint.o  serial.o mdebugread.o top.o utils.o  ui-file.o  user-regs.o  frame.o frame-unwind.o doublest.o  frame-base.o  inline-frame.o  gnu-v2-abi.o gnu-v3-abi.o cp-abi.o cp-support.o  cp-namespace.o  reggroups.o regset.o  trad-frame.o  tramp-frame.o  solib.o solib-target.o  prologue-value.o memory-map.o memrange.o xml-support.o xml-syscall.o  target-descriptions.o target-memory.o xml-tdesc.o xml-builtin.o  inferior.o osdata.o gdb_usleep.o record.o gcore.o  jit.o progspace.o inflow.oinit.o nbsd-thread.o
+G_LIBGDB_OBS=vax-tdep.o vaxnbsd-tdep.o corelow.o solib.o solib-svr4.o ser-base.o ser-unix.o ser-pipe.o ser-tcp.o fork-child.o inf-ptrace.o  nbsd-nat.o vaxbsd-nat.o bsd-kvm.o  nbsd-thread.o  remote.o dcache.o tracepoint.o ax-general.o ax-gdb.o remote-fileio.o  cli-dump.o  cli-decode.o cli-script.o cli-cmds.o cli-setshow.o  cli-logging.o  cli-interp.o cli-utils.o mi-out.o mi-console.o  mi-cmds.o mi-cmd-env.o mi-cmd-var.o mi-cmd-break.o mi-cmd-stack.o  mi-cmd-file.o mi-cmd-disas.o mi-symbol-cmds.o mi-cmd-target.o  mi-interp.o  mi-main.o mi-parse.o mi-getopt.o

CVS commit: src/external/gpl3/gdb/lib/libgdb/arch

2012-02-09 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Thu Feb  9 15:13:30 UTC 2012

Modified Files:
src/external/gpl3/gdb/lib/libgdb/arch/mipseb: config.h defs.mk init.c
src/external/gpl3/gdb/lib/libgdb/arch/mipsel: config.h defs.mk init.c

Log Message:
Re-re-run gdb7 mknative for mips. mips not using gdb7 yet.

OK martin@


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gdb/lib/libgdb/arch/mipseb/config.h
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/lib/libgdb/arch/mipseb/defs.mk \
src/external/gpl3/gdb/lib/libgdb/arch/mipseb/init.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gdb/lib/libgdb/arch/mipsel/config.h
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/lib/libgdb/arch/mipsel/defs.mk \
src/external/gpl3/gdb/lib/libgdb/arch/mipsel/init.c

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

Modified files:

Index: src/external/gpl3/gdb/lib/libgdb/arch/mipseb/config.h
diff -u src/external/gpl3/gdb/lib/libgdb/arch/mipseb/config.h:1.3 src/external/gpl3/gdb/lib/libgdb/arch/mipseb/config.h:1.4
--- src/external/gpl3/gdb/lib/libgdb/arch/mipseb/config.h:1.3	Mon Feb  6 10:55:40 2012
+++ src/external/gpl3/gdb/lib/libgdb/arch/mipseb/config.h	Thu Feb  9 15:13:30 2012
@@ -864,7 +864,7 @@
 /* #undef WITH_PYTHON_PATH */
 
 /* Define if the simulator is being linked in. */
-#define WITH_SIM 1
+/* #undef WITH_SIM */
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */

Index: src/external/gpl3/gdb/lib/libgdb/arch/mipseb/defs.mk
diff -u src/external/gpl3/gdb/lib/libgdb/arch/mipseb/defs.mk:1.4 src/external/gpl3/gdb/lib/libgdb/arch/mipseb/defs.mk:1.5
--- src/external/gpl3/gdb/lib/libgdb/arch/mipseb/defs.mk:1.4	Mon Feb  6 10:55:40 2012
+++ src/external/gpl3/gdb/lib/libgdb/arch/mipseb/defs.mk	Thu Feb  9 15:13:30 2012
@@ -3,5 +3,5 @@
 # Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp 
 #
 G_INTERNAL_CFLAGS=-I. -I${GNUHOSTDIST}/gdb -I${GNUHOSTDIST}/gdb/common -I${GNUHOSTDIST}/gdb/config  -DLOCALEDIR=\/usr/share/locale\ -DHAVE_CONFIG_H -I${GNUHOSTDIST}/gdb/../include/opcode -I${GNUHOSTDIST}/gdb/../opcodes/.. -I${GNUHOSTDIST}/gdb/../readline/..  -I../bfd -I${GNUHOSTDIST}/gdb/../bfd -I${GNUHOSTDIST}/gdb/../include -I../libdecnumber -I${GNUHOSTDIST}/gdb/../libdecnumber  -I./../intl -I${GNUHOSTDIST}/gdb/gnulib -Ignulib  -DMI_OUT=1 -DTUI=1  -Wall -Wdeclaration-after-statement -Wpointer-arith -Wformat-nonliteral -Wno-pointer-sign -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts 
-G_LIBGDB_OBS=mips-tdep.o mipsnbsd-tdep.o corelow.o solib.o solib-svr4.o nbsd-tdep.o ser-base.o ser-unix.o ser-pipe.o ser-tcp.o fork-child.o inf-ptrace.o nbsd-nat.o mipsnbsd-nat.o  nbsd-thread.o  remote.o dcache.o tracepoint.o ax-general.o ax-gdb.o remote-fileio.o remote-sim.o cli-dump.o  cli-decode.o cli-script.o cli-cmds.o cli-setshow.o  cli-logging.o  cli-interp.o cli-utils.o mi-out.o mi-console.o  mi-cmds.o mi-cmd-env.o mi-cmd-var.o mi-cmd-break.o mi-cmd-stack.o  mi-cmd-file.o mi-cmd-disas.o mi-symbol-cmds.o mi-cmd-target.o  mi-interp.o  mi-main.o mi-parse.o mi-getopt.o tui-command.o  tui-data.o  tui-disasm.o  tui-file.o tui.o  tui-hooks.o  tui-interp.o  tui-io.o  tui-layout.o  tui-out.o  tui-main.o  tui-regs.o  tui-source.o  tui-stack.o  tui-win.o  tui-windata.o  tui-wingeneral.o  tui-winsource.o  tui.o python.o py-value.o py-prettyprint.o py-auto-load.o elfread.o posix-hdep.o c-exp.o  cp-name-parser.o  objc-exp.o  ada-exp.o  jv-exp.o  f-exp.o m2-exp.o p-exp.o  version.o
  annotate.o  addrmap.o  auxv.o  bfd-target.o  blockframe.o breakpoint.o findvar.o regcache.o  charset.o disasm.o dummy-frame.o dfp.o  source.o value.o eval.o valops.o valarith.o valprint.o printcmd.o  block.o symtab.o psymtab.o symfile.o symmisc.o linespec.o dictionary.o  infcall.o  infcmd.o infrun.o  expprint.o environ.o stack.o thread.o  exceptions.o  filesystem.o  inf-child.o  interps.o  main.o  macrotab.o macrocmd.o macroexp.o macroscope.o  mi-common.o  event-loop.o event-top.o inf-loop.o completer.o  gdbarch.o arch-utils.o gdbtypes.o osabi.o copying.o  memattr.o mem-break.o target.o parse.o language.o buildsym.o  findcmd.o  std-regs.o  signals.o  exec.o reverse.o  bcache.o objfiles.o observer.o minsyms.o maint.o demangle.o  dbxread.o coffread.o coff-pe-read.o  dwarf2read.o mipsread.o stabsread.o corefile.o  dwarf2expr.o dwarf2loc.o dwarf2-frame.o  ada-lang.o c-lang.o d-lang.o f-lang.o objc-lang.o  ada-tasks.o  ui-out.o cli-out.o  varobj.o vec.o wrapper.o  jv-lang.o jv-v
 alprint.o jv-typeprint.o  m2-lang.o opencl-lang.o p-lang.o p-typeprint.o p-valprint.o  sentinel-frame.o  complaints.o typeprint.o  ada-typeprint.o c-typeprint.o f-typeprint.o m2-typeprint.o  ada-valprint.o c-valprint.o cp-valprint.o d-valprint.o f-valprint.o  m2-valprint.o  serial.o mdebugread.o top.o utils.o  ui-file.o

CVS commit: src/external/gpl3/gdb/dist/gdb

2012-02-09 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Thu Feb  9 15:14:19 UTC 2012

Modified Files:
src/external/gpl3/gdb/dist/gdb: mipsnbsd-nat.c

Log Message:
Make mips gdb7 compile.

XXX not sure I got this right.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/dist/gdb/mipsnbsd-nat.c

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

Modified files:

Index: src/external/gpl3/gdb/dist/gdb/mipsnbsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/mipsnbsd-nat.c:1.3 src/external/gpl3/gdb/dist/gdb/mipsnbsd-nat.c:1.4
--- src/external/gpl3/gdb/dist/gdb/mipsnbsd-nat.c:1.3	Sun Feb  5 13:26:01 2012
+++ src/external/gpl3/gdb/dist/gdb/mipsnbsd-nat.c	Thu Feb  9 15:14:19 2012
@@ -27,6 +27,16 @@
 #include sys/ptrace.h
 #include machine/reg.h
 
+#ifndef HAVE_GREGSET_T
+typedef struct reg gregset_t;
+#endif
+
+#ifndef HAVE_FPREGSET_T
+typedef struct fpreg fpregset_t;
+#endif
+
+#include gregset.h
+
 #include mips-tdep.h
 #include mipsnbsd-tdep.h
 #include inf-ptrace.h
@@ -110,6 +120,32 @@ mipsnbsd_store_inferior_registers (struc
 }
 }
 
+/* Wrapper functions.  These are only used by nbsd-thread.  */
+void
+supply_gregset (struct regcache *regcache, const gdb_gregset_t *gregsetp)
+{
+  mipsnbsd_supply_reg (regcache, (const char *) gregsetp, -1);
+}   
+
+void
+fill_gregset (const struct regcache *regcache,
+  gdb_gregset_t *gregsetp, int regno)
+{
+  mipsnbsd_fill_reg (regcache, (char *) gregsetp, -1);
+}   
+
+void
+supply_fpregset (struct regcache *regcache, const gdb_fpregset_t *fpregsetp)
+{   
+  mipsnbsd_supply_fpreg (regcache, (const char *) fpregsetp, -1);
+}
+
+void
+fill_fpregset (const struct regcache *regcache,
+   gdb_fpregset_t *fpregsetp, int regno)
+{
+  mipsnbsd_fill_fpreg (regcache, (char *) fpregsetp, -1);
+}
 
 /* Provide a prototype to silence -Wmissing-prototypes.  */
 void _initialize_mipsnbsd_nat (void);

CVS commit: src/tools/gdb

2012-02-09 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Thu Feb  9 15:15:58 UTC 2012

Modified Files:
src/tools/gdb: Makefile

Log Message:
Disable the sim on mips for next person running gdb7 mknative.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/tools/gdb/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/gdb/Makefile
diff -u src/tools/gdb/Makefile:1.20 src/tools/gdb/Makefile:1.21
--- src/tools/gdb/Makefile:1.20	Mon Sep 26 21:16:14 2011
+++ src/tools/gdb/Makefile	Thu Feb  9 15:15:58 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.20 2011/09/26 21:16:14 christos Exp $
+#	$NetBSD: Makefile,v 1.21 2012/02/09 15:15:58 skrll Exp $
 
 .include bsd.own.mk
 
@@ -47,7 +47,6 @@ CONFIGURE_ENV+=	ac_cv_header_ncurses_h=n
 # enable sim if supported).
 CONFIGURE_ARGS_SIM=
 .if \
-${MACHINE_CPU} != mips  \
 ${MACHINE_CPU} != powerpc  \
 ${MACHINE_CPU} != powerpc64
 CONFIGURE_ARGS_SIM+= --disable-sim

CVS commit: src/external/gpl2/xcvs/dist/src

2012-02-09 Thread Matthias Drochner

Module Name:src
Committed By:   drochner
Date:   Thu Feb  9 16:28:53 UTC 2012

Modified Files:
src/external/gpl2/xcvs/dist/src: client.c

Log Message:
add  patch from Redhat bug#784141 which fixes a possible
buffer overflow if used with an HTTP proxy (CVE-2012-0804)
approved by releng


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/xcvs/dist/src/client.c

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

Modified files:

Index: src/external/gpl2/xcvs/dist/src/client.c
diff -u src/external/gpl2/xcvs/dist/src/client.c:1.3 src/external/gpl2/xcvs/dist/src/client.c:1.4
--- src/external/gpl2/xcvs/dist/src/client.c:1.3	Sun May 15 17:52:41 2011
+++ src/external/gpl2/xcvs/dist/src/client.c	Thu Feb  9 16:28:53 2012
@@ -3550,9 +3550,9 @@ connect_to_pserver (cvsroot_t *root, str
  * code.
  */
 	read_line_via (from_server, to_server, read_buf);
-	sscanf (read_buf, %s %d, write_buf, codenum);
+	count = sscanf (read_buf, %*s %d, codenum);
 
-	if ((codenum / 100) != 2)
+	if (count != 1 || (codenum / 100) != 2)
 	error (1, 0, proxy server %s:%d does not support http tunnelling,
 		   root-proxy_hostname, proxy_port_number);
 	free (read_buf);

CVS commit: src/sys/ddb

2012-02-09 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Feb  9 17:07:07 UTC 2012

Modified Files:
src/sys/ddb: db_sym.c

Log Message:
Re-indent, and factor out strlen() now that we have more space.
No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/ddb/db_sym.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/ddb/db_sym.c
diff -u src/sys/ddb/db_sym.c:1.62 src/sys/ddb/db_sym.c:1.63
--- src/sys/ddb/db_sym.c:1.62	Wed Feb  8 19:21:23 2012
+++ src/sys/ddb/db_sym.c	Thu Feb  9 12:07:07 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_sym.c,v 1.62 2012/02/09 00:21:23 christos Exp $	*/
+/*	$NetBSD: db_sym.c,v 1.63 2012/02/09 17:07:07 christos Exp $	*/
 
 /*
  * Mach Operating System
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_sym.c,v 1.62 2012/02/09 00:21:23 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_sym.c,v 1.63 2012/02/09 17:07:07 christos Exp $);
 
 #ifdef _KERNEL_OPT
 #include opt_ddbparam.h
@@ -322,23 +322,20 @@ db_symstr(char *buf, size_t buflen, db_e
 
 		cursym = db_search_symbol(off, strategy, d);
 		db_symbol_values(cursym, name, value);
-		if (name != NULL 
-		((unsigned int) d  db_maxoff) 
+		if (name != NULL  ((unsigned int)d  db_maxoff) 
 		value != 0) {
 			strlcpy(buf, name, buflen);
 			if (d) {
 strlcat(buf, +, buflen);
-db_format_radix(buf+strlen(buf),
-24, d, true);
+db_format_radix(buf + strlen(buf), 24, d, true);
 			}
 			if (strategy == DB_STGY_PROC) {
 if ((*db_symformat-sym_line_at_pc)
-(NULL, cursym, filename,
-linenum, off))
-	snprintf(buf + strlen(buf),
-	buflen - strlen(buf),
-	 [%s:%d],
-	filename, linenum);
+(NULL, cursym, filename, linenum, off)) {
+	size_t len = strlen(buf);
+	snprintf(buf + len, buflen - len,
+	 [%s:%d], filename, linenum);
+}
 			}
 			return;
 		}
@@ -397,8 +394,7 @@ db_printsym(db_expr_t off, db_strategy_t
 
 		cursym = db_search_symbol(off, strategy, d);
 		db_symbol_values(cursym, name, value);
-		if (name != NULL 
-		((unsigned int) d  db_maxoff) 
+		if (name != NULL  ((unsigned int)d  db_maxoff) 
 		value != 0) {
 			(*pr)(%s, name);
 			if (d) {
@@ -409,10 +405,8 @@ db_printsym(db_expr_t off, db_strategy_t
 			}
 			if (strategy == DB_STGY_PROC) {
 if ((*db_symformat-sym_line_at_pc)
-(NULL, cursym, filename,
-linenum, off))
-	(*pr)( [%s:%d],
-	filename, linenum);
+(NULL, cursym, filename, linenum, off))
+	(*pr)( [%s:%d], filename, linenum);
 			}
 			return;
 		}

CVS commit: src/external/bsd/ntp/dist/util

2012-02-09 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Feb  9 17:53:56 UTC 2012

Modified Files:
src/external/bsd/ntp/dist/util: ntp-keygen.c

Log Message:
fix printf format.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/dist/util/ntp-keygen.c

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/ntp/dist/util/ntp-keygen.c
diff -u src/external/bsd/ntp/dist/util/ntp-keygen.c:1.3 src/external/bsd/ntp/dist/util/ntp-keygen.c:1.4
--- src/external/bsd/ntp/dist/util/ntp-keygen.c:1.3	Wed Feb  1 02:46:30 2012
+++ src/external/bsd/ntp/dist/util/ntp-keygen.c	Thu Feb  9 12:53:56 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: ntp-keygen.c,v 1.3 2012/02/01 07:46:30 kardel Exp $	*/
+/*	$NetBSD: ntp-keygen.c,v 1.4 2012/02/09 17:53:56 christos Exp $	*/
 
 /*
  * Program to generate cryptographic keys for ntp clients and servers
@@ -2068,8 +2068,8 @@ fheader	(
 	char	linkname[MAXFILENAME]; /* link name */
 	int	temp;
 
-	sprintf(filename, ntpkey_%s_%s.%lu, file, owner, epoch +
-	JAN_1970);
+	snprintf(filename, sizeof(filename), ntpkey_%s_%s.%lld, file, owner,
+	(long long)(epoch + JAN_1970));
 	if ((str = fopen(filename, w)) == NULL) {
 		perror(Write);
 		exit (-1);

CVS commit: src

2012-02-09 Thread Jeff Rizzo

Module Name:src
Committed By:   riz
Date:   Thu Feb  9 18:10:26 UTC 2012

Modified Files:
src/share/man/man4: envsys.4
src/usr.sbin/envstat: envstat.8 envstat.c envsys.conf.5

Log Message:
Various English usage, spelling and markup fixes for envstat(4)-related
things, from Snader_LB.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/share/man/man4/envsys.4
cvs rdiff -u -r1.60 -r1.61 src/usr.sbin/envstat/envstat.8
cvs rdiff -u -r1.89 -r1.90 src/usr.sbin/envstat/envstat.c
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/envstat/envsys.conf.5

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

Modified files:

Index: src/share/man/man4/envsys.4
diff -u src/share/man/man4/envsys.4:1.48 src/share/man/man4/envsys.4:1.49
--- src/share/man/man4/envsys.4:1.48	Sun Mar 14 14:47:03 2010
+++ src/share/man/man4/envsys.4	Thu Feb  9 18:10:26 2012
@@ -1,4 +1,4 @@
-.\	$NetBSD: envsys.4,v 1.48 2010/03/14 14:47:03 pgoyette Exp $
+.\	$NetBSD: envsys.4,v 1.49 2012/02/09 18:10:26 riz Exp $
 .\
 .\ Copyright (c) 2007 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -52,7 +52,7 @@ the userland part, to receive the curren
 to set some properties on sensors:
 .Xr envstat 8 .
 .It
-The kernel part that is able to talk to the drivers providing sensor
+The kernel part that is able to talk to the devices providing sensor
 data:
 .Xr sysmon_envsys 9 .
 .El
@@ -209,12 +209,12 @@ Used to monitor possible over-charging o
 .It Fa min-value
 Current min value in the sensor.
 .It Fa monitoring-state-critical
-If true, the driver has enabled the flag to monitor a critical state.
+If true, the device has enabled the flag to monitor a critical state.
 .It Fa monitoring-state-hw-range-limits
-If true, the driver has enabled the flag to monitor warning or critical
+If true, the device has enabled the flag to monitor warning or critical
 limits.
 .It Fa monitoring-state-state-changed
-If true, the driver has enabled the flag to monitor for state changes in
+If true, the device has enabled the flag to monitor for state changes in
 a drive or Battery state sensor.
 .It Fa monitoring-supported
 If true, critical/warning capacity/max/min limits may be set by the
@@ -253,7 +253,7 @@ This
 is used to remove all properties that are currently set via the
 .Dv ENVSYS_SETDICTIONARY
 ioctl.
-The values will be set to defaults, the ones that the driver uses.
+The values will be set to defaults, the ones that the device uses.
 .Pp
 Only one object is allowed on this dictionary:
 .Bd -literal -offset ident
@@ -429,6 +429,7 @@ main(void)
 }
 .Ed
 .Sh SEE ALSO
+.Xr envsys.conf 5 ,
 .Xr envstat 8 ,
 .Xr powerd 8 ,
 .Xr sysmon_envsys 9

Index: src/usr.sbin/envstat/envstat.8
diff -u src/usr.sbin/envstat/envstat.8:1.60 src/usr.sbin/envstat/envstat.8:1.61
--- src/usr.sbin/envstat/envstat.8:1.60	Tue Jun  7 17:47:24 2011
+++ src/usr.sbin/envstat/envstat.8	Thu Feb  9 18:10:26 2012
@@ -1,4 +1,4 @@
-.\	$NetBSD: envstat.8,v 1.60 2011/06/07 17:47:24 wiz Exp $
+.\	$NetBSD: envstat.8,v 1.61 2012/02/09 18:10:26 riz Exp $
 .\
 .\ Copyright (c) 2000, 2007, 2008, 2009 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -65,11 +65,11 @@ See the
 .Xr envsys.conf 5
 manual page for more information.
 .It Fl D
-Display the names of the drivers that were registered with
+Display the names of the devices that are currently registered with
 the
 .Xr envsys 4
-framework, one per line and some properties for the driver: refresh timeout
-value, for example.
+framework, one per line, along with some properties for the device
+(for example, its refresh timeout value).
 .It Fl d Ar device
 Display only the sensors for the given
 .Ar device .
@@ -79,7 +79,7 @@ you want to only see results from a spec
 Display temperature values in degrees Fahrenheit.
 The default is to display temperature values in degrees Celsius.
 .It Fl I
-This flag skips the sensors with invalid state, these are normally
+This flag skips the sensors with invalid state; these are normally
 shown using the
 .Qq N/A
 string by default.
@@ -110,12 +110,13 @@ row mode; this mode is now the default.
 This flag is used to restore defaults to all devices registered with
 the framework.
 This will remove all properties that were set in
-the configuration file to the setting that the drivers use by
+the configuration file to the setting that the devices use by
 default.
 .It Fl s Ar device:sensor,...
-Restrict the display to the named sensors.
+Restrict the display to the named devices and sensors.
 The pair device and sensor description must be supplied as a comma separated list.
 Device as well as sensor descriptions are case sensitive.
+Note that the order of the arguments given does not influence the order of output.
 .It Fl T
 Create and display max, min and average statistics for a sensor.
 Must be used with an
@@ -134,9 +135,9 @@ The default is the length of the longest
 This option has no effect.
 It is retained for

CVS commit: src/tests/fs/vfs

2012-02-09 Thread Nicolas Joly

Module Name:src
Committed By:   njoly
Date:   Thu Feb  9 18:31:04 UTC 2012

Modified Files:
src/tests/fs/vfs: t_unpriv.c

Log Message:
Add a testcase which checks that directory permissions are honored for
file creation/deletion with unprivileged credentials.

releng ok.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/fs/vfs/t_unpriv.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/fs/vfs/t_unpriv.c
diff -u src/tests/fs/vfs/t_unpriv.c:1.4 src/tests/fs/vfs/t_unpriv.c:1.5
--- src/tests/fs/vfs/t_unpriv.c:1.4	Tue Jan 31 19:02:49 2012
+++ src/tests/fs/vfs/t_unpriv.c	Thu Feb  9 18:31:03 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_unpriv.c,v 1.4 2012/01/31 19:02:49 njoly Exp $	*/
+/*	$NetBSD: t_unpriv.c,v 1.5 2012/02/09 18:31:03 njoly Exp $	*/
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -27,6 +27,7 @@
  */
 
 #include atf-c.h
+#include libgen.h
 #include unistd.h
 
 #include rump/rump_syscalls.h
@@ -71,13 +72,57 @@ owner(const atf_tc_t *tc, const char *mp
 	FSTEST_EXIT();
 }
 
+static void
+dirperms(const atf_tc_t *tc, const char *mp)
+{
+	char name[] = dir.test/file.test;
+	char *dir = dirname(name);
+	int fd;
+
+	if (FSTYPE_SYSVBFS(tc))
+		atf_tc_skip(directories not supported by file system);
+
+	FSTEST_ENTER();
+
+	if (rump_sys_mkdir(dir, 0777) == -1)
+		atf_tc_fail_errno(mkdir);
+
+	rump_pub_lwproc_rfork(RUMP_RFCFDG);
+	if (rump_sys_setuid(1) == -1)
+		atf_tc_fail_errno(setuid);
+if (rump_sys_open(name, O_RDWR|O_CREAT, 0666) != -1 || errno != EACCES)
+		atf_tc_fail_errno(open);
+	rump_pub_lwproc_releaselwp();
+
+	if ((fd = rump_sys_open(name, O_RDWR|O_CREAT, 0666)) == -1)
+		atf_tc_fail_errno(open);
+	if (rump_sys_close(fd) == -1)
+		atf_tc_fail_errno(close);
+
+	rump_pub_lwproc_rfork(RUMP_RFCFDG);
+	if (rump_sys_setuid(1) == -1)
+		atf_tc_fail_errno(setuid);
+if (rump_sys_unlink(name) != -1 || errno != EACCES)
+		atf_tc_fail_errno(unlink);
+	rump_pub_lwproc_releaselwp();
+
+if (rump_sys_unlink(name) == -1)
+		atf_tc_fail_errno(unlink);
+
+	if (rump_sys_rmdir(dir) == -1)
+		atf_tc_fail_errno(rmdir);
+
+	FSTEST_EXIT();
+}
 
 ATF_TC_FSAPPLY(owner, owner unprivileged checks);
+ATF_TC_FSAPPLY(dirperms, directory permission checks);
 
 ATF_TP_ADD_TCS(tp)
 {
 
 	ATF_TP_FSAPPLY(owner);
+	ATF_TP_FSAPPLY(dirperms);
 
 	return atf_no_error();
 }

CVS commit: src

2012-02-09 Thread Adrian Steinmann

Module Name:src
Committed By:   ast
Date:   Thu Feb  9 18:35:44 UTC 2012

Modified Files:
src/distrib/utils/sysinst/arch/amd64: md.h
src/usr.sbin/installboot: installboot.8

Log Message:
Update the amd64 and i386 examples to use /usr/mdec/bootxx_ffsv2,
i.e. DEFAULT_UFS2 as src/distrib/utils/sysinst/bsddisklabel.c does
since post-NetBSD5.  This avoids rendering an i386 or amd64 system
unbootable if the given example is thoughtlessly cut-and-pasted on
a NetBSD6.x system (been there, done that ;-) Qualify the descriptions
of /usr/mdec/bootxx_ffsv{1,2} along those lines.

Fixed a small typo in comment of distrib/utils/sysinst/arch/amd64/md.h.

Ok by releng@


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/distrib/utils/sysinst/arch/amd64/md.h
cvs rdiff -u -r1.81 -r1.82 src/usr.sbin/installboot/installboot.8

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

Modified files:

Index: src/distrib/utils/sysinst/arch/amd64/md.h
diff -u src/distrib/utils/sysinst/arch/amd64/md.h:1.27 src/distrib/utils/sysinst/arch/amd64/md.h:1.28
--- src/distrib/utils/sysinst/arch/amd64/md.h:1.27	Mon Apr  4 08:30:17 2011
+++ src/distrib/utils/sysinst/arch/amd64/md.h	Thu Feb  9 18:35:44 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.h,v 1.27 2011/04/04 08:30:17 mbalmer Exp $	*/
+/*	$NetBSD: md.h,v 1.28 2012/02/09 18:35:44 ast Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -55,7 +55,7 @@
 /* use UFS2 by default for ffs */
 #define	DEFAULT_UFS2
 
-/* have support for booting form UFS2 */
+/* have support for booting from UFS2 */
 #define	HAVE_UFS2_BOOT
 
 /* allow using tmpfs for /tmp instead of mfs */

Index: src/usr.sbin/installboot/installboot.8
diff -u src/usr.sbin/installboot/installboot.8:1.81 src/usr.sbin/installboot/installboot.8:1.82
--- src/usr.sbin/installboot/installboot.8:1.81	Mon Jan  9 19:40:09 2012
+++ src/usr.sbin/installboot/installboot.8	Thu Feb  9 18:35:44 2012
@@ -1,6 +1,6 @@
-.\	$NetBSD: installboot.8,v 1.81 2012/01/09 19:40:09 skrll Exp $
+.\	$NetBSD: installboot.8,v 1.82 2012/02/09 18:35:44 ast Exp $
 .\
-.\ Copyright (c) 2002-2009 The NetBSD Foundation, Inc.
+.\ Copyright (c) 2002-2012 The NetBSD Foundation, Inc.
 .\ All rights reserved.
 .\
 .\ This code is derived from software contributed to The NetBSD Foundation
@@ -27,7 +27,7 @@
 .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\ POSSIBILITY OF SUCH DAMAGE.
 .\
-.Dd January 9, 2012
+.Dd February 9, 2012
 .Dt INSTALLBOOT 8
 .Os
 .Sh NAME
@@ -458,9 +458,12 @@ to get the media and filesytem propertie
 Primary bootstrap for
 .Sy FFSv1
 file systems
-(the traditional
+(the 
+.Ql traditional
 .Nx
-file system).
+file system prior to
+.Nx
+6).
 Use
 .Xr dumpfs 8
 to confirm the file system format is
@@ -469,7 +472,9 @@ to confirm the file system format is
 .It Pa /usr/mdec/bootxx_ffsv2
 Primary bootstrap for
 .Sy FFSv2
-file systems.
+file systems (the default file system for some platforms as of
+.Nx
+6).
 Use
 .Xr dumpfs 8
 to confirm the file system format is
@@ -623,12 +628,14 @@ already present in the SysVBFS partition
 .Dl Ic installboot /dev/rsd0c /usr/mdec/bootxx_bfs
 .
 .Ss Nx Ns Tn /i386 and Nx Ns Tn /amd64
-Install new boot blocks on an existing mounted root file system on
+Install new boot blocks on an existing
+.Sy FFSv2
+mounted root file system on
 .Sq wd0 ,
 setting the timeout to five seconds, after copying a new secondary
 bootstrap:
 .Dl Ic cp /usr/mdec/boot /boot
-.Dl Ic installboot -v -o timeout=5 /dev/rwd0a /usr/mdec/bootxx_ffsv1
+.Dl Ic installboot -v -o timeout=5 /dev/rwd0a /usr/mdec/bootxx_ffsv2
 .
 .Pp
 Create a bootable CD-ROM with an ISO 9660

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

2012-02-09 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Thu Feb  9 18:58:15 UTC 2012

Modified Files:
src/sys/arch/evbmips/conf: ADM5120 AP30 MALTA XLSATX

Log Message:
Bump SYMTAB_SPACE
Disable NOFPU on MALTA


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbmips/conf/ADM5120
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbmips/conf/AP30
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/evbmips/conf/MALTA
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbmips/conf/XLSATX

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/evbmips/conf/ADM5120
diff -u src/sys/arch/evbmips/conf/ADM5120:1.10 src/sys/arch/evbmips/conf/ADM5120:1.11
--- src/sys/arch/evbmips/conf/ADM5120:1.10	Tue Nov 22 21:25:10 2011
+++ src/sys/arch/evbmips/conf/ADM5120	Thu Feb  9 18:58:14 2012
@@ -1,11 +1,11 @@
-#	$NetBSD: ADM5120,v 1.10 2011/11/22 21:25:10 tls Exp $
+#	$NetBSD: ADM5120,v 1.11 2012/02/09 18:58:14 matt Exp $
 #
 # Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500,
 # DBAu1000 and DBAu1500 evaluation boards.
 
 include 	arch/evbmips/conf/std.adm5120
 
-#ident 		GENERIC-$Revision: 1.10 $
+#ident 		GENERIC-$Revision: 1.11 $
 
 maxusers	32
 
@@ -33,7 +33,7 @@ options 	DDB		# kernel dynamic debugger
 options 	DDB_HISTORY_SIZE=100 # enable history editing in DDB
 makeoptions 	DEBUG=-g	# compile full symbol table
 makeoptions 	CPUFLAGS=-march=4kc
-options 	SYMTAB_SPACE=28	# size for embedded symbol table
+options 	SYMTAB_SPACE=29	# size for embedded symbol table
 
 #options 	MEMORY_DISK_HOOKS
 #options 	MEMORY_DISK_IS_ROOT	# Force root on ram-disk

Index: src/sys/arch/evbmips/conf/AP30
diff -u src/sys/arch/evbmips/conf/AP30:1.23 src/sys/arch/evbmips/conf/AP30:1.24
--- src/sys/arch/evbmips/conf/AP30:1.23	Sun Dec 18 05:49:26 2011
+++ src/sys/arch/evbmips/conf/AP30	Thu Feb  9 18:58:14 2012
@@ -1,10 +1,10 @@
-#	$NetBSD: AP30,v 1.23 2011/12/18 05:49:26 dholland Exp $
+#	$NetBSD: AP30,v 1.24 2012/02/09 18:58:14 matt Exp $
 
 include 	arch/evbmips/conf/std.atheros
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		AP30-$Revision: 1.23 $
+#ident 		AP30-$Revision: 1.24 $
 
 maxusers	32
 
@@ -45,7 +45,7 @@ options 	DIAGNOSTIC	# extra kernel sanit
 options 	DDB		# kernel dynamic debugger
 options 	DDB_HISTORY_SIZE=100 # enable history editing in DDB
 makeoptions 	DEBUG=-g	# compile full symbol table
-options 	SYMTAB_SPACE=351000	# size for embedded symbol table
+options 	SYMTAB_SPACE=355000	# size for embedded symbol table
 
 # Compatibility options
 #options 	COMPAT_43	# compatibility with 4.3BSD binaries

Index: src/sys/arch/evbmips/conf/MALTA
diff -u src/sys/arch/evbmips/conf/MALTA:1.64 src/sys/arch/evbmips/conf/MALTA:1.65
--- src/sys/arch/evbmips/conf/MALTA:1.64	Sun Dec 18 05:49:26 2011
+++ src/sys/arch/evbmips/conf/MALTA	Thu Feb  9 18:58:14 2012
@@ -1,16 +1,16 @@
-#	$NetBSD: MALTA,v 1.64 2011/12/18 05:49:26 dholland Exp $
+#	$NetBSD: MALTA,v 1.65 2012/02/09 18:58:14 matt Exp $
 
 include 	arch/evbmips/conf/std.malta
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		MALTA-$Revision: 1.64 $
+#ident 		MALTA-$Revision: 1.65 $
 
 maxusers	32
 
 options 	MIPS32
 options 	MIPS64
-options 	NOFPU		# No FPU
+#options 	NOFPU		# No FPU
 #options 	FPEMUL		# emulate FPU insn
 
 # Options for necessary to use MD
@@ -37,7 +37,7 @@ options 	USERCONF	# userconf(4) support
 options 	DDB		# kernel dynamic debugger
 options 	DDB_HISTORY_SIZE=100 # enable history editing in DDB
 makeoptions 	DEBUG=-g	# compile full symbol table
-options 	SYMTAB_SPACE=435000	# size for embedded symbol table
+options 	SYMTAB_SPACE=445000	# size for embedded symbol table
 
 # Compatibility options
 #options 	COMPAT_43	# compatibility with 4.3BSD binaries

Index: src/sys/arch/evbmips/conf/XLSATX
diff -u src/sys/arch/evbmips/conf/XLSATX:1.9 src/sys/arch/evbmips/conf/XLSATX:1.10
--- src/sys/arch/evbmips/conf/XLSATX:1.9	Sun Dec 18 05:49:26 2011
+++ src/sys/arch/evbmips/conf/XLSATX	Thu Feb  9 18:58:14 2012
@@ -1,8 +1,8 @@
-#	$NetBSD: XLSATX,v 1.9 2011/12/18 05:49:26 dholland Exp $
+#	$NetBSD: XLSATX,v 1.10 2012/02/09 18:58:14 matt Exp $
 
 include 	arch/evbmips/conf/std.rmixl
 
-#ident 		XLSATX-$Revision: 1.9 $
+#ident 		XLSATX-$Revision: 1.10 $
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
@@ -41,7 +41,7 @@ options 	USERCONF	# userconf(4) support
 options 	DDB		# kernel dynamic debugger
 options 	DDB_HISTORY_SIZE=100 # enable history editing in DDB
 makeoptions 	DEBUG=-g	# compile full symbol table
-options 	SYMTAB_SPACE=51	# size for embedded symbol table
+options 	SYMTAB_SPACE=52	# size for embedded symbol table
 #options 	DDB_COMMANDONENTER=trace;show registers
 options 	DB_MAX_LINE=-1

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

2012-02-09 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Thu Feb  9 18:58:44 UTC 2012

Modified Files:
src/sys/arch/evbmips/conf: MALTA32 MALTA64

Log Message:
Enable NOFPU option for N32/N64 MALTA kernels


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/conf/MALTA32
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbmips/conf/MALTA64

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/evbmips/conf/MALTA32
diff -u src/sys/arch/evbmips/conf/MALTA32:1.2 src/sys/arch/evbmips/conf/MALTA32:1.3
--- src/sys/arch/evbmips/conf/MALTA32:1.2	Mon Dec 14 00:46:01 2009
+++ src/sys/arch/evbmips/conf/MALTA32	Thu Feb  9 18:58:44 2012
@@ -1,10 +1,11 @@
-# $NetBSD: MALTA32,v 1.2 2009/12/14 00:46:01 matt Exp $
+# $NetBSD: MALTA32,v 1.3 2012/02/09 18:58:44 matt Exp $
 #
 include arch/evbmips/conf/MALTA
 
 makeoptions	LP64=no
 
 no options	MIPS32
+options 	NOFPU		# No FPU
 #options 	EXEC_ELF64
 
 no ath*

Index: src/sys/arch/evbmips/conf/MALTA64
diff -u src/sys/arch/evbmips/conf/MALTA64:1.4 src/sys/arch/evbmips/conf/MALTA64:1.5
--- src/sys/arch/evbmips/conf/MALTA64:1.4	Mon May 30 20:34:04 2011
+++ src/sys/arch/evbmips/conf/MALTA64	Thu Feb  9 18:58:44 2012
@@ -1,14 +1,15 @@
-# $NetBSD: MALTA64,v 1.4 2011/05/30 20:34:04 oster Exp $
+# $NetBSD: MALTA64,v 1.5 2012/02/09 18:58:44 matt Exp $
 #
 include arch/evbmips/conf/MALTA
 
 makeoptions	LP64=yes
 
 no options 	MIPS32
+options 	NOFPU			# No FPU
 options 	EXEC_ELF64
 options 	COMPAT_NETBSD32
 no options 	SYMTAB_SPACE
-options 	SYMTAB_SPACE=47	# size for embedded symbol table
+options 	SYMTAB_SPACE=48	# size for embedded symbol table
 
 #options 	UVMHIST, UVMHIST_PRINT

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

2012-02-09 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Thu Feb  9 19:04:04 UTC 2012

Modified Files:
src/sys/arch/ofppc/conf: GENERIC.MP

Log Message:
Change this to include GENERIC and add options MULTIPROCESSOR.
(old GENERIC.MP was woefully out-of-date)


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/ofppc/conf/GENERIC.MP

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

Modified files:

Index: src/sys/arch/ofppc/conf/GENERIC.MP
diff -u src/sys/arch/ofppc/conf/GENERIC.MP:1.17 src/sys/arch/ofppc/conf/GENERIC.MP:1.18
--- src/sys/arch/ofppc/conf/GENERIC.MP:1.17	Sun Dec 18 05:49:31 2011
+++ src/sys/arch/ofppc/conf/GENERIC.MP	Thu Feb  9 19:04:04 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.MP,v 1.17 2011/12/18 05:49:31 dholland Exp $
+# $NetBSD: GENERIC.MP,v 1.18 2012/02/09 19:04:04 matt Exp $
 #
 # GENERIC machine description file
 # 
@@ -18,432 +18,9 @@
 # of each device driver in this file see the section 4 man page for the
 # device.
 
-include 	arch/ofppc/conf/std.ofppc
-
-options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
-
-#ident 		GENERIC-$Revision: 1.17 $
-
-maxusers	32
-
-options 	PIC_OPENPIC
-options 	PIC_DISTOPENPIC
-options 	PIC_I8259
-#options 	PIC_PREPIVR
+include 	arch/ofppc/conf/GENERIC
 
 # SMP options
 options 	MULTIPROCESSOR
 options 	IPI_OPENPIC
-options		PMAP_NEED_FULL_MAPKERNEL
-
-# various hacks due to bugs in Openfirmware implementation
-options 	FIRMWORKSBUGS
-
-# Standard system options
-options 	INSECURE	# disable kernel security checks
-#options 	NTP		# NTP phase/frequency locked loop
-options 	KTRACE		# system call tracing via ktrace(1)
-
-options 	SYSVMSG		# System V message queues
-options 	SYSVSEM		# System V semaphores
-options 	SYSVSHM		# System V shared memory
-options 	P1003_1B_SEMAPHORE # p1003.1b semaphore support
-
-
-options 	USERCONF	# userconf(4) support
-#options 	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
-options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
-options 	RDB_PART	# Rigid Disk Block partition support
-
-# Diagnostic/debugging support options
-#options 	DIAGNOSTIC	# cheap kernel consistency checks
-#options 	DEBUG		# expensive debugging checks/support
-#options 	KMEMSTATS	# kernel memory statistics (vmstat -m)
-options 	DDB		# in-kernel debugger
-options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
-options 	DDB_VERBOSE_HELP
-options 	TRAP_PANICWAIT
-
-makeoptions	DEBUG=-g	# compile full symbol table
-
-# Compatibility option
-options 	COMPAT_09	# NetBSD 0.9,
-options 	COMPAT_10	# NetBSD 1.0,
-options 	COMPAT_11	# NetBSD 1.1,
-options 	COMPAT_12	# NetBSD 1.2,
-options 	COMPAT_13	# NetBSD 1.3,
-options 	COMPAT_14	# NetBSD 1.4,
-options 	COMPAT_15	# NetBSD 1.5,
-options 	COMPAT_16	# NetBSD 1.6,
-options 	COMPAT_20	# NetBSD 2.0,
-options 	COMPAT_30	# NetBSD 3.0 compatibility.
-options 	COMPAT_40	# NetBSD 4.0 compatibility.
-options 	COMPAT_50	# NetBSD 5.0 compatibility.
-options 	COMPAT_43	# and 4.3BSD
-options 	COMPAT_386BSD_MBRPART # recognize old partition ID
-#options 	COMPAT_LINUX	# Linux binary compatibility
-#options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
-options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
-
-# File systems
-file-system 	FFS		# UFS
-file-system 	EXT2FS		# second extended file system (linux)
-file-system 	LFS		# log-structured file system
-file-system 	MFS		# memory file system
-file-system 	NFS		# Network file System client
-file-system 	CD9660		# ISO 9660 + Rock Ridge file system
-file-system 	MSDOSFS		# MS-DOS file system
-file-system 	ADOSFS		# AmigaDOS file system
-file-system 	FDESC		# /dev/fd
-file-system 	KERNFS		# /kern
-file-system 	NULLFS		# loopback file system
-file-system 	OVERLAY		# overlay file system
-file-system	PUFFS		# Userspace file systems (e.g. ntfs-3g  sshfs)
-file-system 	PROCFS		# /proc
-file-system 	UMAPFS		# NULLFS + uid and gid remapping
-file-system 	UNION		# union file system
-file-system 	NTFS		# Windows NT file system
-file-system	PTYFS		# /dev/pts/N support
-file-system	TMPFS		# Efficient memory file-system
-#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
-
-# File system options
-options 	QUOTA		# legacy UFS quotas
-options 	QUOTA2		# new, in-filesystem UFS quotas
-options 	FFS_EI		# FFS Endian Independent support
-options 	WAPBL		# File system journaling support
-#options 	UFS_DIRHASH	# UFS Large Directory Hashing - Experimental
-options 	NFSSERVER	# Network File System server
-#options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
-#options 	EXT2FS_SYSTEM_FLAGS	# makes ext2fs file flags (append and
-	# immutable) behave as system flags.
-
-options 	NFS_BOOT_DHCP	# Support DHCP NFS root
-
-# Networking options
-#options 	GATEWAY		# packet forwarding
-options 	INET		# IP + ICMP + TCP + UDP
-options 	INET6		# IPV6
-#options 	IPSEC		# IP security
-#options 	IPSEC_ESP	# IP security (encryption part; define w/IPSEC)
-#options

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

2012-02-09 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Thu Feb  9 19:07:38 UTC 2012

Modified Files:
src/sys/arch/evbarm/conf: BEAGLEBOARD DNS323 GUMSTIX IQ80310_INSTALL
IQ80321 IQ80321_INSTALL KUROBOX_PRO MPCSA_GENERIC NSLU2

Log Message:
Bump SYMTAB_SPACE


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbarm/conf/BEAGLEBOARD
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/DNS323
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/evbarm/conf/GUMSTIX
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/IQ80310_INSTALL \
src/sys/arch/evbarm/conf/IQ80321_INSTALL
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/evbarm/conf/IQ80321
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/KUROBOX_PRO
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbarm/conf/MPCSA_GENERIC
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/conf/NSLU2

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/evbarm/conf/BEAGLEBOARD
diff -u src/sys/arch/evbarm/conf/BEAGLEBOARD:1.24 src/sys/arch/evbarm/conf/BEAGLEBOARD:1.25
--- src/sys/arch/evbarm/conf/BEAGLEBOARD:1.24	Sun Dec 18 05:49:25 2011
+++ src/sys/arch/evbarm/conf/BEAGLEBOARD	Thu Feb  9 19:07:37 2012
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: BEAGLEBOARD,v 1.24 2011/12/18 05:49:25 dholland Exp $
+#	$NetBSD: BEAGLEBOARD,v 1.25 2012/02/09 19:07:37 matt Exp $
 #
 #	BEAGLEBOARD -- TI OMAP 3530 Eval Board Kernel
 #
@@ -142,7 +142,7 @@ options		DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB
 makeoptions	DEBUG=-g	# compile full symbol table
-options 	SYMTAB_SPACE=31
+options 	SYMTAB_SPACE=53
 
 ## USB Debugging options
 options USB_DEBUG

Index: src/sys/arch/evbarm/conf/DNS323
diff -u src/sys/arch/evbarm/conf/DNS323:1.3 src/sys/arch/evbarm/conf/DNS323:1.4
--- src/sys/arch/evbarm/conf/DNS323:1.3	Sun Mar  6 05:08:03 2011
+++ src/sys/arch/evbarm/conf/DNS323	Thu Feb  9 19:07:37 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: DNS323,v 1.3 2011/03/06 05:08:03 jakllsch Exp $
+#	$NetBSD: DNS323,v 1.4 2012/02/09 19:07:37 matt Exp $
 #
 #  DNS323 -- D-Link. DNS-323 platform kernel
 #
@@ -24,7 +24,7 @@ options 	DDB		# in-kernel debugger
 #options 	KGDB
 #options 	DEBUG_KGDB
 makeoptions	DEBUG=-g -O2	# compile full symbol table
-options 	SYMTAB_SPACE=71
+options 	SYMTAB_SPACE=81
 #options 	AUDIO_DEBUG=2
 
 

Index: src/sys/arch/evbarm/conf/GUMSTIX
diff -u src/sys/arch/evbarm/conf/GUMSTIX:1.63 src/sys/arch/evbarm/conf/GUMSTIX:1.64
--- src/sys/arch/evbarm/conf/GUMSTIX:1.63	Sun Dec 18 05:49:25 2011
+++ src/sys/arch/evbarm/conf/GUMSTIX	Thu Feb  9 19:07:37 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: GUMSTIX,v 1.63 2011/12/18 05:49:25 dholland Exp $
+#	$NetBSD: GUMSTIX,v 1.64 2012/02/09 19:07:37 matt Exp $
 #
 #	GUMSTIX -- Gumstix. Inc. gumstix platforms kernel
 #
@@ -165,7 +165,7 @@ options 	DDB		# in-kernel debugger
 #options 	KGDB
 #options 	DEBUG_KGDB
 makeoptions	DEBUG=-g -O2	# compile full symbol table
-options 	SYMTAB_SPACE=78
+options 	SYMTAB_SPACE=785000
 #options 	AUDIO_DEBUG=2
 
 config		netbsd		root on ? type ?

Index: src/sys/arch/evbarm/conf/IQ80310_INSTALL
diff -u src/sys/arch/evbarm/conf/IQ80310_INSTALL:1.1 src/sys/arch/evbarm/conf/IQ80310_INSTALL:1.2
--- src/sys/arch/evbarm/conf/IQ80310_INSTALL:1.1	Tue Apr  8 20:49:02 2003
+++ src/sys/arch/evbarm/conf/IQ80310_INSTALL	Thu Feb  9 19:07:37 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: IQ80310_INSTALL,v 1.1 2003/04/08 20:49:02 thorpej Exp $
+#	$NetBSD: IQ80310_INSTALL,v 1.2 2012/02/09 19:07:37 matt Exp $
 #
 #	IQ80310_INSTALL -- IQ80310 kernel with installation-sized
 #	ramdisk
@@ -6,3 +6,9 @@
 
 include arch/evbarm/conf/IQ80310
 include arch/evbarm/conf/INSTALL
+
+options UVMHIST,UVMHIST_PRINT
+
+no config netbsd-sd0
+no config netbsd-wd0
+no config netbsd-fxp0
Index: src/sys/arch/evbarm/conf/IQ80321_INSTALL
diff -u src/sys/arch/evbarm/conf/IQ80321_INSTALL:1.1 src/sys/arch/evbarm/conf/IQ80321_INSTALL:1.2
--- src/sys/arch/evbarm/conf/IQ80321_INSTALL:1.1	Tue Apr  8 20:49:02 2003
+++ src/sys/arch/evbarm/conf/IQ80321_INSTALL	Thu Feb  9 19:07:37 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: IQ80321_INSTALL,v 1.1 2003/04/08 20:49:02 thorpej Exp $
+#	$NetBSD: IQ80321_INSTALL,v 1.2 2012/02/09 19:07:37 matt Exp $
 #
 #	IQ80321_INSTALL -- IQ80321 kernel with installation-sized
 #	ramdisk
@@ -6,3 +6,12 @@
 
 include arch/evbarm/conf/IQ80321
 include arch/evbarm/conf/INSTALL
+
+#options 	UVMHIST,UVMHIST_PRINT
+options 	VERBOSE_INIT_ARM
+makeoptions	DEBUG=-g
+#options 	PMAPDEBUG
+
+no config netbsd-sd0
+no config netbsd-wd0
+no config netbsd-wm0

Index: src/sys/arch/evbarm/conf/IQ80321
diff -u src/sys/arch/evbarm/conf/IQ80321:1.70 src/sys/arch/evbarm/conf/IQ80321:1.71
--- src/sys/arch/evbarm/conf/IQ80321:1.70	Sun Dec 18 05:49:26 2011
+++ src/sys/arch/evbarm/conf/IQ80321	Thu Feb  9 19:07:37 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: IQ80321,v 1.70 2011/12/18 05:49:26 dholland Exp $
+#	$NetBSD: IQ80321,v 1.71 2012/02/09 19:07:37 matt Exp $
 #
 #

CVS commit: [matt-nb5-mips64] src/sys/arch/mips

2012-02-09 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Thu Feb  9 20:01:21 UTC 2012

Modified Files:
src/sys/arch/mips/include [matt-nb5-mips64]: locore.h
src/sys/arch/mips/mips [matt-nb5-mips64]: locore.S locore_mips1.S
mipsX_subr.S mips_fixup.c

Log Message:
Update mips_fixup.c to version from -HEAD.
Move cpu_switchto to locore jumpvec and create a stub for it.


To generate a diff of this commit:
cvs rdiff -u -r1.78.36.1.2.31 -r1.78.36.1.2.32 \
src/sys/arch/mips/include/locore.h
cvs rdiff -u -r1.167.38.24 -r1.167.38.25 src/sys/arch/mips/mips/locore.S
cvs rdiff -u -r1.64.26.1.2.14 -r1.64.26.1.2.15 \
src/sys/arch/mips/mips/locore_mips1.S
cvs rdiff -u -r1.26.36.1.2.54 -r1.26.36.1.2.55 \
src/sys/arch/mips/mips/mipsX_subr.S
cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/sys/arch/mips/mips/mips_fixup.c

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

Modified files:

Index: src/sys/arch/mips/include/locore.h
diff -u src/sys/arch/mips/include/locore.h:1.78.36.1.2.31 src/sys/arch/mips/include/locore.h:1.78.36.1.2.32
--- src/sys/arch/mips/include/locore.h:1.78.36.1.2.31	Fri Dec 23 08:09:08 2011
+++ src/sys/arch/mips/include/locore.h	Thu Feb  9 20:01:21 2012
@@ -111,6 +111,8 @@ struct mips_jump_fixup_info {
 void	fixup_splcalls(void);/* splstubs.c */
 bool	mips_fixup_exceptions(mips_fixup_callback_t);
 bool	mips_fixup_zero_relative(int32_t, uint32_t [2]);
+intptr_t
+	mips_fixup_addr(const uint32_t *);
 void	mips_fixup_stubs(uint32_t *, uint32_t *);
 
 /*
@@ -348,6 +350,7 @@ typedef struct  {
 	void	(*ljv_tlb_enter)(size_t, vaddr_t, uint32_t);
 	void	(*ljv_tlb_read_indexed)(size_t, struct tlbmask *);
 	void	(*ljv_tlb_write_indexed)(size_t, const struct tlbmask *);
+	lwp_t *	(*ljv_cpu_switchto)(lwp_t *, lwp_t *, bool);
 } mips_locore_jumpvec_t;
 
 typedef struct {

Index: src/sys/arch/mips/mips/locore.S
diff -u src/sys/arch/mips/mips/locore.S:1.167.38.24 src/sys/arch/mips/mips/locore.S:1.167.38.25
--- src/sys/arch/mips/mips/locore.S:1.167.38.24	Thu Jan 19 08:28:49 2012
+++ src/sys/arch/mips/mips/locore.S	Thu Feb  9 20:01:21 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.167.38.24 2012/01/19 08:28:49 matt Exp $	*/
+/*	locore.S,v 1.167.38.24 2012/01/19 08:28:49 matt Exp	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -172,17 +172,18 @@ _C_LABEL(kernel_text):
 _C_LABEL(verylocore):
 
 /*
- * struct lwp *cpu_switchto(struct lwp *cur, struct lwp *next)
+ * lwp_t *mips_cpu_switchto(lwp_t *cur, lwp_t *next, bool returning)
  * Switch to the specified next LWP
  * Arguments:
  *	a0	the current LWP
  *	a1	the LWP to switch to
+ *	a2	returning to a softint LWP
  * Returns:
  *	v0	the LWP we have switched from
  *
  * called at IPL_SCHED
  */
-NESTED(cpu_switchto, CALLFRAME_SIZ, ra)
+NESTED(mips_cpu_switchto, CALLFRAME_SIZ, ra)
 #ifdef PARANOIA
 	/*
 	 * Make sure we are at IPL_SCHED
@@ -299,7 +300,7 @@ NESTED(cpu_switchto, CALLFRAME_SIZ, ra)
 #else
 	JR_HB_RA
 #endif /* PARANOIA */
-END(cpu_switchto)
+END(mips_cpu_switchto)
 
 #ifdef __HAVE_FAST_SOFTINTS
 /*

Index: src/sys/arch/mips/mips/locore_mips1.S
diff -u src/sys/arch/mips/mips/locore_mips1.S:1.64.26.1.2.14 src/sys/arch/mips/mips/locore_mips1.S:1.64.26.1.2.15
--- src/sys/arch/mips/mips/locore_mips1.S:1.64.26.1.2.14	Fri Dec 23 23:12:34 2011
+++ src/sys/arch/mips/mips/locore_mips1.S	Thu Feb  9 20:01:21 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore_mips1.S,v 1.64.26.1.2.14 2011/12/23 23:12:34 matt Exp $	*/
+/*	locore_mips1.S,v 1.64.26.1.2.14 2011/12/23 23:12:34 matt Exp	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -1735,6 +1735,7 @@ _C_LABEL(MIPSX(locore_vec)):
 	PTR_WORD _C_LABEL(MIPSX(tlb_enter))
 	PTR_WORD _C_LABEL(MIPSX(tlb_read_indexed))
 	PTR_WORD _C_LABEL(MIPSX(tlb_write_indexed))
+	PTR_WORD _C_LABEL(mips_cpu_switchto)
 
 	.globl _C_LABEL(MIPSX(locoresw))
 _C_LABEL(MIPSX(locoresw)):

Index: src/sys/arch/mips/mips/mipsX_subr.S
diff -u src/sys/arch/mips/mips/mipsX_subr.S:1.26.36.1.2.54 src/sys/arch/mips/mips/mipsX_subr.S:1.26.36.1.2.55
--- src/sys/arch/mips/mips/mipsX_subr.S:1.26.36.1.2.54	Thu Jan 19 08:28:49 2012
+++ src/sys/arch/mips/mips/mipsX_subr.S	Thu Feb  9 20:01:21 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: mipsX_subr.S,v 1.26.36.1.2.54 2012/01/19 08:28:49 matt Exp $	*/
+/*	$NetBSD: mipsX_subr.S,v 1.26.36.1.2.55 2012/02/09 20:01:21 matt Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -2912,6 +2912,7 @@ _C_LABEL(MIPSX(locore_vec)):
 	PTR_WORD _C_LABEL(MIPSX(tlb_enter))
 	PTR_WORD _C_LABEL(MIPSX(tlb_read_indexed))
 	PTR_WORD _C_LABEL(MIPSX(tlb_write_indexed))
+	PTR_WORD _C_LABEL(mips_cpu_switchto)
 
 	.globl _C_LABEL(MIPSX(locoresw))
 _C_LABEL(MIPSX(locoresw)):

Index: src/sys/arch/mips/mips/mips_fixup.c
diff -u src/sys/arch/mips/mips/mips_fixup.c:1.1.2.12 src/sys/arch/mips/mips/mips_fixup.c:1.1.2.13
--- src/sys/arch/mips/mips/mips_fixup.c:1.1.2.12	Fri Nov  4 07:47:40 2011
+++ src/sys/arch/mips/mips/mips_fixup.c	Thu Feb  9 20:01:21 2012
@@ -1,3 +1,5 @@
+/*	$NetBSD:

CVS commit: src

2012-02-09 Thread S.P.Zeidler

Module Name:src
Committed By:   spz
Date:   Thu Feb  9 21:49:31 UTC 2012

Modified Files:
src: UPDATING

Log Message:
fix typo/braino


To generate a diff of this commit:
cvs rdiff -u -r1.233 -r1.234 src/UPDATING

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

Modified files:

Index: src/UPDATING
diff -u src/UPDATING:1.233 src/UPDATING:1.234
--- src/UPDATING:1.233	Tue Feb  7 19:37:14 2012
+++ src/UPDATING	Thu Feb  9 21:49:31 2012
@@ -1,4 +1,4 @@
-$NetBSD: UPDATING,v 1.233 2012/02/07 19:37:14 joerg Exp $
+$NetBSD: UPDATING,v 1.234 2012/02/09 21:49:31 spz Exp $
 
 This file (UPDATING) is intended to be a brief reference to recent
 changes that might cause problems in the build process, and a guide for
@@ -17,7 +17,7 @@ Recent changes:
 ^^^
 
 20120207:
-	Default for MKCATPAGES changed to NO. Update builds with fail
+	Default for MKCATPAGES changed to NO. Update builds will fail
 	unless DESTDIR is cleaned manually.
 
 20111227:

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

2012-02-09 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Feb  9 23:32:55 UTC 2012

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

Log Message:
Cosmetic:
- add %s: __func__, function names change [most of them were wrong]
- add a DIAGNOSTIC printf to help debug alignment fixups


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/arm/arm32/fault.c

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

Modified files:

Index: src/sys/arch/arm/arm32/fault.c
diff -u src/sys/arch/arm/arm32/fault.c:1.78 src/sys/arch/arm/arm32/fault.c:1.79
--- src/sys/arch/arm/arm32/fault.c:1.78	Sun Dec 19 19:25:27 2010
+++ src/sys/arch/arm/arm32/fault.c	Thu Feb  9 18:32:55 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: fault.c,v 1.78 2010/12/20 00:25:27 matt Exp $	*/
+/*	$NetBSD: fault.c,v 1.79 2012/02/09 23:32:55 christos Exp $	*/
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
 #include opt_sa.h
 
 #include sys/types.h
-__KERNEL_RCSID(0, $NetBSD: fault.c,v 1.78 2010/12/20 00:25:27 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: fault.c,v 1.79 2012/02/09 23:32:55 christos Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -193,7 +193,7 @@ data_abort_fixup(trapframe_t *tf, u_int 
 	/*
 	 * Oops, couldn't fix up the instruction
 	 */
-	printf(data_abort_fixup: fixup for %s mode data abort failed.\n,
+	printf(%s: fixup for %s mode data abort failed.\n, __func__,
 	TRAP_USERMODE(tf) ? user : kernel);
 #ifdef THUMB_CODE
 	if (tf-tf_spsr  PSR_T_bit) {
@@ -263,6 +263,10 @@ data_abort_handler(trapframe_t *tf)
 
 	/* Invoke the appropriate handler, if necessary */
 	if (__predict_false(data_aborts[fsr  FAULT_TYPE_MASK].func != NULL)) {
+#ifdef DIAGNOSTIC
+		printf(%s: data_aborts fsr=0x%x far=0x%x\n,
+		__func__, fsr, far);
+#endif
 		if ((data_aborts[fsr  FAULT_TYPE_MASK].func)(tf, fsr, far,
 		l, ksi))
 			goto do_trapsignal;
@@ -306,8 +310,8 @@ data_abort_handler(trapframe_t *tf)
 	 * at some point.
 	 */
 	if (__predict_false(!user  (tf-tf_pc  3) != 0)) {
-		printf(\ndata_abort_fault: Misaligned Kernel-mode 
-		Program Counter\n);
+		printf(\n%s: Misaligned Kernel-mode Program Counter\n,
+		__func__);
 		dab_fatal(tf, fsr, far, l, NULL);
 	}
 #else
@@ -328,8 +332,8 @@ data_abort_handler(trapframe_t *tf)
 		/*
 		 * The kernel never executes Thumb code.
 		 */
-		printf(\ndata_abort_fault: Misaligned Kernel-mode 
-		Program Counter\n);
+		printf(\n%s: Misaligned Kernel-mode Program Counter\n,
+		__func__);
 		dab_fatal(tf, fsr, far, l, NULL);
 	}
 #endif
@@ -736,8 +740,7 @@ prefetch_abort_fixup(trapframe_t *tf)
 	/*
 	 * Oops, couldn't fix up the instruction
 	 */
-	printf(
-	prefetch_abort_fixup: fixup for %s mode prefetch abort failed.\n,
+	printf(%s: fixup for %s mode prefetch abort failed.\n, __func__,
 	TRAP_USERMODE(tf) ? user : kernel);
 #ifdef THUMB_CODE
 	if (tf-tf_spsr  PSR_T_bit) {
@@ -957,7 +960,7 @@ badaddr_read(void *addr, size_t size, vo
 
 	default:
 		curpcb = curpcb_save;
-		panic(badaddr: invalid size (%lu), (u_long) size);
+		panic(%s: invalid size (%lu), __func__, (u_long)size);
 	}
 
 	/* Restore curpcb */

CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips

2012-02-09 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Fri Feb 10 00:02:55 UTC 2012

Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: locore_mips3.S

Log Message:
Fix comment.


To generate a diff of this commit:
cvs rdiff -u -r1.93.38.15 -r1.93.38.16 src/sys/arch/mips/mips/locore_mips3.S

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

Modified files:

Index: src/sys/arch/mips/mips/locore_mips3.S
diff -u src/sys/arch/mips/mips/locore_mips3.S:1.93.38.15 src/sys/arch/mips/mips/locore_mips3.S:1.93.38.16
--- src/sys/arch/mips/mips/locore_mips3.S:1.93.38.15	Thu Jan 19 08:28:49 2012
+++ src/sys/arch/mips/mips/locore_mips3.S	Fri Feb 10 00:02:55 2012
@@ -534,7 +534,7 @@ END(mipsNN_cp0_watchhi_write)
 #if (MIPS32R2 + MIPS64R2 + MIPS64R2_RMIXL)  0
 /*
  * void mipsNN_cp0_userlocal_write(void *);
- *	Set the value of the CP0 USERLOCAL (TLB_CONTEXT, select 2) register.
+ *	Set the value of the CP0 HWRENA register.
  */
 LEAF(mipsNN_cp0_hwrena_write)
 	j	ra

CVS commit: src/external/gpl3/binutils/dist/bfd

2012-02-09 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Fri Feb 10 01:47:38 UTC 2012

Modified Files:
src/external/gpl3/binutils/dist/bfd: elf32-vax.c

Log Message:
Fix problem leading to triggering a BFD assert: when allocating space in the
got, do not allocate slots for symbols without default visibility.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/dist/bfd/elf32-vax.c

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

Modified files:

Index: src/external/gpl3/binutils/dist/bfd/elf32-vax.c
diff -u src/external/gpl3/binutils/dist/bfd/elf32-vax.c:1.4 src/external/gpl3/binutils/dist/bfd/elf32-vax.c:1.5
--- src/external/gpl3/binutils/dist/bfd/elf32-vax.c:1.4	Sun Sep 25 11:07:32 2011
+++ src/external/gpl3/binutils/dist/bfd/elf32-vax.c	Fri Feb 10 01:47:37 2012
@@ -1358,6 +1358,7 @@ elf_vax_instantiate_got_entries (struct 
 
   if (!elf_hash_table (info)-dynamic_sections_created
   || (info-shared  info-symbolic)
+  || ELF_ST_VISIBILITY (h-other) != STV_DEFAULT
   || h-forced_local)
 {
   h-got.refcount = 0;
@@ -1378,9 +1379,7 @@ elf_vax_instantiate_got_entries (struct 
 
   dyn = elf_hash_table (info)-dynamic_sections_created;
   /* Allocate space in the .got and .rela.got sections.  */
-  if (ELF_ST_VISIBILITY (h-other) == STV_DEFAULT
-	   (info-shared
-	  || WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h)))
+  if (info-shared || WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h))
 	{
 	  sgot-size += 4;
 	  srelgot-size += sizeof (Elf32_External_Rela);

CVS commit: src/sys/ddb

2012-02-09 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Feb 10 02:14:04 UTC 2012

Modified Files:
src/sys/ddb: db_sym.c

Log Message:
fix printf formats.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/ddb/db_sym.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/ddb/db_sym.c
diff -u src/sys/ddb/db_sym.c:1.63 src/sys/ddb/db_sym.c:1.64
--- src/sys/ddb/db_sym.c:1.63	Thu Feb  9 12:07:07 2012
+++ src/sys/ddb/db_sym.c	Thu Feb  9 21:14:04 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_sym.c,v 1.63 2012/02/09 17:07:07 christos Exp $	*/
+/*	$NetBSD: db_sym.c,v 1.64 2012/02/10 02:14:04 christos Exp $	*/
 
 /*
  * Mach Operating System
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_sym.c,v 1.63 2012/02/09 17:07:07 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_sym.c,v 1.64 2012/02/10 02:14:04 christos Exp $);
 
 #ifdef _KERNEL_OPT
 #include opt_ddbparam.h
@@ -410,7 +410,7 @@ db_printsym(db_expr_t off, db_strategy_t
 			}
 			return;
 		}
-		(*pr)(db_num_to_str(off));
+		(*pr)(%s, db_num_to_str(off));
 		return;
 	}
 #endif
@@ -437,7 +437,7 @@ db_printsym(db_expr_t off, db_strategy_t
 		}
 	}
 #endif
-	(*pr)(db_num_to_str(off));
+	(*pr)(%s, db_num_to_str(off));
 	return;
 }

CVS commit: src/sys/ddb

2012-02-09 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Feb 10 02:14:23 UTC 2012

Modified Files:
src/sys/ddb: db_interface.h db_lwp.h db_output.h db_sym.h

Log Message:
add __printflike where needed


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/ddb/db_interface.h
cvs rdiff -u -r1.1 -r1.2 src/sys/ddb/db_lwp.h
cvs rdiff -u -r1.19 -r1.20 src/sys/ddb/db_output.h
cvs rdiff -u -r1.24 -r1.25 src/sys/ddb/db_sym.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/ddb/db_interface.h
diff -u src/sys/ddb/db_interface.h:1.27 src/sys/ddb/db_interface.h:1.28
--- src/sys/ddb/db_interface.h:1.27	Thu May 26 11:34:14 2011
+++ src/sys/ddb/db_interface.h	Thu Feb  9 21:14:23 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_interface.h,v 1.27 2011/05/26 15:34:14 joerg Exp $	*/
+/*	$NetBSD: db_interface.h,v 1.28 2012/02/10 02:14:23 christos Exp $	*/
 
 /*-
  * Copyright (c) 1995 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@ db_addr_t	db_disasm(db_addr_t, bool);
 /* arch/arch/arch/db_trace.c */
 /* arch/vax/vax/db_machdep.c */
 void		db_stack_trace_print(db_expr_t, bool, db_expr_t, const char *,
-		void (*)(const char *, ...));
+void (*)(const char *, ...) __printflike(1, 2));
 
 /* ddb/db_xxx.c */
 void		db_kgdb_cmd(db_expr_t, bool, db_expr_t, const char *);

Index: src/sys/ddb/db_lwp.h
diff -u src/sys/ddb/db_lwp.h:1.1 src/sys/ddb/db_lwp.h:1.2
--- src/sys/ddb/db_lwp.h:1.1	Sat Mar  7 17:02:17 2009
+++ src/sys/ddb/db_lwp.h	Thu Feb  9 21:14:23 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_lwp.h,v 1.1 2009/03/07 22:02:17 ad Exp $	*/
+/*	$NetBSD: db_lwp.h,v 1.2 2012/02/10 02:14:23 christos Exp $	*/
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -34,6 +34,7 @@
 
 struct lwp	*db_lwp_first(void);
 struct lwp	*db_lwp_next(struct lwp *);
-void		db_lwp_whatis(uintptr_t, void (*)(const char *, ...));
+void		db_lwp_whatis(uintptr_t,
+void (*)(const char *, ...) __printflike(1, 2));
 
 #endif /* _DDB_DB_LWP_H_ */

Index: src/sys/ddb/db_output.h
diff -u src/sys/ddb/db_output.h:1.19 src/sys/ddb/db_output.h:1.20
--- src/sys/ddb/db_output.h:1.19	Sun Jul 17 16:54:50 2011
+++ src/sys/ddb/db_output.h	Thu Feb  9 21:14:23 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_output.h,v 1.19 2011/07/17 20:54:50 joerg Exp $	*/
+/*	$NetBSD: db_output.h,v 1.20 2012/02/10 02:14:23 christos Exp $	*/
 
 /*
  * Mach Operating System
@@ -37,8 +37,7 @@
 void	db_force_whitespace(void);
 void	db_putchar(int);
 int	db_print_position(void);
-void	db_printf(const char *, ...)
-	__attribute__((__format__(__printf__,1,2)));
+void	db_printf(const char *, ...) __printflike(1, 2);
 void	db_vprintf(const char *, va_list);
 void	db_format_radix(char *, size_t, quad_t, int);
 void	db_format_hex(char *, size_t, quad_t, int);

Index: src/sys/ddb/db_sym.h
diff -u src/sys/ddb/db_sym.h:1.24 src/sys/ddb/db_sym.h:1.25
--- src/sys/ddb/db_sym.h:1.24	Mon Apr 11 00:22:32 2011
+++ src/sys/ddb/db_sym.h	Thu Feb  9 21:14:23 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_sym.h,v 1.24 2011/04/11 04:22:32 mrg Exp $	*/
+/*	$NetBSD: db_sym.h,v 1.25 2012/02/10 02:14:23 christos Exp $	*/
 
 /*
  * Mach Operating System
@@ -113,6 +113,6 @@ void		db_symbol_values(db_sym_t, const c
 
 void		db_symstr(char *, size_t, db_expr_t, db_strategy_t);
 void		db_printsym(db_expr_t, db_strategy_t,
-		void(*)(const char *, ...));
+void(*)(const char *, ...) __printflike(1, 2));
 	/* print closest symbol to a value */
 bool		db_sym_numargs(db_sym_t, int *, char **);

CVS commit: src/sys/arch

2012-02-09 Thread Michael L. Hitch

Module Name:src
Committed By:   mhitch
Date:   Fri Feb 10 04:49:46 UTC 2012

Modified Files:
src/sys/arch/atari/atari: atari_init.c
src/sys/arch/cesfic/cesfic: pmap_bootstrap.c
src/sys/arch/hp300/hp300: pmap_bootstrap.c
src/sys/arch/luna68k/luna68k: pmap_bootstrap.c
src/sys/arch/mac68k/mac68k: pmap_bootstrap.c
src/sys/arch/mvme68k/mvme68k: pmap_bootstrap.c
src/sys/arch/news68k/news68k: pmap_bootstrap.c
src/sys/arch/next68k/next68k: pmap_bootstrap.c
src/sys/arch/x68k/x68k: pmap_bootstrap.c

Log Message:
The recent kmem changes allocate a large kernel address space before
pmap_init() is called, and the initial kernel PT pages aren't enough
for the allocations pmap_init().  This fails because pmap_kenter_pa()
tries to allocate a new kernel PT page and traps because the pmap has
not been initialized.  When computing the number if initial kernel PT
pages, include enough to allow kmem to map the physical memory.  This
should fix PR/45915.  OK by releng@.  One mac68k system has been verified
to boot.  Volunteers to test the others welcome.  Amigas with at least
up to 128MB of memory were OK, but larger memory will need some adjusting.


To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/atari/atari/atari_init.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/cesfic/cesfic/pmap_bootstrap.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/hp300/hp300/pmap_bootstrap.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/luna68k/luna68k/pmap_bootstrap.c
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/mac68k/mac68k/pmap_bootstrap.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/news68k/news68k/pmap_bootstrap.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/next68k/next68k/pmap_bootstrap.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/x68k/x68k/pmap_bootstrap.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/atari/atari/atari_init.c
diff -u src/sys/arch/atari/atari/atari_init.c:1.97 src/sys/arch/atari/atari/atari_init.c:1.98
--- src/sys/arch/atari/atari/atari_init.c:1.97	Fri Jan 27 18:52:52 2012
+++ src/sys/arch/atari/atari/atari_init.c	Fri Feb 10 04:49:44 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: atari_init.c,v 1.97 2012/01/27 18:52:52 para Exp $	*/
+/*	$NetBSD: atari_init.c,v 1.98 2012/02/10 04:49:44 mhitch Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman
@@ -33,7 +33,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: atari_init.c,v 1.97 2012/01/27 18:52:52 para Exp $);
+__KERNEL_RCSID(0, $NetBSD: atari_init.c,v 1.98 2012/02/10 04:49:44 mhitch Exp $);
 
 #include opt_ddb.h
 #include opt_mbtype.h
@@ -322,6 +322,12 @@ start_c(int id, u_int ttphystart, u_int 
 	if (machineid  ATARI_MILAN)
 		ptextra += btoc(PCI_IO_SIZE + PCI_MEM_SIZE);
 	ptextra += btoc(BOOTM_VA_POOL);
+	/*
+	 * now need to account for the kmem area, which is allocated
+	 * before pmap_init() is called.  It is roughly the size of physical
+	 * memory.
+	 */
+	ptextra += physmem;
 
 	/*
 	 * The 'pt' (the initial kernel pagetable) has to map the kernel and

Index: src/sys/arch/cesfic/cesfic/pmap_bootstrap.c
diff -u src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.31 src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.32
--- src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.31	Sun Jan  2 18:48:05 2011
+++ src/sys/arch/cesfic/cesfic/pmap_bootstrap.c	Fri Feb 10 04:49:45 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_bootstrap.c,v 1.31 2011/01/02 18:48:05 tsutsui Exp $	*/
+/*	$NetBSD: pmap_bootstrap.c,v 1.32 2012/02/10 04:49:45 mhitch Exp $	*/
 
 /* 
  * Copyright (c) 1991, 1993
@@ -36,7 +36,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.31 2011/01/02 18:48:05 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.32 2012/02/10 04:49:45 mhitch Exp $);
 
 #include sys/param.h
 #include uvm/uvm_extern.h
@@ -120,7 +120,7 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f
 	lkptpa = nextpa;
 	nextpa += PAGE_SIZE;
 	kptpa = nextpa;
-	nptpages = RELOC(Sysptsize, int);
+	nptpages = RELOC(Sysptsize, int) + howmany(physmem, NPTEPG);
 	nextpa += nptpages * PAGE_SIZE;
 
 	/*

Index: src/sys/arch/hp300/hp300/pmap_bootstrap.c
diff -u src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.54 src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.55
--- src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.54	Thu Jan  6 14:19:54 2011
+++ src/sys/arch/hp300/hp300/pmap_bootstrap.c	Fri Feb 10 04:49:45 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_bootstrap.c,v 1.54 2011/01/06 14:19:54 tsutsui Exp $	*/
+/*	$NetBSD: pmap_bootstrap.c,v 1.55 2012/02/10 04:49:45 mhitch Exp $	*/
 
 /*
  * Copyright (c) 1991, 1993
@@ -36,7 +36,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.54 2011/01/06 14:19:54 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.55 2012/02/10 04:49:45 mhitch Exp $);
 
 #include sys/param.h
 #include

CVS commit: src/share/mk

2012-02-09 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Fri Feb 10 05:57:42 UTC 2012

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

Log Message:
Switch VAX to use GCC 4.5 and GDB 7.
Change VAX to use DBG=-O2 like most other ports.


To generate a diff of this commit:
cvs rdiff -u -r1.695 -r1.696 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.107 -r1.108 src/share/mk/sys.mk

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

Modified files:

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.695 src/share/mk/bsd.own.mk:1.696
--- src/share/mk/bsd.own.mk:1.695	Tue Feb  7 19:33:19 2012
+++ src/share/mk/bsd.own.mk	Fri Feb 10 05:57:42 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.695 2012/02/07 19:33:19 joerg Exp $
+#	$NetBSD: bsd.own.mk,v 1.696 2012/02/10 05:57:42 matt Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -47,14 +47,8 @@ NEED_OWN_INSTALL_TARGET?=	yes
 TOOLCHAIN_MISSING?=	no
 
 #
-# Platforms still using GCC 4.1
-#
-.if ${MACHINE_CPU}  == vax
-HAVE_GCC?=4
-.else
-# Otherwise, default to GCC4.5
+# Everyone uses GCC4.5
 HAVE_GCC?=45
-.endif
 
 .if \
 ${MACHINE_ARCH} == i386 || \
@@ -68,8 +62,7 @@ USE_COMPILERCRTSTUFF?=	yes
 #
 # Platforms still using GDB 6
 #
-.if ${MACHINE_CPU}  == mips	|| \
-${MACHINE_ARCH} == vax
+.if ${MACHINE_CPU}  == mips
 HAVE_GDB?= 6
 .else
 # Otherwise, default to GDB7

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

CVS commit: [matt-nb5-mips64] src/sys/arch/evbmips/conf

2012-02-09 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Fri Feb 10 06:00:15 UTC 2012

Modified Files:
src/sys/arch/evbmips/conf [matt-nb5-mips64]: MALTA MALTA32 MALTA64

Log Message:
O32 MALTA uses FPU, N32/N64 MALTA does not.


To generate a diff of this commit:
cvs rdiff -u -r1.48.8.4 -r1.48.8.5 src/sys/arch/evbmips/conf/MALTA
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/arch/evbmips/conf/MALTA32
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/arch/evbmips/conf/MALTA64

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/evbmips/conf/MALTA
diff -u src/sys/arch/evbmips/conf/MALTA:1.48.8.4 src/sys/arch/evbmips/conf/MALTA:1.48.8.5
--- src/sys/arch/evbmips/conf/MALTA:1.48.8.4	Fri May 20 16:38:25 2011
+++ src/sys/arch/evbmips/conf/MALTA	Fri Feb 10 06:00:15 2012
@@ -10,7 +10,7 @@ maxusers	32
 
 options 	MIPS32
 options 	MIPS64
-options 	NOFPU		# No FPU
+#options 	NOFPU		# No FPU
 #options 	FPEMUL		# emulate FPU insn
 
 # Options for necessary to use MD

Index: src/sys/arch/evbmips/conf/MALTA32
diff -u src/sys/arch/evbmips/conf/MALTA32:1.1.2.3 src/sys/arch/evbmips/conf/MALTA32:1.1.2.4
--- src/sys/arch/evbmips/conf/MALTA32:1.1.2.3	Thu Feb  9 03:12:09 2012
+++ src/sys/arch/evbmips/conf/MALTA32	Fri Feb 10 06:00:15 2012
@@ -5,5 +5,6 @@ include arch/evbmips/conf/MALTA
 makeoptions	LP64=no
 
 no options	MIPS32
+options 	NOFPU
 
 no ath*

Index: src/sys/arch/evbmips/conf/MALTA64
diff -u src/sys/arch/evbmips/conf/MALTA64:1.1.2.4 src/sys/arch/evbmips/conf/MALTA64:1.1.2.5
--- src/sys/arch/evbmips/conf/MALTA64:1.1.2.4	Fri Jan 29 00:16:58 2010
+++ src/sys/arch/evbmips/conf/MALTA64	Fri Feb 10 06:00:15 2012
@@ -1,10 +1,11 @@
-# $NetBSD: MALTA64,v 1.1.2.4 2010/01/29 00:16:58 matt Exp $
+# MALTA64,v 1.1.2.4 2010/01/29 00:16:58 matt Exp
 #
 include arch/evbmips/conf/MALTA
 
 makeoptions	LP64=yes
 
 no options 	MIPS32
+options 	NOFPU
 options 	EXEC_ELF64
 options 	COMPAT_NETBSD32
 no options 	SYMTAB_SPACE

CVS commit: [matt-nb5-mips64] src/sys/rump/librump/rumpkern

2012-02-09 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Fri Feb 10 06:00:55 UTC 2012

Modified Files:
src/sys/rump/librump/rumpkern [matt-nb5-mips64]: vm.c

Log Message:
uvm_pageout_done doesn't return anything more (it's void).


To generate a diff of this commit:
cvs rdiff -u -r1.41.8.1 -r1.41.8.2 src/sys/rump/librump/rumpkern/vm.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/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.41.8.1 src/sys/rump/librump/rumpkern/vm.c:1.41.8.2
--- src/sys/rump/librump/rumpkern/vm.c:1.41.8.1	Thu Feb  9 03:15:18 2012
+++ src/sys/rump/librump/rumpkern/vm.c	Fri Feb 10 06:00:55 2012
@@ -662,7 +662,6 @@ uvm_pageout_done(struct vm_page *pg, boo
 	} else {
 		wakeup(uvmexp.free);
 	}
-	return NULL;
 }
 
 /* XXX: following two are unfinished because lwp's are not refcounted yet */

CVS commit: src/sys/arch

2012-02-09 Thread Michael L. Hitch

Module Name:src
Committed By:   mhitch
Date:   Fri Feb 10 06:21:15 UTC 2012

Modified Files:
src/sys/arch/cesfic/cesfic: pmap_bootstrap.c
src/sys/arch/hp300/hp300: pmap_bootstrap.c
src/sys/arch/luna68k/luna68k: pmap_bootstrap.c
src/sys/arch/mvme68k/mvme68k: pmap_bootstrap.c
src/sys/arch/news68k/news68k: pmap_bootstrap.c
src/sys/arch/next68k/next68k: pmap_bootstrap.c
src/sys/arch/x68k/x68k: pmap_bootstrap.c

Log Message:
Oops - have to RELOC(physmem) here.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/cesfic/cesfic/pmap_bootstrap.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/hp300/hp300/pmap_bootstrap.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/luna68k/luna68k/pmap_bootstrap.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/news68k/news68k/pmap_bootstrap.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/next68k/next68k/pmap_bootstrap.c
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/x68k/x68k/pmap_bootstrap.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/cesfic/cesfic/pmap_bootstrap.c
diff -u src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.32 src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.33
--- src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.32	Fri Feb 10 04:49:45 2012
+++ src/sys/arch/cesfic/cesfic/pmap_bootstrap.c	Fri Feb 10 06:21:15 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_bootstrap.c,v 1.32 2012/02/10 04:49:45 mhitch Exp $	*/
+/*	$NetBSD: pmap_bootstrap.c,v 1.33 2012/02/10 06:21:15 mhitch Exp $	*/
 
 /* 
  * Copyright (c) 1991, 1993
@@ -36,7 +36,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.32 2012/02/10 04:49:45 mhitch Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.33 2012/02/10 06:21:15 mhitch Exp $);
 
 #include sys/param.h
 #include uvm/uvm_extern.h
@@ -120,7 +120,7 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f
 	lkptpa = nextpa;
 	nextpa += PAGE_SIZE;
 	kptpa = nextpa;
-	nptpages = RELOC(Sysptsize, int) + howmany(physmem, NPTEPG);
+	nptpages = RELOC(Sysptsize, int) + howmany(RELOC(physmem), NPTEPG);
 	nextpa += nptpages * PAGE_SIZE;
 
 	/*

Index: src/sys/arch/hp300/hp300/pmap_bootstrap.c
diff -u src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.55 src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.56
--- src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.55	Fri Feb 10 04:49:45 2012
+++ src/sys/arch/hp300/hp300/pmap_bootstrap.c	Fri Feb 10 06:21:15 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_bootstrap.c,v 1.55 2012/02/10 04:49:45 mhitch Exp $	*/
+/*	$NetBSD: pmap_bootstrap.c,v 1.56 2012/02/10 06:21:15 mhitch Exp $	*/
 
 /*
  * Copyright (c) 1991, 1993
@@ -36,7 +36,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.55 2012/02/10 04:49:45 mhitch Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.56 2012/02/10 06:21:15 mhitch Exp $);
 
 #include sys/param.h
 #include uvm/uvm_extern.h
@@ -126,7 +126,7 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f
 	lkptpa = nextpa;
 	nextpa += PAGE_SIZE;
 	kptpa = nextpa;
-	nptpages = RELOC(Sysptsize, int) + howmany(physmem, NPTEPG) +
+	nptpages = RELOC(Sysptsize, int) + howmany(RELOC(physmem), NPTEPG) +
 		(IIOMAPSIZE + EIOMAPSIZE + NPTEPG - 1) / NPTEPG;
 	nextpa += nptpages * PAGE_SIZE;
 

Index: src/sys/arch/luna68k/luna68k/pmap_bootstrap.c
diff -u src/sys/arch/luna68k/luna68k/pmap_bootstrap.c:1.33 src/sys/arch/luna68k/luna68k/pmap_bootstrap.c:1.34
--- src/sys/arch/luna68k/luna68k/pmap_bootstrap.c:1.33	Fri Feb 10 04:49:45 2012
+++ src/sys/arch/luna68k/luna68k/pmap_bootstrap.c	Fri Feb 10 06:21:15 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_bootstrap.c,v 1.33 2012/02/10 04:49:45 mhitch Exp $	*/
+/*	$NetBSD: pmap_bootstrap.c,v 1.34 2012/02/10 06:21:15 mhitch Exp $	*/
 
 /* 
  * Copyright (c) 1991, 1993
@@ -36,7 +36,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.33 2012/02/10 04:49:45 mhitch Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.34 2012/02/10 06:21:15 mhitch Exp $);
 
 #include opt_m68k_arch.h
 
@@ -125,7 +125,7 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f
 	kptmpa = nextpa;
 	nextpa += PAGE_SIZE;
 	kptpa = nextpa;
-	nptpages = RELOC(Sysptsize, int) + howmany(physmem, NPTEPG) +
+	nptpages = RELOC(Sysptsize, int) + howmany(RELOC(physmem), NPTEPG) +
 		(iiomapsize + NPTEPG - 1) / NPTEPG;
 	nextpa += nptpages * PAGE_SIZE;
 

Index: src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c
diff -u src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.49 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.50
--- src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.49	Fri Feb 10 04:49:45 2012
+++ src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c	Fri Feb 10 06:21:15 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_bootstrap.c,v 1.49 2012/02/10 04:49:45 mhitch Exp $	*/
+/*	$NetBSD: pmap_bootstrap.c,v 1.50 2012/02/10 06:21:15 mhitch Exp $	*/
 
 /* 
  * Copyright (c) 1991, 1993
@@

CVS commit: src/sys/arch

2012-02-09 Thread Michael L. Hitch

Module Name:src
Committed By:   mhitch
Date:   Fri Feb 10 06:28:40 UTC 2012

Modified Files:
src/sys/arch/cesfic/cesfic: pmap_bootstrap.c
src/sys/arch/hp300/hp300: pmap_bootstrap.c
src/sys/arch/luna68k/luna68k: pmap_bootstrap.c
src/sys/arch/mvme68k/mvme68k: pmap_bootstrap.c
src/sys/arch/news68k/news68k: pmap_bootstrap.c
src/sys/arch/next68k/next68k: pmap_bootstrap.c
src/sys/arch/x68k/x68k: pmap_bootstrap.c

Log Message:
Sigh, it's been too long since I've done some of this.  Fix the RELOC().


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/cesfic/cesfic/pmap_bootstrap.c
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/hp300/hp300/pmap_bootstrap.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/luna68k/luna68k/pmap_bootstrap.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/news68k/news68k/pmap_bootstrap.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/next68k/next68k/pmap_bootstrap.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/x68k/x68k/pmap_bootstrap.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/cesfic/cesfic/pmap_bootstrap.c
diff -u src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.33 src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.34
--- src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.33	Fri Feb 10 06:21:15 2012
+++ src/sys/arch/cesfic/cesfic/pmap_bootstrap.c	Fri Feb 10 06:28:39 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_bootstrap.c,v 1.33 2012/02/10 06:21:15 mhitch Exp $	*/
+/*	$NetBSD: pmap_bootstrap.c,v 1.34 2012/02/10 06:28:39 mhitch Exp $	*/
 
 /* 
  * Copyright (c) 1991, 1993
@@ -36,7 +36,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.33 2012/02/10 06:21:15 mhitch Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.34 2012/02/10 06:28:39 mhitch Exp $);
 
 #include sys/param.h
 #include uvm/uvm_extern.h
@@ -120,7 +120,7 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f
 	lkptpa = nextpa;
 	nextpa += PAGE_SIZE;
 	kptpa = nextpa;
-	nptpages = RELOC(Sysptsize, int) + howmany(RELOC(physmem), NPTEPG);
+	nptpages = RELOC(Sysptsize, int) + howmany(RELOC(physmem, int), NPTEPG);
 	nextpa += nptpages * PAGE_SIZE;
 
 	/*

Index: src/sys/arch/hp300/hp300/pmap_bootstrap.c
diff -u src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.56 src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.57
--- src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.56	Fri Feb 10 06:21:15 2012
+++ src/sys/arch/hp300/hp300/pmap_bootstrap.c	Fri Feb 10 06:28:39 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_bootstrap.c,v 1.56 2012/02/10 06:21:15 mhitch Exp $	*/
+/*	$NetBSD: pmap_bootstrap.c,v 1.57 2012/02/10 06:28:39 mhitch Exp $	*/
 
 /*
  * Copyright (c) 1991, 1993
@@ -36,7 +36,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.56 2012/02/10 06:21:15 mhitch Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.57 2012/02/10 06:28:39 mhitch Exp $);
 
 #include sys/param.h
 #include uvm/uvm_extern.h
@@ -126,7 +126,7 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f
 	lkptpa = nextpa;
 	nextpa += PAGE_SIZE;
 	kptpa = nextpa;
-	nptpages = RELOC(Sysptsize, int) + howmany(RELOC(physmem), NPTEPG) +
+	nptpages = RELOC(Sysptsize, int) + howmany(RELOC(physmem, int), NPTEPG) +
 		(IIOMAPSIZE + EIOMAPSIZE + NPTEPG - 1) / NPTEPG;
 	nextpa += nptpages * PAGE_SIZE;
 

Index: src/sys/arch/luna68k/luna68k/pmap_bootstrap.c
diff -u src/sys/arch/luna68k/luna68k/pmap_bootstrap.c:1.34 src/sys/arch/luna68k/luna68k/pmap_bootstrap.c:1.35
--- src/sys/arch/luna68k/luna68k/pmap_bootstrap.c:1.34	Fri Feb 10 06:21:15 2012
+++ src/sys/arch/luna68k/luna68k/pmap_bootstrap.c	Fri Feb 10 06:28:39 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_bootstrap.c,v 1.34 2012/02/10 06:21:15 mhitch Exp $	*/
+/*	$NetBSD: pmap_bootstrap.c,v 1.35 2012/02/10 06:28:39 mhitch Exp $	*/
 
 /* 
  * Copyright (c) 1991, 1993
@@ -36,7 +36,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.34 2012/02/10 06:21:15 mhitch Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap_bootstrap.c,v 1.35 2012/02/10 06:28:39 mhitch Exp $);
 
 #include opt_m68k_arch.h
 
@@ -125,7 +125,7 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f
 	kptmpa = nextpa;
 	nextpa += PAGE_SIZE;
 	kptpa = nextpa;
-	nptpages = RELOC(Sysptsize, int) + howmany(RELOC(physmem), NPTEPG) +
+	nptpages = RELOC(Sysptsize, int) + howmany(RELOC(physmem, int), NPTEPG) +
 		(iiomapsize + NPTEPG - 1) / NPTEPG;
 	nextpa += nptpages * PAGE_SIZE;
 

Index: src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c
diff -u src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.50 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.51
--- src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.50	Fri Feb 10 06:21:15 2012
+++ src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c	Fri Feb 10 06:28:39 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_bootstrap.c,v 1.50 2012/02/10 06:21:15 mhitch Exp $	*/
+/*	$NetBSD: pmap_bootstrap.c,v 1.51

CVS commit: [matt-nb5-mips64] src/sys/uvm

2012-02-09 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Fri Feb 10 07:14:01 UTC 2012

Modified Files:
src/sys/uvm [matt-nb5-mips64]: uvm_km.c

Log Message:
Place allocated kmem pages on a kmem_pageq.  This makes it easy for crash
dump code to find them.


To generate a diff of this commit:
cvs rdiff -u -r1.101.4.2.4.6 -r1.101.4.2.4.7 src/sys/uvm/uvm_km.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/uvm/uvm_km.c
diff -u src/sys/uvm/uvm_km.c:1.101.4.2.4.6 src/sys/uvm/uvm_km.c:1.101.4.2.4.7
--- src/sys/uvm/uvm_km.c:1.101.4.2.4.6	Thu Feb  9 03:04:59 2012
+++ src/sys/uvm/uvm_km.c	Fri Feb 10 07:14:00 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_km.c,v 1.101.4.2.4.6 2012/02/09 03:04:59 matt Exp $	*/
+/*	$NetBSD: uvm_km.c,v 1.101.4.2.4.7 2012/02/10 07:14:00 matt Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -128,7 +128,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_km.c,v 1.101.4.2.4.6 2012/02/09 03:04:59 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_km.c,v 1.101.4.2.4.7 2012/02/10 07:14:00 matt Exp $);
 
 #include opt_uvmhist.h
 
@@ -815,14 +815,16 @@ uvm_km_free_poolpage(struct vm_map *map,
 void
 uvm_km_pageclaim(struct vm_page *pg)
 {
+	KASSERT(!(pg-pqflags  (PQ_PRIVATE1|PQ_PRIVATE2)));
 	atomic_inc_uint(uvm_page_to_pggroup(pg)-pgrp_kmempages);
-//	TAILQ_INSERT_TAIL(uvm.kmem_pageq, pg, listq.queue);
+	TAILQ_INSERT_TAIL(uvm.kmem_pageq, pg, pageq.queue);
 }
 
 void
 uvm_km_pagefree(struct vm_page *pg)
 {
+	KASSERT(!(pg-pqflags  (PQ_PRIVATE1|PQ_PRIVATE2)));
 	atomic_dec_uint(uvm_page_to_pggroup(pg)-pgrp_kmempages);
-//	TAILQ_REMOVE(uvm.kmem_pageq, pg, listq.queue);
+	TAILQ_REMOVE(uvm.kmem_pageq, pg, pageq.queue);
 	uvm_pagefree(pg);
 }

CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips

2012-02-09 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Fri Feb 10 07:14:49 UTC 2012

Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: pmap.c pmap_segtab.c

Log Message:
Don't double claim a kmem page.


To generate a diff of this commit:
cvs rdiff -u -r1.179.16.36 -r1.179.16.37 src/sys/arch/mips/mips/pmap.c
cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/sys/arch/mips/mips/pmap_segtab.c

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

Modified files:

Index: src/sys/arch/mips/mips/pmap.c
diff -u src/sys/arch/mips/mips/pmap.c:1.179.16.36 src/sys/arch/mips/mips/pmap.c:1.179.16.37
--- src/sys/arch/mips/mips/pmap.c:1.179.16.36	Thu Feb  9 03:14:45 2012
+++ src/sys/arch/mips/mips/pmap.c	Fri Feb 10 07:14:49 2012
@@ -2513,6 +2513,7 @@ pmap_pv_page_alloc(struct pool *pp, int 
 	if (pg == NULL)
 		return NULL;
 
+	uvm_km_pageclaim(pg);
 	return (void *)mips_pmap_map_poolpage(VM_PAGE_TO_PHYS(pg));
 }
 
@@ -2607,9 +2608,6 @@ mips_pmap_alloc_poolpage(int flags)
 	} else {
 		pg = uvm_pagealloc(NULL, 0, NULL, flags);
 	}
-	if (pg != NULL) {
-		uvm_km_pageclaim(pg);
-	}
 	return pg;
 }
 

Index: src/sys/arch/mips/mips/pmap_segtab.c
diff -u src/sys/arch/mips/mips/pmap_segtab.c:1.1.2.12 src/sys/arch/mips/mips/pmap_segtab.c:1.1.2.13
--- src/sys/arch/mips/mips/pmap_segtab.c:1.1.2.12	Thu Feb  9 03:14:45 2012
+++ src/sys/arch/mips/mips/pmap_segtab.c	Fri Feb 10 07:14:49 2012
@@ -149,7 +149,13 @@ uint32_t npage_segtab;
 static inline struct vm_page *
 pmap_pte_pagealloc(void)
 {
-	return mips_pmap_alloc_poolpage(UVM_PGA_ZERO|UVM_PGA_USERESERVE);
+	struct vm_page *pg;
+
+	pg = PMAP_ALLOC_POOLPAGE(UVM_PGA_ZERO|UVM_PGA_USERESERVE);
+	if (pg)
+		uvm_km_pageclaim(pg);
+
+	return pg;
 }
 
 static inline pt_entry_t *

CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips

2012-02-09 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Fri Feb 10 07:19:44 UTC 2012

Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: pmap.c

Log Message:
Teach pmap_extract about KSEGX.


To generate a diff of this commit:
cvs rdiff -u -r1.179.16.37 -r1.179.16.38 src/sys/arch/mips/mips/pmap.c

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

Modified files:

Index: src/sys/arch/mips/mips/pmap.c
diff -u src/sys/arch/mips/mips/pmap.c:1.179.16.37 src/sys/arch/mips/mips/pmap.c:1.179.16.38
--- src/sys/arch/mips/mips/pmap.c:1.179.16.37	Fri Feb 10 07:14:49 2012
+++ src/sys/arch/mips/mips/pmap.c	Fri Feb 10 07:19:44 2012
@@ -1838,6 +1838,12 @@ pmap_extract(pmap_t pmap, vaddr_t va, pa
 			pa = MIPS_XKPHYS_TO_PHYS(va);
 			goto done;
 		}
+#elif defined(ENABLE_MIPS_KSEGX)
+		if (VM_KSEGX_ADDRESS = va
+		 va  VM_KSEGX_ADDRESS + VM_KSEGX_SIZE)
+			pa = mips_ksegx_start + va - VM_KSEGX_ADDRESS;
+			goto done;
+		}
 #endif
 #ifdef DIAGNOSTIC
 		if (MIPS_KSEG1_P(va))

CVS commit: src/distrib/notes/ofppc

CVS commit: src/etc

CVS commit: src/external/gpl3/gdb/lib/libgdb/arch/vax

CVS commit: src/external/gpl3/gdb/lib/libgdb/arch

CVS commit: src/external/gpl3/gdb/dist/gdb

CVS commit: src/tools/gdb

CVS commit: src/external/gpl2/xcvs/dist/src

CVS commit: src/sys/ddb

CVS commit: src/external/bsd/ntp/dist/util

CVS commit: src

CVS commit: src/tests/fs/vfs

CVS commit: src

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

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

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

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

CVS commit: [matt-nb5-mips64] src/sys/arch/mips

CVS commit: src

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

CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips

CVS commit: src/external/gpl3/binutils/dist/bfd

CVS commit: src/sys/ddb

CVS commit: src/sys/ddb

CVS commit: src/sys/arch

CVS commit: src/share/mk

CVS commit: [matt-nb5-mips64] src/sys/arch/evbmips/conf

CVS commit: [matt-nb5-mips64] src/sys/rump/librump/rumpkern

CVS commit: src/sys/arch

CVS commit: src/sys/arch

CVS commit: [matt-nb5-mips64] src/sys/uvm

CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips

CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips

32 matches

Site Navigation

Mail list logo

Footer information