CVS commit: [netbsd-8] src/sys/modules

2018-02-06 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Tue Feb  6 20:31:13 UTC 2018

Modified Files:
src/sys/modules [netbsd-8]: Makefile
Added Files:
src/sys/modules/amdsmn [netbsd-8]: Makefile amdsmn.ioconf
src/sys/modules/amdzentemp [netbsd-8]: Makefile

Log Message:
Pull up following revision(s) (requested by pgoyette in ticket #524):
sys/modules/Makefile: revision 1.199
sys/modules/amdsmn/Makefile: revision 1.1
sys/modules/amdsmn/amdsmn.ioconf: revision 1.1
sys/modules/amdzentemp/Makefile: revision 1.1
Create amdsmn(4) amd amdzentemp(4) modules for X86


To generate a diff of this commit:
cvs rdiff -u -r1.192.2.1 -r1.192.2.2 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/sys/modules/amdsmn/Makefile \
src/sys/modules/amdsmn/amdsmn.ioconf
cvs rdiff -u -r0 -r1.1.2.2 src/sys/modules/amdzentemp/Makefile

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

Modified files:

Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.192.2.1 src/sys/modules/Makefile:1.192.2.2
--- src/sys/modules/Makefile:1.192.2.1	Thu Dec 21 19:14:41 2017
+++ src/sys/modules/Makefile	Tue Feb  6 20:31:13 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.192.2.1 2017/12/21 19:14:41 snj Exp $
+#	$NetBSD: Makefile,v 1.192.2.2 2018/02/06 20:31:13 snj Exp $
 
 .include 
 
@@ -177,7 +177,9 @@ SUBDIR+=	exec_elf64
 
 .if ${MACHINE_ARCH} == "i386" || \
 ${MACHINE_ARCH} == "x86_64"
+SUBDIR+=	amdsmn
 SUBDIR+=	amdtemp
+SUBDIR+=	amdzentemp
 SUBDIR+=	coretemp
 SUBDIR+=	est
 SUBDIR+=	hdafg

Added files:

Index: src/sys/modules/amdsmn/Makefile
diff -u /dev/null src/sys/modules/amdsmn/Makefile:1.1.2.2
--- /dev/null	Tue Feb  6 20:31:13 2018
+++ src/sys/modules/amdsmn/Makefile	Tue Feb  6 20:31:13 2018
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1.2.2 2018/02/06 20:31:13 snj Exp $
+
+.include "../Makefile.inc"
+
+.PATH:	${S}/arch/x86/pci
+
+KMOD=	amdsmn
+IOCONF=	amdsmn.ioconf
+SRCS=	amdsmn.c
+
+WARNS=	4
+
+.include 
Index: src/sys/modules/amdsmn/amdsmn.ioconf
diff -u /dev/null src/sys/modules/amdsmn/amdsmn.ioconf:1.1.2.2
--- /dev/null	Tue Feb  6 20:31:13 2018
+++ src/sys/modules/amdsmn/amdsmn.ioconf	Tue Feb  6 20:31:13 2018
@@ -0,0 +1,11 @@
+# $NetBSD: amdsmn.ioconf,v 1.1.2.2 2018/02/06 20:31:13 snj Exp $
+
+ioconf amdsmn
+
+include "conf/files"
+include "dev/pci/files.pci"
+include "arch/x86/pci/files.pci"
+
+pseudo-root pci*
+
+amdsmn* at pci?

Index: src/sys/modules/amdzentemp/Makefile
diff -u /dev/null src/sys/modules/amdzentemp/Makefile:1.1.2.2
--- /dev/null	Tue Feb  6 20:31:13 2018
+++ src/sys/modules/amdzentemp/Makefile	Tue Feb  6 20:31:13 2018
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1.2.2 2018/02/06 20:31:13 snj Exp $
+
+.include "../Makefile.inc"
+
+.PATH:	${S}/arch/x86/pci
+
+KMOD=	amdzentemp
+IOCONF=	amdzentemp.ioconf
+SRCS=	amdzentemp.c
+
+WARNS=	4
+
+.include

CVS commit: [netbsd-8] src/sys/modules/lua

2018-01-07 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Sun Jan  7 09:27:32 UTC 2018

Modified Files:
src/sys/modules/lua [netbsd-8]: lua.c

Log Message:
Pull up following revision(s) (requested by sevan in ticket #469):
sys/modules/lua/lua.c: revision 1.24
Fix cargo cult ioctl implementation for LUAINFO: the name and desc fields
are arrays, not pointers, so don't use copyoutstr on them, but instead
copyin/copyout the whole array of structures.
Fixes PR 52864 for me (on sparc64).


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.2.1 src/sys/modules/lua/lua.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/modules/lua/lua.c
diff -u src/sys/modules/lua/lua.c:1.23 src/sys/modules/lua/lua.c:1.23.2.1
--- src/sys/modules/lua/lua.c:1.23	Sat May 20 09:46:17 2017
+++ src/sys/modules/lua/lua.c	Sun Jan  7 09:27:32 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: lua.c,v 1.23 2017/05/20 09:46:17 mbalmer Exp $ */
+/*	$NetBSD: lua.c,v 1.23.2.1 2018/01/07 09:27:32 snj Exp $ */
 
 /*
  * Copyright (c) 2011 - 2017 by Marc Balmer .
@@ -288,6 +288,7 @@ luaioctl(dev_t dev, u_long cmd, void *da
 	struct pathbuf *pb;
 	struct vattr va;
 	struct lua_loadstate ls;
+	struct lua_state_info *states;
 	int error, n;
 	klua_State *K;
 
@@ -307,14 +308,25 @@ luaioctl(dev_t dev, u_long cmd, void *da
 			LIST_FOREACH(s, _states, lua_next) {
 if (n > info->num_states)
 	break;
-copyoutstr(s->lua_name, info->states[n].name,
-MAX_LUA_NAME, NULL);
-copyoutstr(s->lua_desc, info->states[n].desc,
-MAX_LUA_DESC, NULL);
-info->states[n].user = s->K->ks_user;
 n++;
 			}
 			info->num_states = n;
+			states = kmem_alloc(sizeof(*states) * n, KM_SLEEP);
+			if (copyin(info->states, states, sizeof(*states) * n)
+			== 0) {
+n = 0;
+LIST_FOREACH(s, _states, lua_next) {
+	if (n > info->num_states)
+		break;
+	strcpy(states[n].name, s->lua_name);
+	strcpy(states[n].desc, s->lua_desc);
+	states[n].user = s->K->ks_user;
+	n++;
+}
+copyout(states, info->states,
+sizeof(*states) * n);
+kmem_free(states, sizeof(*states) * n);
+			}
 		}
 		break;
 	case LUACREATE:

CVS commit: [netbsd-8] src/sys/modules/nand

2017-12-21 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Fri Dec 22 00:07:32 UTC 2017

Modified Files:
src/sys/modules/nand [netbsd-8]: Makefile

Log Message:
revert ticket 438


To generate a diff of this commit:
cvs rdiff -u -r1.4.30.1 -r1.4.30.2 src/sys/modules/nand/Makefile

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

Modified files:

Index: src/sys/modules/nand/Makefile
diff -u src/sys/modules/nand/Makefile:1.4.30.1 src/sys/modules/nand/Makefile:1.4.30.2
--- src/sys/modules/nand/Makefile:1.4.30.1	Thu Dec 21 19:19:30 2017
+++ src/sys/modules/nand/Makefile	Fri Dec 22 00:07:32 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4.30.1 2017/12/21 19:19:30 snj Exp $
+# $NetBSD: Makefile,v 1.4.30.2 2017/12/22 00:07:32 snj Exp $
 
 .include "../Makefile.inc"
 
@@ -14,7 +14,3 @@ SRCS+=	nand_micron.c
 SRCS+=	nand_samsung.c
 
 .include 
-.PATH:	${S}/dev/flash
-
-SRCS+=	flash_mtdparts.c
-

CVS commit: [netbsd-8] src/sys/modules/nand

2017-12-21 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Thu Dec 21 19:19:30 UTC 2017

Modified Files:
src/sys/modules/nand [netbsd-8]: Makefile

Log Message:
Pull up following revision(s) (requested by pgoyette in ticket #438):
sys/modules/nand/Makefile: revision 1.6
Include the flash_mtd_parts in the nand module.  Without this, the module
fails to load because of undefined linker symbol flash_attach_mtdparts


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.30.1 src/sys/modules/nand/Makefile

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

Modified files:

Index: src/sys/modules/nand/Makefile
diff -u src/sys/modules/nand/Makefile:1.4 src/sys/modules/nand/Makefile:1.4.30.1
--- src/sys/modules/nand/Makefile:1.4	Sat Nov  3 11:48:54 2012
+++ src/sys/modules/nand/Makefile	Thu Dec 21 19:19:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/11/03 11:48:54 ahoka Exp $
+# $NetBSD: Makefile,v 1.4.30.1 2017/12/21 19:19:30 snj Exp $
 
 .include "../Makefile.inc"
 
@@ -14,3 +14,7 @@ SRCS+=	nand_micron.c
 SRCS+=	nand_samsung.c
 
 .include 
+.PATH:	${S}/dev/flash
+
+SRCS+=	flash_mtdparts.c
+