Module Name: src
Committed By: tls
Date: Sun Aug 10 06:56:11 UTC 2014
Modified Files:
src/sys/modules [tls-earlyentropy]: Makefile
src/sys/modules/arch/powerpc/powerpc-booke [tls-earlyentropy]:
bsd.powerpc-booke.mk
src/sys/modules/drmkms [tls-earlyentropy]: Makefile Makefile.inc
src/sys/modules/drmkms_linux [tls-earlyentropy]: Makefile
src/sys/modules/efs [tls-earlyentropy]: Makefile
src/sys/modules/ffs [tls-earlyentropy]: Makefile
src/sys/modules/i915drmkms [tls-earlyentropy]: Makefile
i915drmkms.ioconf
src/sys/modules/kernfs [tls-earlyentropy]: Makefile
src/sys/modules/lfs [tls-earlyentropy]: Makefile
src/sys/modules/lua [tls-earlyentropy]: Makefile lua.c luavar.h
test.lua
src/sys/modules/luapmf [tls-earlyentropy]: Makefile luapmf.c
src/sys/modules/luasystm [tls-earlyentropy]: Makefile luasystm.c
test.lua
src/sys/modules/npf [tls-earlyentropy]: Makefile
src/sys/modules/uatp [tls-earlyentropy]: uatp.ioconf
src/sys/modules/zfs [tls-earlyentropy]: Makefile.zfsmod
Added Files:
src/sys/modules/hythygtemp [tls-earlyentropy]: Makefile
hythygtemp.ioconf
Removed Files:
src/sys/modules/drmkms [tls-earlyentropy]: drmkms.ioconf
src/sys/modules/lua [tls-earlyentropy]: assert.h ctype.h errno.h
inttypes.h limits.h locale.h math.h setjmp.h signal.h stdarg.h
stddef.h stdio.h stdlib.h string.h
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.135.2.1 src/sys/modules/Makefile
cvs rdiff -u -r1.1 -r1.1.26.1 \
src/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk
cvs rdiff -u -r1.2 -r1.2.2.1 src/sys/modules/drmkms/Makefile
cvs rdiff -u -r1.3 -r1.3.2.1 src/sys/modules/drmkms/Makefile.inc
cvs rdiff -u -r1.2 -r0 src/sys/modules/drmkms/drmkms.ioconf
cvs rdiff -u -r1.2 -r1.2.2.1 src/sys/modules/drmkms_linux/Makefile
cvs rdiff -u -r1.1 -r1.1.64.1 src/sys/modules/efs/Makefile
cvs rdiff -u -r1.8 -r1.8.12.1 src/sys/modules/ffs/Makefile
cvs rdiff -u -r0 -r1.1.4.2 src/sys/modules/hythygtemp/Makefile \
src/sys/modules/hythygtemp/hythygtemp.ioconf
cvs rdiff -u -r1.2 -r1.2.2.1 src/sys/modules/i915drmkms/Makefile \
src/sys/modules/i915drmkms/i915drmkms.ioconf
cvs rdiff -u -r1.1 -r1.1.64.1 src/sys/modules/kernfs/Makefile
cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/modules/lfs/Makefile
cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/modules/lua/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/modules/lua/assert.h \
src/sys/modules/lua/ctype.h src/sys/modules/lua/errno.h \
src/sys/modules/lua/inttypes.h src/sys/modules/lua/limits.h \
src/sys/modules/lua/locale.h src/sys/modules/lua/math.h \
src/sys/modules/lua/setjmp.h src/sys/modules/lua/signal.h \
src/sys/modules/lua/stdarg.h src/sys/modules/lua/stddef.h \
src/sys/modules/lua/stdlib.h src/sys/modules/lua/string.h
cvs rdiff -u -r1.8 -r1.8.2.1 src/sys/modules/lua/lua.c
cvs rdiff -u -r1.1 -r1.1.2.1 src/sys/modules/lua/luavar.h \
src/sys/modules/lua/test.lua
cvs rdiff -u -r1.2 -r0 src/sys/modules/lua/stdio.h
cvs rdiff -u -r1.2 -r1.2.2.1 src/sys/modules/luapmf/Makefile
cvs rdiff -u -r1.3 -r1.3.2.1 src/sys/modules/luapmf/luapmf.c
cvs rdiff -u -r1.1 -r1.1.2.1 src/sys/modules/luasystm/Makefile \
src/sys/modules/luasystm/test.lua
cvs rdiff -u -r1.2 -r1.2.2.1 src/sys/modules/luasystm/luasystm.c
cvs rdiff -u -r1.16 -r1.16.2.1 src/sys/modules/npf/Makefile
cvs rdiff -u -r1.1 -r1.1.14.1 src/sys/modules/uatp/uatp.ioconf
cvs rdiff -u -r1.4 -r1.4.10.1 src/sys/modules/zfs/Makefile.zfsmod
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.135 src/sys/modules/Makefile:1.135.2.1
--- src/sys/modules/Makefile:1.135 Fri Jan 3 16:16:10 2014
+++ src/sys/modules/Makefile Sun Aug 10 06:56:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.135 2014/01/03 16:16:10 pgoyette Exp $
+# $NetBSD: Makefile,v 1.135.2.1 2014/08/10 06:56:10 tls Exp $
.include <bsd.own.mk>
@@ -39,6 +39,7 @@ SUBDIR+= gpioiic
SUBDIR+= gpioow
SUBDIR+= gpiosim
SUBDIR+= hfs
+SUBDIR+= hythygtemp
SUBDIR+= if_axe
SUBDIR+= if_axen
SUBDIR+= if_npflog
Index: src/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk
diff -u src/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk:1.1 src/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk:1.1.26.1
--- src/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk:1.1 Wed Jun 15 09:45:59 2011
+++ src/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk Sun Aug 10 06:56:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.powerpc-booke.mk,v 1.1 2011/06/15 09:45:59 mrg Exp $
+# $NetBSD: bsd.powerpc-booke.mk,v 1.1.26.1 2014/08/10 06:56:10 tls Exp $
.ifndef _BSD_POWERPC_BOOKE_MK_
_BSD_POWERPC_BOOKE_MK_=1
@@ -7,7 +7,7 @@ KMODULEARCHDIR:= powerpc-booke
# gcc emits bad code with these options
#CPPFLAGS+= -mcpu=8548
-CPPFLAGS+= -mmultiple -mno-string -misel -Wa,-me500
+CPPFLAGS+= -misel -Wa,-me500
PPC_BOOKE= 1
# hack into bsd.kmodule.mk
Index: src/sys/modules/drmkms/Makefile
diff -u src/sys/modules/drmkms/Makefile:1.2 src/sys/modules/drmkms/Makefile:1.2.2.1
--- src/sys/modules/drmkms/Makefile:1.2 Tue Mar 18 18:20:43 2014
+++ src/sys/modules/drmkms/Makefile Sun Aug 10 06:56:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/03/18 18:20:43 riastradh Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2014/08/10 06:56:10 tls Exp $
.include "../Makefile.inc"
.include "Makefile.inc"
@@ -8,7 +8,6 @@
.PATH: ${S}/external/bsd/drm2/dist/drm
KMOD= drmkms
-IOCONF= drmkms.ioconf
# Upstream source files.
#SRCS+= ati_pcigart.c # Moved to drmkms_pci module.
@@ -26,6 +25,7 @@ SRCS+= drm_drv.c
SRCS+= drm_edid.c
#SRCS+= drm_encoder_slave.c # XXX Rewrite for i2c.
SRCS+= drm_fb_helper.c # XXX Rewrite for wsconsole.
+SRCS+= drm_flip_work.c
SRCS+= drm_fops.c
SRCS+= drm_gem.c
SRCS+= drm_global.c
@@ -39,19 +39,23 @@ SRCS+= drm_memory.c
SRCS+= drm_mm.c
SRCS+= drm_modes.c
#SRCS+= drm_pci.c # Moved to drmkms_pci module.
+SRCS+= drm_plane_helper.c
#SRCS+= drm_platform.c # XXX Rewrite per platform.
#SRCS+= drm_prime.c # XXX Revisit later.
-#SRCS+= drm_proc.c # XXX Rewrite for sysctl.
+SRCS+= drm_probe_helper.c
+SRCS+= drm_rect.c
SRCS+= drm_scatter.c
SRCS+= drm_stub.c
+SRCS+= drm_sysfs.c
SRCS+= drm_vm.c
+SRCS+= drm_vma_manager.c
# NetBSD additions.
SRCS+= drm_gem_vm.c
SRCS+= drm_module.c
-SRCS+= drm_sysfs.c
COPTS.drm_crtc.c+= -Wno-shadow
+COPTS.drm_crtc.c+= -Wno-missing-field-initializers
COPTS.drm_edid.c+= -Wno-shadow
.include <bsd.kmodule.mk>
Index: src/sys/modules/drmkms/Makefile.inc
diff -u src/sys/modules/drmkms/Makefile.inc:1.3 src/sys/modules/drmkms/Makefile.inc:1.3.2.1
--- src/sys/modules/drmkms/Makefile.inc:1.3 Tue Apr 1 15:08:58 2014
+++ src/sys/modules/drmkms/Makefile.inc Sun Aug 10 06:56:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2014/04/01 15:08:58 riastradh Exp $
+# $NetBSD: Makefile.inc,v 1.3.2.1 2014/08/10 06:56:10 tls Exp $
# Common makefile cruft for drm2 code.
@@ -6,8 +6,10 @@
# it correctly triggers rebuilds.
CPPFLAGS+= -I${S}/external/bsd/drm2/include
-CPPFLAGS+= -I${S}/external/bsd/drm2/dist/uapi
+CPPFLAGS+= -I${S}/external/bsd/drm2/dist
CPPFLAGS+= -I${S}/external/bsd/drm2/dist/include
+CPPFLAGS+= -I${S}/external/bsd/drm2/dist/include/drm
+CPPFLAGS+= -I${S}/external/bsd/drm2/dist/uapi
CPPFLAGS+= -I${S}/external/bsd/common/include
CPPFLAGS+= -D__KERNEL__
@@ -17,5 +19,4 @@ CPPFLAGS+= -DDIAGNOSTIC
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
CPPFLAGS+= -DCONFIG_MTRR
CPPFLAGS+= -DCONFIG_X86
-CPPFLAGS+= -DMTRR
.endif
Index: src/sys/modules/drmkms_linux/Makefile
diff -u src/sys/modules/drmkms_linux/Makefile:1.2 src/sys/modules/drmkms_linux/Makefile:1.2.2.1
--- src/sys/modules/drmkms_linux/Makefile:1.2 Tue Mar 18 18:20:43 2014
+++ src/sys/modules/drmkms_linux/Makefile Sun Aug 10 06:56:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/03/18 18:20:43 riastradh Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2014/08/10 06:56:10 tls Exp $
.include "../Makefile.inc"
@@ -11,12 +11,13 @@ CPPFLAGS+= -DDIAGNOSTIC
KMOD= drmkms_linux
-SRCS+= linux_gfp.c
+SRCS+= linux_dmi.c
SRCS+= linux_kmap.c
SRCS+= linux_i2c.c
SRCS+= linux_idr.c
SRCS+= linux_list_sort.c
SRCS+= linux_module.c
SRCS+= linux_work.c
+SRCS+= linux_writecomb.c
.include <bsd.kmodule.mk>
Index: src/sys/modules/efs/Makefile
diff -u src/sys/modules/efs/Makefile:1.1 src/sys/modules/efs/Makefile:1.1.64.1
--- src/sys/modules/efs/Makefile:1.1 Sat Jun 28 16:11:35 2008
+++ src/sys/modules/efs/Makefile Sun Aug 10 06:56:10 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2008/06/28 16:11:35 rumble Exp $
+# $NetBSD: Makefile,v 1.1.64.1 2014/08/10 06:56:10 tls Exp $
.include "../Makefile.inc"
.PATH: ${S}/fs/efs
KMOD= efs
-SRCS= efs_genfs.c efs_ihash.c efs_subr.c efs_vfsops.c efs_vnops.c
+SRCS= efs_genfs.c efs_subr.c efs_vfsops.c efs_vnops.c
.include <bsd.kmodule.mk>
Index: src/sys/modules/ffs/Makefile
diff -u src/sys/modules/ffs/Makefile:1.8 src/sys/modules/ffs/Makefile:1.8.12.1
--- src/sys/modules/ffs/Makefile:1.8 Thu May 10 07:51:34 2012
+++ src/sys/modules/ffs/Makefile Sun Aug 10 06:56:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/05/10 07:51:34 riastradh Exp $
+# $NetBSD: Makefile,v 1.8.12.1 2014/08/10 06:56:10 tls Exp $
.include "../Makefile.inc"
@@ -10,7 +10,7 @@ CPPFLAGS+= -DUFS_DIRHASH -DFFS_EI -
CWARNFLAGS.clang= -Wno-conversion
.PATH: ${S}/ufs/ufs
-SRCS= ufs_bmap.c ufs_dirhash.c ufs_extattr.c ufs_ihash.c ufs_inode.c \
+SRCS= ufs_bmap.c ufs_dirhash.c ufs_extattr.c ufs_inode.c \
ufs_lookup.c ufs_quota.c ufs_quota1.c ufs_quota2.c ufs_rename.c \
ufs_vfsops.c ufs_vnops.c ufs_wapbl.c quota2_subr.c
Index: src/sys/modules/i915drmkms/Makefile
diff -u src/sys/modules/i915drmkms/Makefile:1.2 src/sys/modules/i915drmkms/Makefile:1.2.2.1
--- src/sys/modules/i915drmkms/Makefile:1.2 Tue Mar 18 18:20:43 2014
+++ src/sys/modules/i915drmkms/Makefile Sun Aug 10 06:56:10 2014
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2014/03/18 18:20:43 riastradh Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2014/08/10 06:56:10 tls Exp $
.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"
CPPFLAGS+= -I${S}/external/bsd/drm2/dist/drm/i915
+CPPFLAGS+= -I${S}/external/bsd/drm2/i915drm
.PATH: ${S}/external/bsd/drm2/i915drm
.PATH: ${S}/external/bsd/drm2/dist/drm/i915
@@ -17,6 +18,7 @@ SRCS+= dvo_ivch.c
SRCS+= dvo_ns2501.c
SRCS+= dvo_sil164.c
SRCS+= dvo_tfp410.c
+SRCS+= i915_cmd_parser.c
#SRCS+= i915_debugfs.c # XXX No debugfs in NetBSD.
SRCS+= i915_dma.c
SRCS+= i915_drv.c
@@ -29,35 +31,49 @@ SRCS+= i915_gem_execbuffer.c
SRCS+= i915_gem_gtt.c
SRCS+= i915_gem_stolen.c
SRCS+= i915_gem_tiling.c
+SRCS+= i915_gpu_error.c
#SRCS+= i915_ioc32.c
SRCS+= i915_irq.c
+SRCS+= i915_params.c
SRCS+= i915_suspend.c
SRCS+= i915_sysfs.c # XXX No sysfs in NetBSD.
+SRCS+= i915_ums.c
+#SRCS+= intel_acpi.c # XXX ACPI
SRCS+= intel_bios.c
SRCS+= intel_crt.c
SRCS+= intel_ddi.c
SRCS+= intel_display.c
SRCS+= intel_dp.c
+SRCS+= intel_dsi.c
+SRCS+= intel_dsi_cmd.c
+SRCS+= intel_dsi_pll.c
SRCS+= intel_dvo.c
-SRCS+= intel_fb.c # XXX Rewrite for wscons.
+SRCS+= intel_fbdev.c
SRCS+= intel_hdmi.c
SRCS+= intel_i2c.c
SRCS+= intel_lvds.c
SRCS+= intel_modes.c
-SRCS+= intel_opregion.c
+#SRCS+= intel_opregion.c # XXX ACPI
SRCS+= intel_overlay.c
SRCS+= intel_panel.c
SRCS+= intel_pm.c
SRCS+= intel_ringbuffer.c
SRCS+= intel_sdvo.c
+SRCS+= intel_sideband.c
SRCS+= intel_sprite.c
SRCS+= intel_tv.c
+SRCS+= intel_uncore.c
SRCS+= i915_module.c
SRCS+= i915_pci.c
SRCS+= intel_gtt.c
+SRCS+= intelfb.c
+COPTS.i915_drv.c+= -Wno-override-init
+COPTS.intel_display.c+= -Wno-shadow
COPTS.intel_panel.c+= -Wno-shadow
COPTS.intel_pm.c+= -Wno-shadow
+CPPFLAGS+= -DCONFIG_DRM_I915_FBDEV
+
.include <bsd.kmodule.mk>
Index: src/sys/modules/i915drmkms/i915drmkms.ioconf
diff -u src/sys/modules/i915drmkms/i915drmkms.ioconf:1.2 src/sys/modules/i915drmkms/i915drmkms.ioconf:1.2.2.1
--- src/sys/modules/i915drmkms/i915drmkms.ioconf:1.2 Tue Mar 18 18:20:43 2014
+++ src/sys/modules/i915drmkms/i915drmkms.ioconf Sun Aug 10 06:56:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: i915drmkms.ioconf,v 1.2 2014/03/18 18:20:43 riastradh Exp $
+# $NetBSD: i915drmkms.ioconf,v 1.2.2.1 2014/08/10 06:56:10 tls Exp $
ioconf i915drmkms
@@ -6,5 +6,7 @@ include "conf/files"
include "dev/pci/files.pci"
pseudo-root pci*
+pseudo-root intelfbbus*
i915drmkms* at pci? dev ? function ?
+intelfb* at intelfbbus?
Index: src/sys/modules/kernfs/Makefile
diff -u src/sys/modules/kernfs/Makefile:1.1 src/sys/modules/kernfs/Makefile:1.1.64.1
--- src/sys/modules/kernfs/Makefile:1.1 Sat Jun 28 16:11:36 2008
+++ src/sys/modules/kernfs/Makefile Sun Aug 10 06:56:10 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2008/06/28 16:11:36 rumble Exp $
+# $NetBSD: Makefile,v 1.1.64.1 2014/08/10 06:56:10 tls Exp $
.include "../Makefile.inc"
.PATH: ${S}/miscfs/kernfs
KMOD= kernfs
-SRCS= kernfs_vfsops.c kernfs_vnops.c kernfs_subr.c
+SRCS= kernfs_vfsops.c kernfs_vnops.c
.include <bsd.kmodule.mk>
Index: src/sys/modules/lfs/Makefile
diff -u src/sys/modules/lfs/Makefile:1.6 src/sys/modules/lfs/Makefile:1.6.2.1
--- src/sys/modules/lfs/Makefile:1.6 Tue Mar 18 18:20:43 2014
+++ src/sys/modules/lfs/Makefile Sun Aug 10 06:56:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/03/18 18:20:43 riastradh Exp $
+# $NetBSD: Makefile,v 1.6.2.1 2014/08/10 06:56:10 tls Exp $
.include "../Makefile.inc"
@@ -10,8 +10,8 @@ KMOD= lfs
CPPFLAGS+=#-DLFS_DIRHASH -DLFS_EI -DLFS_QUOTA -DLFS_QUOTA2
SRCS= lfs_vfsops.c lfs_vnops.c lfs_subr.c lfs_alloc.c lfs_balloc.c \
- lfs_bio.c lfs_cksum.c lfs_debug.c lfs_inode.c lfs_segment.c \
- lfs_rename.c lfs_syscalls.c lfs_itimes.c
+ lfs_bio.c lfs_cksum.c lfs_debug.c lfs_inode.c lfs_pages.c \
+ lfs_segment.c lfs_rename.c lfs_syscalls.c lfs_itimes.c
SRCS+= ulfs_bmap.c ulfs_dirhash.c ulfs_ihash.c ulfs_inode.c ulfs_lookup.c \
ulfs_snapshot.c ulfs_vfsops.c ulfs_vnops.c
Index: src/sys/modules/lua/Makefile
diff -u src/sys/modules/lua/Makefile:1.6 src/sys/modules/lua/Makefile:1.6.2.1
--- src/sys/modules/lua/Makefile:1.6 Fri Dec 27 22:09:43 2013
+++ src/sys/modules/lua/Makefile Sun Aug 10 06:56:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/12/27 22:09:43 christos Exp $
+# $NetBSD: Makefile,v 1.6.2.1 2014/08/10 06:56:10 tls Exp $
.include "../Makefile.inc"
@@ -8,42 +8,16 @@
KMOD= lua
SRCS= lua.c
-WARNS= 1
+WARNS= 0
# Lua core source code
-SRCS+= lapi.c \
- lcode.c \
- ldebug.c \
- ldo.c \
- ldump.c \
- lfunc.c \
- lgc.c \
- llex.c \
- lmem.c \
- lobject.c \
- lopcodes.c \
- lparser.c \
- lstate.c \
- lstring.c \
- ltable.c \
- ltm.c \
- lundump.c \
- lvm.c \
- lzio.c
-
-# Lua auxlib source code
-SRCS+= lauxlib.c
+SRCS+= lapi.c lcode.c lctype.c ldebug.c ldo.c ldump.c lfunc.c lgc.c \
+ llex.c lmem.c lobject.c lopcodes.c lparser.c lstate.c \
+ lstring.c ltable.c ltm.c lundump.c lvm.c lzio.c
# Lua stdlibs source code
-SRCS+= lbaselib.c \
- lstrlib.c \
- ltablib.c \
- linit.c
-
-# Compatability code
-SRCS+= strcspn.c \
- strpbrk.c \
- strspn.c
+SRCS+= lauxlib.c lbaselib.c lbitlib.c lcorolib.c ldblib.c \
+ lstrlib.c ltablib.c lutf8lib.c linit.c
CPPFLAGS+= -I${S}/../external/mit/lua/dist/src \
-I${S}/sys
Index: src/sys/modules/lua/lua.c
diff -u src/sys/modules/lua/lua.c:1.8 src/sys/modules/lua/lua.c:1.8.2.1
--- src/sys/modules/lua/lua.c:1.8 Sun Mar 16 05:20:30 2014
+++ src/sys/modules/lua/lua.c Sun Aug 10 06:56:10 2014
@@ -1,6 +1,7 @@
-/* $NetBSD: lua.c,v 1.8 2014/03/16 05:20:30 dholland Exp $ */
+/* $NetBSD: lua.c,v 1.8.2.1 2014/08/10 06:56:10 tls Exp $ */
/*
+ * Copyright (c) 2014 by Lourival Vieira Neto <[email protected]>.
* Copyright (c) 2011, 2013 by Marc Balmer <[email protected]>.
* All rights reserved.
*
@@ -45,6 +46,7 @@
#include <sys/queue.h>
#include <sys/sysctl.h>
#include <sys/vnode.h>
+#include <sys/cpu.h>
#include <lauxlib.h>
@@ -102,6 +104,7 @@ const struct cdevsw lua_cdevsw = {
.d_poll = nopoll,
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
+ .d_discard = nodiscard,
.d_flag = D_OTHER | D_MPSAFE
};
@@ -192,7 +195,7 @@ lua_attach(device_t parent, device_t sel
NULL, 0, &lua_max_instr, 0,
CTL_CREATE, CTL_EOL);
- aprint_normal_dev(self, "%s %s\n", LUA_RELEASE, LUA_COPYRIGHT);
+ aprint_normal_dev(self, "%s\n", LUA_COPYRIGHT);
}
static int
@@ -330,8 +333,7 @@ luaioctl(dev_t dev, u_long cmd, void *da
return EBUSY;
}
- K = klua_newstate(lua_alloc, NULL, create->name,
- create->desc);
+ K = kluaL_newstate(create->name, create->desc, IPL_NONE);
K->ks_user = true;
if (K == NULL)
@@ -364,7 +366,9 @@ luaioctl(dev_t dev, u_long cmd, void *da
"%s to state %s\n",
m->mod_name,
s->lua_name);
+ klua_lock(s->K);
m->open(s->K->L);
+ klua_unlock(s->K);
m->refcount++;
LIST_INSERT_HEAD(
&s->lua_modules, m,
@@ -419,8 +423,9 @@ luaioctl(dev_t dev, u_long cmd, void *da
ls.off = 0L;
ls.size = va.va_size;
VOP_UNLOCK(nd.ni_vp);
+ klua_lock(s->K);
error = lua_load(s->K->L, lua_reader, &ls,
- strrchr(load->path, '/') + 1);
+ strrchr(load->path, '/') + 1, "bt");
vn_close(nd.ni_vp, FREAD, cred);
switch (error) {
case 0: /* no error */
@@ -429,11 +434,13 @@ luaioctl(dev_t dev, u_long cmd, void *da
if (lua_verbose)
device_printf(sc->sc_dev,
"syntax error\n");
+ klua_unlock(s->K);
return EINVAL;
case LUA_ERRMEM:
if (lua_verbose)
device_printf(sc->sc_dev,
"memory error\n");
+ klua_unlock(s->K);
return ENOMEM;
default:
if (lua_verbose)
@@ -441,6 +448,7 @@ luaioctl(dev_t dev, u_long cmd, void *da
"load error %d: %s\n",
error,
lua_tostring(s->K->L, -1));
+ klua_unlock(s->K);
return EINVAL;
}
if (lua_max_instr > 0)
@@ -453,8 +461,10 @@ luaioctl(dev_t dev, u_long cmd, void *da
"execution error: %s\n",
lua_tostring(s->K->L, -1));
}
+ klua_unlock(s->K);
return EINVAL;
}
+ klua_unlock(s->K);
return 0;
}
return ENXIO;
@@ -500,27 +510,45 @@ lua_require(lua_State *L)
md->open(L);
md->refcount++;
LIST_INSERT_HEAD(&s->lua_modules, md, mod_next);
- return 0;
+ return 1;
}
lua_pushstring(L, "module not found");
return lua_error(L);
}
-void *
+typedef struct {
+ size_t size;
+} __packed alloc_header_t;
+
+static void *
lua_alloc(void *ud, void *ptr, size_t osize, size_t nsize)
{
- void *nptr;
+ void *nptr = NULL;
+
+ const size_t hdr_size = sizeof(alloc_header_t);
+ alloc_header_t *hdr = (alloc_header_t *) ((char *) ptr - hdr_size);
- if (nsize == 0) {
- nptr = NULL;
+ if (nsize == 0) { /* freeing */
if (ptr != NULL)
- kmem_free(ptr, osize);
- } else {
- nptr = kmem_alloc(nsize, KM_SLEEP);
- if (ptr != NULL) {
- memcpy(nptr, ptr, osize < nsize ? osize : nsize);
- kmem_free(ptr, osize);
+ kmem_intr_free(hdr, hdr->size);
+ } else if (ptr != NULL && nsize <= hdr->size - hdr_size) /* shrinking */
+ return ptr; /* don't need to reallocate */
+ else { /* creating or expanding */
+ km_flag_t sleep = cpu_intr_p() || cpu_softintr_p() ?
+ KM_NOSLEEP : KM_SLEEP;
+
+ size_t alloc_size = nsize + hdr_size;
+ alloc_header_t *nhdr = kmem_intr_alloc(alloc_size, sleep);
+ if (nhdr == NULL) /* failed to allocate */
+ return NULL;
+
+ nhdr->size = alloc_size;
+ nptr = (void *) ((char *) nhdr + hdr_size);
+
+ if (ptr != NULL) { /* expanding */
+ memcpy(nptr, ptr, osize);
+ kmem_intr_free(hdr, hdr->size);
}
}
return nptr;
@@ -561,7 +589,7 @@ lua_maxcount(lua_State *L, lua_Debug *d)
}
int
-lua_mod_register(const char *name, int (*open)(void *))
+klua_mod_register(const char *name, lua_CFunction open)
{
struct lua_module *m;
@@ -579,7 +607,7 @@ lua_mod_register(const char *name, int (
}
int
-lua_mod_unregister(const char *name)
+klua_mod_unregister(const char *name)
{
struct lua_module *m;
@@ -600,7 +628,8 @@ lua_mod_unregister(const char *name)
}
klua_State *
-klua_newstate(lua_Alloc f, void *ud, const char *name, const char *desc)
+klua_newstate(lua_Alloc f, void *ud, const char *name, const char *desc,
+ int ipl)
{
klua_State *K;
struct lua_state *s;
@@ -641,8 +670,7 @@ klua_newstate(lua_Alloc f, void *ud, con
}
LIST_INSERT_HEAD(&lua_states, s, lua_next);
- mutex_init(&K->ks_lock, MUTEX_DEFAULT, IPL_VM);
- cv_init(&K->ks_inuse_cv, "luainuse");
+ mutex_init(&K->ks_lock, MUTEX_DEFAULT, ipl);
finish:
mutex_enter(&sc->sc_state_lock);
@@ -652,6 +680,12 @@ finish:
return K;
}
+inline klua_State *
+kluaL_newstate(const char *name, const char *desc, int ipl)
+{
+ return klua_newstate(lua_alloc, NULL, name, desc, ipl);
+}
+
void
klua_close(klua_State *K)
{
@@ -660,19 +694,10 @@ klua_close(klua_State *K)
struct lua_module *m;
int error = 0;
- /* Notify the Lua state that it is about to be closed */
- if (klua_lock(K))
- return; /* Nothing we can do about */
-
lua_getglobal(K->L, "onClose");
if (lua_isfunction(K->L, -1))
lua_pcall(K->L, -1, 0, 0);
- /*
- * Don't unlock, make sure no one uses the state until it is destroyed
- * klua_unlock(K);
- */
-
sc = device_private(sc_self);
mutex_enter(&sc->sc_state_lock);
while (sc->sc_state == true) {
@@ -696,7 +721,6 @@ klua_close(klua_State *K)
}
lua_close(K->L);
- cv_destroy(&K->ks_inuse_cv);
mutex_destroy(&K->ks_lock);
kmem_free(K, sizeof(klua_State));
@@ -742,33 +766,15 @@ klua_find(const char *name)
return K;
}
-int
+inline void
klua_lock(klua_State *K)
{
- int error;
-
- error = 0;
mutex_enter(&K->ks_lock);
- while (K->ks_inuse == true) {
- error = cv_wait_sig(&K->ks_inuse_cv, &K->ks_lock);
- if (error)
- break;
- }
- if (!error)
- K->ks_inuse = true;
- mutex_exit(&K->ks_lock);
-
- if (error)
- return error;
- return 0;
}
-void
+inline void
klua_unlock(klua_State *K)
{
- mutex_enter(&K->ks_lock);
- K->ks_inuse = false;
- cv_signal(&K->ks_inuse_cv);
mutex_exit(&K->ks_lock);
}
Index: src/sys/modules/lua/luavar.h
diff -u src/sys/modules/lua/luavar.h:1.1 src/sys/modules/lua/luavar.h:1.1.2.1
--- src/sys/modules/lua/luavar.h:1.1 Wed Oct 16 19:44:57 2013
+++ src/sys/modules/lua/luavar.h Sun Aug 10 06:56:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: luavar.h,v 1.1 2013/10/16 19:44:57 mbalmer Exp $ */
+/* $NetBSD: luavar.h,v 1.1.2.1 2014/08/10 06:56:10 tls Exp $ */
/*
* Copyright (c) 2011, Marc Balmer <[email protected]>.
@@ -31,9 +31,11 @@
#ifndef _LUA_VAR_
#define _LUA_VAR_
+#include <lua.h>
+
struct lua_module {
char mod_name[LUA_MAX_MODNAME];
- int (*open)(void *);
+ lua_CFunction open;
int refcount;
LIST_ENTRY(lua_module) mod_next;
};
Index: src/sys/modules/lua/test.lua
diff -u src/sys/modules/lua/test.lua:1.1 src/sys/modules/lua/test.lua:1.1.2.1
--- src/sys/modules/lua/test.lua:1.1 Wed Oct 16 19:44:57 2013
+++ src/sys/modules/lua/test.lua Sun Aug 10 06:56:10 2014
@@ -1,8 +1,8 @@
-require 'core'
+systm = require 'systm'
-core.print("hello, kernel world!\n")
+systm.print("hello, kernel world!\n")
function onClose()
- core.print('I am about to be closed\n')
+ systm.print('I am about to be closed\n')
end
Index: src/sys/modules/luapmf/Makefile
diff -u src/sys/modules/luapmf/Makefile:1.2 src/sys/modules/luapmf/Makefile:1.2.2.1
--- src/sys/modules/luapmf/Makefile:1.2 Mon Dec 16 23:35:48 2013
+++ src/sys/modules/luapmf/Makefile Sun Aug 10 06:56:10 2014
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2013/12/16 23:35:48 lneto Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2014/08/10 06:56:10 tls Exp $
.include "../Makefile.inc"
KMOD= luapmf
SRCS= luapmf.c
-CPPFLAGS+= -I${S}/../external/mit/lua/dist/src \
- -I${S}/modules/lua \
- -I${S}/sys
+CPPFLAGS+= -I${S}/../external/mit/lua/dist/src
.include <bsd.kmodule.mk>
Index: src/sys/modules/luapmf/luapmf.c
diff -u src/sys/modules/luapmf/luapmf.c:1.3 src/sys/modules/luapmf/luapmf.c:1.3.2.1
--- src/sys/modules/luapmf/luapmf.c:1.3 Mon Dec 16 23:35:48 2013
+++ src/sys/modules/luapmf/luapmf.c Sun Aug 10 06:56:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: luapmf.c,v 1.3 2013/12/16 23:35:48 lneto Exp $ */
+/* $NetBSD: luapmf.c,v 1.3.2.1 2014/08/10 06:56:10 tls Exp $ */
/*
* Copyright (c) 2011, 2013 Marc Balmer <[email protected]>.
@@ -82,9 +82,8 @@ get_platform(lua_State *L)
}
static int
-luaopen_pmf(void *ls)
+luaopen_pmf(lua_State *L)
{
- lua_State *L = (lua_State *)ls;
const luaL_Reg pmf_lib[ ] = {
{ "system_shutdown", system_shutdown },
{ "set_platform", set_platform },
@@ -92,7 +91,7 @@ luaopen_pmf(void *ls)
{ NULL, NULL }
};
- luaL_register(L, "pmf", pmf_lib);
+ luaL_newlib(L, pmf_lib);
/* some integer values */
lua_pushinteger(L, PMFE_DISPLAY_ON);
@@ -151,10 +150,10 @@ luapmf_modcmd(modcmd_t cmd, void *opaque
int error;
switch (cmd) {
case MODULE_CMD_INIT:
- error = lua_mod_register("pmf", luaopen_pmf);
+ error = klua_mod_register("pmf", luaopen_pmf);
break;
case MODULE_CMD_FINI:
- error = lua_mod_unregister("pmf");
+ error = klua_mod_unregister("pmf");
break;
default:
error = ENOTTY;
Index: src/sys/modules/luasystm/Makefile
diff -u src/sys/modules/luasystm/Makefile:1.1 src/sys/modules/luasystm/Makefile:1.1.2.1
--- src/sys/modules/luasystm/Makefile:1.1 Tue Dec 17 00:02:22 2013
+++ src/sys/modules/luasystm/Makefile Sun Aug 10 06:56:10 2014
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2013/12/17 00:02:22 lneto Exp $
+# $NetBSD: Makefile,v 1.1.2.1 2014/08/10 06:56:10 tls Exp $
.include "../Makefile.inc"
KMOD= luasystm
SRCS= luasystm.c
-CPPFLAGS+= -I${S}/../external/mit/lua/dist/src \
- -I${S}/modules/lua \
- -I${S}/sys
+CPPFLAGS+= -I${S}/../external/mit/lua/dist/src
.include <bsd.kmodule.mk>
Index: src/sys/modules/luasystm/test.lua
diff -u src/sys/modules/luasystm/test.lua:1.1 src/sys/modules/luasystm/test.lua:1.1.2.1
--- src/sys/modules/luasystm/test.lua:1.1 Tue Dec 17 00:02:22 2013
+++ src/sys/modules/luasystm/test.lua Sun Aug 10 06:56:10 2014
@@ -1,4 +1,4 @@
-require 'systm'
+local systm = require 'systm'
systm.print("hello, kernel world!\n")
Index: src/sys/modules/luasystm/luasystm.c
diff -u src/sys/modules/luasystm/luasystm.c:1.2 src/sys/modules/luasystm/luasystm.c:1.2.2.1
--- src/sys/modules/luasystm/luasystm.c:1.2 Mon Mar 24 20:21:02 2014
+++ src/sys/modules/luasystm/luasystm.c Sun Aug 10 06:56:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: luasystm.c,v 1.2 2014/03/24 20:21:02 christos Exp $ */
+/* $NetBSD: luasystm.c,v 1.2.2.1 2014/08/10 06:56:10 tls Exp $ */
/*
* Copyright (c) 2011, 2013 Marc Balmer <[email protected]>.
@@ -159,9 +159,8 @@ systm_panic(lua_State *L)
/* mutexes */
static int
-luaopen_systm(void *ls)
+luaopen_systm(lua_State *L)
{
- lua_State *L = (lua_State *)ls;
const luaL_Reg systm_lib[ ] = {
{ "print", print },
{ "print_nolog", print_nolog },
@@ -183,7 +182,7 @@ luaopen_systm(void *ls)
{NULL, NULL}
};
- luaL_register(L, "systm", systm_lib);
+ luaL_newlib(L, systm_lib);
/* some string values */
lua_pushstring(L, copyright);
@@ -217,10 +216,10 @@ luasystm_modcmd(modcmd_t cmd, void *opaq
switch (cmd) {
case MODULE_CMD_INIT:
- error = lua_mod_register("systm", luaopen_systm);
+ error = klua_mod_register("systm", luaopen_systm);
break;
case MODULE_CMD_FINI:
- error = lua_mod_unregister("systm");
+ error = klua_mod_unregister("systm");
break;
default:
error = ENOTTY;
Index: src/sys/modules/npf/Makefile
diff -u src/sys/modules/npf/Makefile:1.16 src/sys/modules/npf/Makefile:1.16.2.1
--- src/sys/modules/npf/Makefile:1.16 Fri Nov 8 00:38:26 2013
+++ src/sys/modules/npf/Makefile Sun Aug 10 06:56:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2013/11/08 00:38:26 rmind Exp $
+# $NetBSD: Makefile,v 1.16.2.1 2014/08/10 06:56:10 tls Exp $
#
# Public Domain.
#
@@ -11,9 +11,9 @@ KMOD= npf
SRCS= npf.c npf_alg.c npf_conf.c npf_ctl.c npf_handler.c
SRCS+= npf_bpf.c npf_if.c npf_inet.c npf_mbuf.c npf_nat.c
-SRCS+= npf_ruleset.c npf_rproc.c npf_sendpkt.c npf_session.c
+SRCS+= npf_ruleset.c npf_conn.c npf_conndb.c npf_rproc.c
SRCS+= npf_state.c npf_state_tcp.c npf_tableset.c
-SRCS+= npf_tableset_ptree.c npf_worker.c
+SRCS+= npf_tableset_ptree.c npf_sendpkt.c npf_worker.c
CPPFLAGS+= -DINET6
Index: src/sys/modules/uatp/uatp.ioconf
diff -u src/sys/modules/uatp/uatp.ioconf:1.1 src/sys/modules/uatp/uatp.ioconf:1.1.14.1
--- src/sys/modules/uatp/uatp.ioconf:1.1 Sat Aug 4 04:37:26 2012
+++ src/sys/modules/uatp/uatp.ioconf Sun Aug 10 06:56:11 2014
@@ -1,4 +1,4 @@
-# $NetBSD: uatp.ioconf,v 1.1 2012/08/04 04:37:26 riastradh Exp $
+# $NetBSD: uatp.ioconf,v 1.1.14.1 2014/08/10 06:56:11 tls Exp $
ioconf uatp
@@ -8,4 +8,3 @@ include "dev/usb/files.usb"
pseudo-root uhidev*
uatp* at uhidev? reportid ?
-wsmouse* at uatp? mux 0
Index: src/sys/modules/zfs/Makefile.zfsmod
diff -u src/sys/modules/zfs/Makefile.zfsmod:1.4 src/sys/modules/zfs/Makefile.zfsmod:1.4.10.1
--- src/sys/modules/zfs/Makefile.zfsmod:1.4 Wed Nov 21 17:48:05 2012
+++ src/sys/modules/zfs/Makefile.zfsmod Sun Aug 10 06:56:11 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.zfsmod,v 1.4 2012/11/21 17:48:05 pooka Exp $
+# $NetBSD: Makefile.zfsmod,v 1.4.10.1 2014/08/10 06:56:11 tls Exp $
ZFSDIR= ${S}/../external/cddl/osnet
@@ -20,6 +20,10 @@ SRCS+= zprop_common.c
SRCS+= trees.c
+.PATH: ${ZFSDIR}/lib/libzpool
+
+SRCS+= atomic.c
+
.PATH: ${ZFSDIR}/dist/uts/common/fs/zfs
SRCS+= arc.c
Added files:
Index: src/sys/modules/hythygtemp/Makefile
diff -u /dev/null src/sys/modules/hythygtemp/Makefile:1.1.4.2
--- /dev/null Sun Aug 10 06:56:11 2014
+++ src/sys/modules/hythygtemp/Makefile Sun Aug 10 06:56:10 2014
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1.4.2 2014/08/10 06:56:10 tls Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/dev/i2c
+
+KMOD= hythygtemp
+IOCONF= hythygtemp.ioconf
+SRCS= hytp14.c
+
+.include <bsd.kmodule.mk>
Index: src/sys/modules/hythygtemp/hythygtemp.ioconf
diff -u /dev/null src/sys/modules/hythygtemp/hythygtemp.ioconf:1.1.4.2
--- /dev/null Sun Aug 10 06:56:11 2014
+++ src/sys/modules/hythygtemp/hythygtemp.ioconf Sun Aug 10 06:56:10 2014
@@ -0,0 +1,9 @@
+# $NetBSD: hythygtemp.ioconf,v 1.1.4.2 2014/08/10 06:56:10 tls Exp $
+
+ioconf hythygtemp
+
+include "conf/files"
+
+pseudo-root iic*
+
+hythygtemp* at iic? addr 0x28
