CVS commit: src/sys/arch/alpha/conf
Module Name:src Committed By: tsutsui Date: Wed Jan 22 11:45:16 UTC 2014 Modified Files: src/sys/arch/alpha/conf: INSTALL Log Message: Add pseudo-device bpfilter to use DHCP client. To generate a diff of this commit: cvs rdiff -u -r1.104 -r1.105 src/sys/arch/alpha/conf/INSTALL 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/alpha/conf/INSTALL diff -u src/sys/arch/alpha/conf/INSTALL:1.104 src/sys/arch/alpha/conf/INSTALL:1.105 --- src/sys/arch/alpha/conf/INSTALL:1.104 Sat Apr 27 18:19:22 2013 +++ src/sys/arch/alpha/conf/INSTALL Wed Jan 22 11:45:16 2014 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.104 2013/04/27 18:19:22 christos Exp $ +# $NetBSD: INSTALL,v 1.105 2014/01/22 11:45:16 tsutsui Exp $ # # Alpha INSTALL kernel. @@ -341,6 +341,7 @@ wsmouse* at vsms? wskbd* at pckbd? wsmouse* at pms? +pseudo-device bpfilter pseudo-device loop pseudo-device md pseudo-device ppp
CVS commit: src/etc/etc.alpha
Module Name:src Committed By: tsutsui Date: Wed Jan 22 11:46:31 UTC 2014 Modified Files: src/etc/etc.alpha: MAKEDEV.conf Log Message: Create a bpf(4) device node on ramdisk for DHCP client. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/etc/etc.alpha/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.alpha/MAKEDEV.conf diff -u src/etc/etc.alpha/MAKEDEV.conf:1.9 src/etc/etc.alpha/MAKEDEV.conf:1.10 --- src/etc/etc.alpha/MAKEDEV.conf:1.9 Tue Oct 15 19:22:42 2013 +++ src/etc/etc.alpha/MAKEDEV.conf Wed Jan 22 11:46:31 2014 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.9 2013/10/15 19:22:42 jdc Exp $ +# $NetBSD: MAKEDEV.conf,v 1.10 2014/01/22 11:46:31 tsutsui Exp $ all_md) makedev wscons stic0 sd0 sd1 sd2 sd3 sd4 @@ -24,7 +24,7 @@ all_md) ;; minimal) - makedev std + makedev std bpf makedev sd0 sd1 sd2 sd3 opty st0 st1 ch0 cd0 cd1 ccd0 ccd1 md0 makedev ld0 ld1 ld2 ld3 makedev wd0 wd1 fd0 fd1
CVS commit: src/distrib/alpha/instkernel/ramdisk
Module Name:src
Committed By: tsutsui
Date: Wed Jan 22 11:48:59 UTC 2014
Modified Files:
src/distrib/alpha/instkernel/ramdisk: Makefile
Log Message:
Add dhcpcd(8) to alpha's INSTALL ramdisk.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/distrib/alpha/instkernel/ramdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/alpha/instkernel/ramdisk/Makefile
diff -u src/distrib/alpha/instkernel/ramdisk/Makefile:1.30 src/distrib/alpha/instkernel/ramdisk/Makefile:1.31
--- src/distrib/alpha/instkernel/ramdisk/Makefile:1.30 Thu Feb 11 09:06:47 2010
+++ src/distrib/alpha/instkernel/ramdisk/Makefile Wed Jan 22 11:48:59 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2010/02/11 09:06:47 roy Exp $
+# $NetBSD: Makefile,v 1.31 2014/01/22 11:48:59 tsutsui Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -29,6 +29,7 @@ IMAGEDEPENDS+= ${INSTALLNOTES}
PARSELISTENV= INSTALLNOTES=${INSTALLNOTES:Q} TOOL_PWD_MKDB=${TOOL_PWD_MKDB:Q}
.include ${DISTRIBDIR}/common/Makefile.crunch
+.include ${DISTRIBDIR}/common/Makefile.dhcpcd
.include ${DISTRIBDIR}/common/Makefile.makedev
.include ${DISTRIBDIR}/common/Makefile.image
CVS commit: src/usr.bin/vndcompress
Module Name:src Committed By: riastradh Date: Wed Jan 22 14:25:07 UTC 2014 Modified Files: src/usr.bin/vndcompress: offtab.c Log Message: Fix $NetBSD$ tag. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.bin/vndcompress/offtab.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/vndcompress/offtab.c diff -u src/usr.bin/vndcompress/offtab.c:1.8 src/usr.bin/vndcompress/offtab.c:1.9 --- src/usr.bin/vndcompress/offtab.c:1.8 Wed Jan 22 06:17:16 2014 +++ src/usr.bin/vndcompress/offtab.c Wed Jan 22 14:25:07 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: offtab.c,v 1.8 2014/01/22 06:17:16 riastradh Exp $ */ +/* $NetBSD: offtab.c,v 1.9 2014/01/22 14:25:07 riastradh Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD); +__RCSID($NetBSD: offtab.c,v 1.9 2014/01/22 14:25:07 riastradh Exp $); #include sys/types.h #include sys/endian.h
CVS commit: [riastradh-drm2] src/sys/external/bsd/drm2/dist/drm
Module Name:src
Committed By: riastradh
Date: Wed Jan 22 14:58:29 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm [riastradh-drm2]: drm_buffer.c
Log Message:
Remove spurious newline to reduce diff from upstream.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5 \
src/sys/external/bsd/drm2/dist/drm/drm_buffer.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/external/bsd/drm2/dist/drm/drm_buffer.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_buffer.c:1.1.1.1.2.4 src/sys/external/bsd/drm2/dist/drm/drm_buffer.c:1.1.1.1.2.5
--- src/sys/external/bsd/drm2/dist/drm/drm_buffer.c:1.1.1.1.2.4 Sun Sep 8 16:09:35 2013
+++ src/sys/external/bsd/drm2/dist/drm/drm_buffer.c Wed Jan 22 14:58:29 2014
@@ -171,7 +171,6 @@ void *drm_buffer_read_object(struct drm_
} else {
/* The object is split which forces copy to temporary object.*/
int beginsz = PAGE_SIZE - idx;
-
memcpy(stack_obj, buf-data[page][idx], beginsz);
memcpy((char *)stack_obj + beginsz, buf-data[page + 1][0],
CVS commit: [riastradh-drm2] src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Wed Jan 22 14:58:39 UTC 2014 Modified Files: src/sys/external/bsd/drm2/i915drm [riastradh-drm2]: i915_pci.c Log Message: Label fail4 is now used, so don't mark it __unused. To generate a diff of this commit: cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/sys/external/bsd/drm2/i915drm/i915_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/i915drm/i915_pci.c diff -u src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.1.2.8 src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.1.2.9 --- src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.1.2.8 Tue Jan 21 20:48:52 2014 +++ src/sys/external/bsd/drm2/i915drm/i915_pci.c Wed Jan 22 14:58:39 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: i915_pci.c,v 1.1.2.8 2014/01/21 20:48:52 riastradh Exp $ */ +/* $NetBSD: i915_pci.c,v 1.1.2.9 2014/01/22 14:58:39 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: i915_pci.c,v 1.1.2.8 2014/01/21 20:48:52 riastradh Exp $); +__KERNEL_RCSID(0, $NetBSD: i915_pci.c,v 1.1.2.9 2014/01/22 14:58:39 riastradh Exp $); #include sys/types.h #include sys/systm.h @@ -394,8 +394,7 @@ i915drm_fb_probe(struct drm_fb_helper *f /* Success! */ return 1; -fail4: __unused - bus_space_unmap(dev-bst, sc-sc_fb_bsh, size); +fail4: bus_space_unmap(dev-bst, sc-sc_fb_bsh, size); fb_helper-fb = NULL; fail3: drm_framebuffer_unreference(dev_priv-fbdev-ifb.base); fail2: i915_gem_object_unpin(sc-sc_fb_obj);
CVS commit: [riastradh-drm2] src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src
Committed By: riastradh
Date: Wed Jan 22 14:58:12 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [riastradh-drm2]: i915_irq.c
Log Message:
Take irq_lock before waking up irq_queue in i915_handle_error.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.8 -r1.1.1.1.2.9 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.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/external/bsd/drm2/dist/drm/i915/i915_irq.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c:1.1.1.1.2.8 src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c:1.1.1.1.2.9
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c:1.1.1.1.2.8 Wed Jan 15 13:53:32 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c Wed Jan 22 14:58:12 2014
@@ -1497,8 +1497,13 @@ void i915_handle_error(struct drm_device
*/
for_each_ring(ring, dev_priv, i)
#ifdef __NetBSD__
+ {
+ unsigned long flags;
+ spin_lock_irqsave(dev_priv-irq_lock, flags);
DRM_SPIN_WAKEUP_ALL(ring-irq_queue,
dev_priv-irq_lock);
+ spin_unlock_irqrestore(dev_priv-irq_lock, flags);
+ }
#else
wake_up_all(ring-irq_queue);
#endif
CVS commit: [riastradh-drm2] src/sys/external/bsd/drm2
Module Name:src
Committed By: riastradh
Date: Wed Jan 22 14:58:47 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/uapi/drm [riastradh-drm2]: drm.h
src/sys/external/bsd/drm2/drm [riastradh-drm2]: drm_drv.c drm_vm.c
Log Message:
Implement mmap on a drm device by a new kludgey ioctl.
There is currently no way to set up a custom choice of uvm object and
uvm pager ops for mmap: struct fileops has no fo_mmap, and device
nodes get to say only what paddr each offset maps to, not what uvm
object to use. For now, to avoid kernel changes outside the drm2
tree, we'll use a non-standard drm ioctl that calls uvm_map. This
requires source patches to userland programs, but for the most part
they can simply be converted from calling mmap to drmMap, which will
be adapted to use the ioctl.
This is not necessarily a permanent solution.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4 \
src/sys/external/bsd/drm2/dist/uapi/drm/drm.h
cvs rdiff -u -r1.1.2.31 -r1.1.2.32 src/sys/external/bsd/drm2/drm/drm_drv.c
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/external/bsd/drm2/drm/drm_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/external/bsd/drm2/dist/uapi/drm/drm.h
diff -u src/sys/external/bsd/drm2/dist/uapi/drm/drm.h:1.1.1.1.2.3 src/sys/external/bsd/drm2/dist/uapi/drm/drm.h:1.1.1.1.2.4
--- src/sys/external/bsd/drm2/dist/uapi/drm/drm.h:1.1.1.1.2.3 Wed Jul 24 03:48:58 2013
+++ src/sys/external/bsd/drm2/dist/uapi/drm/drm.h Wed Jan 22 14:58:47 2014
@@ -739,6 +739,20 @@ struct drm_prime_handle {
#define DRM_IOCTL_MODE_OBJ_GETPROPERTIES DRM_IOWR(0xB9, struct drm_mode_obj_get_properties)
#define DRM_IOCTL_MODE_OBJ_SETPROPERTY DRM_IOWR(0xBA, struct drm_mode_obj_set_property)
+#ifdef __NetBSD__
+/*
+ * Instrumenting mmap is trickier than just making an ioctl to do it.
+ */
+struct drm_mmap {
+ void *dnm_addr; /* in/out */
+ size_t dnm_size; /* in */
+ int dnm_prot; /* in */
+ int dnm_flags; /* in */
+ off_t dnm_offset; /* in */
+};
+#define DRM_IOCTL_MMAP DRM_IOWR(0xff, struct drm_mmap)
+#endif
+
/**
* Device specific ioctls should only be in their respective headers
* The device specific ioctl range is from 0x40 to 0x99.
Index: src/sys/external/bsd/drm2/drm/drm_drv.c
diff -u src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.31 src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.32
--- src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.31 Tue Jan 21 20:56:40 2014
+++ src/sys/external/bsd/drm2/drm/drm_drv.c Wed Jan 22 14:58:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_drv.c,v 1.1.2.31 2014/01/21 20:56:40 riastradh Exp $ */
+/* $NetBSD: drm_drv.c,v 1.1.2.32 2014/01/22 14:58:47 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: drm_drv.c,v 1.1.2.31 2014/01/21 20:56:40 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: drm_drv.c,v 1.1.2.32 2014/01/22 14:58:47 riastradh Exp $);
#include sys/param.h
#include sys/types.h
@@ -43,6 +43,14 @@ __KERNEL_RCSID(0, $NetBSD: drm_drv.c,v
#include sys/poll.h
#include sys/select.h
+#include uvm/uvm.h
+#include uvm/uvm_device.h
+#include uvm/uvm_extern.h
+#include uvm/uvm_fault.h
+#include uvm/uvm_page.h
+#include uvm/uvm_pmap.h
+#include uvm/uvm_prot.h
+
#include drm/drmP.h
static int drm_minor_types[] = {
@@ -95,8 +103,12 @@ static int drm_kqfilter(struct file *, s
static int drm_stat(struct file *, struct stat *);
static int drm_ioctl(struct file *, unsigned long, void *);
static int drm_version_string(char *, size_t *, const char *);
+static paddr_t drm_mmap(dev_t, off_t, int);
+static int drm_do_mmap(struct uvm_object *, vm_prot_t, voff_t, size_t,
+ vaddr_t *);
static drm_ioctl_t drm_version;
+static drm_ioctl_t drm_mmap_ioctl;
/* XXX Can this be pushed into struct drm_device? */
struct mutex drm_global_mutex;
@@ -218,6 +230,10 @@ static const struct drm_ioctl_desc drm_i
DRM_IOCTL_DEF(DRM_IOCTL_MODE_DESTROY_DUMB, drm_mode_destroy_dumb_ioctl, DRM_CONTROL_ALLOW|DRM_UNLOCKED),
DRM_IOCTL_DEF(DRM_IOCTL_MODE_OBJ_GETPROPERTIES, drm_mode_obj_get_properties_ioctl, DRM_CONTROL_ALLOW|DRM_UNLOCKED),
DRM_IOCTL_DEF(DRM_IOCTL_MODE_OBJ_SETPROPERTY, drm_mode_obj_set_property_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
+
+#ifdef __NetBSD__
+ DRM_IOCTL_DEF(DRM_IOCTL_MMAP, drm_mmap_ioctl, DRM_UNLOCKED),
+#endif
};
const struct cdevsw drm_cdevsw = {
@@ -229,7 +245,7 @@ const struct cdevsw drm_cdevsw = {
.d_stop = nostop,
.d_tty = notty,
.d_poll = nopoll,
- .d_mmap = nommap,
+ .d_mmap = drm_mmap,
.d_kqfilter = nokqfilter,
/* XXX was D_TTY | D_NEGOFFSAFE */
/* XXX Add D_MPSAFE some day... */
@@ -849,3 +865,122 @@ drm_getsarea(struct drm_device *dev)
return NULL;
}
+
+static paddr_t
+drm_mmap(dev_t d, off_t offset, int prot)
+{
+ struct drm_minor *const dminor = drm_dev_minor(d);
+
+ if (dminor
CVS commit: [riastradh-drm2] src/sys/external/bsd/drm2/linux
Module Name:src
Committed By: riastradh
Date: Wed Jan 22 14:58:20 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/linux [riastradh-drm2]: linux_work.c
Log Message:
Fix queue_delayed_work edge cases.
- Copy the relevant part of queue_work in-line for ticks == 0, since
queue_work itself will choke on a delayed work.
- Don't reschedule the callout if it is already scheduled -- let it
fire when it was already scheduled to fire.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/sys/external/bsd/drm2/linux/linux_work.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/external/bsd/drm2/linux/linux_work.c
diff -u src/sys/external/bsd/drm2/linux/linux_work.c:1.1.2.8 src/sys/external/bsd/drm2/linux/linux_work.c:1.1.2.9
--- src/sys/external/bsd/drm2/linux/linux_work.c:1.1.2.8 Mon Dec 30 04:52:21 2013
+++ src/sys/external/bsd/drm2/linux/linux_work.c Wed Jan 22 14:58:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_work.c,v 1.1.2.8 2013/12/30 04:52:21 riastradh Exp $ */
+/* $NetBSD: linux_work.c,v 1.1.2.9 2014/01/22 14:58:20 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux_work.c,v 1.1.2.8 2013/12/30 04:52:21 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux_work.c,v 1.1.2.9 2014/01/22 14:58:20 riastradh Exp $);
#include sys/types.h
#include sys/param.h
@@ -512,25 +512,32 @@ queue_delayed_work(struct workqueue_stru
KASSERT(wq != NULL);
- /* If we're not actually delaying, queue the work now. */
- if (ticks == 0) {
- queue_work(wq, dw-work);
- return;
- }
-
linux_work_lock(dw-work);
switch (dw-work.w_state) {
case WORK_IDLE:
case WORK_INVOKED:
- callout_init(dw-dw_callout, CALLOUT_MPSAFE);
- callout_reset(dw-dw_callout, ticks, linux_worker_intr, dw);
- dw-work.w_state = WORK_DELAYED;
- dw-work.w_wq = wq;
- TAILQ_INSERT_HEAD(wq-wq_delayed, dw, dw_entry);
+ if (ticks == 0) {
+ /* Skip the delay and queue it now. */
+ dw-work.w_state = WORK_PENDING;
+ dw-work.w_wq = wq;
+ workqueue_enqueue(wq-wq_workqueue, dw-work.w_wk,
+ NULL);
+ } else {
+ callout_init(dw-dw_callout, CALLOUT_MPSAFE);
+ callout_reset(dw-dw_callout, ticks,
+ linux_worker_intr, dw);
+ dw-work.w_state = WORK_DELAYED;
+ dw-work.w_wq = wq;
+ TAILQ_INSERT_HEAD(wq-wq_delayed, dw, dw_entry);
+ }
break;
case WORK_DELAYED:
- callout_schedule(dw-dw_callout, ticks);
+ /*
+ * Timer is already ticking. Leave it to time out
+ * whenever it was going to time out, as Linux does --
+ * neither speed it up nor postpone it.
+ */
break;
case WORK_PENDING:
CVS commit: src/share/mk
Module Name:src
Committed By: matt
Date: Wed Jan 22 15:04:19 UTC 2014
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Add MKGCCCMDS to _MKVARS.yes after the loop.
To generate a diff of this commit:
cvs rdiff -u -r1.764 -r1.765 src/share/mk/bsd.own.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.764 src/share/mk/bsd.own.mk:1.765
--- src/share/mk/bsd.own.mk:1.764 Tue Jan 21 16:40:24 2014
+++ src/share/mk/bsd.own.mk Wed Jan 22 15:04:19 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.764 2014/01/21 16:40:24 matt Exp $
+# $NetBSD: bsd.own.mk,v 1.765 2014/01/22 15:04:19 matt Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -919,6 +919,7 @@ ${var}?= yes
#
# MKGCCCMDS is only valid if we are building GCC so make it dependent on that.
#
+_MKVARS.yes += MKGCCCMDS
MKGCCCMDS?= ${MKGCC}
#
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Wed Jan 22 15:19:05 UTC 2014
Modified Files:
src/share/mk: bsd.klinks.mk
Log Message:
For now, ignore errors from creating klinks. This is racy and you can get
it to trigger in 1/4 of the builds with -j 40 on a 24 processor box. Typical
error is:
ln: machine/include: File exists
*** Failed target: .BEGIN
*** Failed command: rm -f machine ln -s
/p/netbsd/cvsroot/src/sys/arch/vax/include machine
*** Error code 1
Stop.
Another approach to fixing this is to create a lockfile or adding other flags
to ln to change its behavior.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/share/mk/bsd.klinks.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.klinks.mk
diff -u src/share/mk/bsd.klinks.mk:1.11 src/share/mk/bsd.klinks.mk:1.12
--- src/share/mk/bsd.klinks.mk:1.11 Wed Aug 21 11:26:44 2013
+++ src/share/mk/bsd.klinks.mk Wed Jan 22 10:19:05 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.klinks.mk,v 1.11 2013/08/21 15:26:44 matt Exp $
+# $NetBSD: bsd.klinks.mk,v 1.12 2014/01/22 15:19:05 christos Exp $
#
.include bsd.own.mk
@@ -41,41 +41,41 @@ CLEANFILES+= x86
# XXX .BEGIN is used to make sure the links are done before anything else.
.if !make(obj) !make(clean) !make(cleandir)
.BEGIN:
- @rm -f machine \
+ -@rm -f machine \
ln -s $S/arch/${KLINK_MACHINE}/include machine
- @rm -f ${KLINK_MACHINE} \
+ -@rm -f ${KLINK_MACHINE} \
ln -s $S/arch/${KLINK_MACHINE}/include ${KLINK_MACHINE}
- @if [ -d $S/arch/${MACHINE_CPU} ]; then \
+ -@if [ -d $S/arch/${MACHINE_CPU} ]; then \
rm -f ${MACHINE_CPU} \
ln -s $S/arch/${MACHINE_CPU}/include ${MACHINE_CPU}; \
fi
# XXX. it gets worse..
.if ${KLINK_MACHINE} == sun2 || ${KLINK_MACHINE} == sun3
- @rm -f sun68k \
+ -@rm -f sun68k \
ln -s $S/arch/sun68k/include sun68k
.endif
.if ${KLINK_MACHINE} == sparc64
- @rm -f sparc \
+ -@rm -f sparc \
ln -s $S/arch/sparc/include sparc
.endif
.if ${KLINK_MACHINE} == amd64
- @rm -f i386 \
+ -@rm -f i386 \
ln -s $S/arch/i386/include i386
.endif
.if ${MACHINE_CPU} == i386 || ${MACHINE_CPU} == x86_64
- @rm -f x86 \
+ -@rm -f x86 \
ln -s $S/arch/x86/include x86
.endif
.if defined(XEN_BUILD) || ${KLINK_MACHINE} == xen
- @rm -f xen \
+ -@rm -f xen \
ln -s $S/arch/xen/include xen
- @rm -rf xen-ma mkdir xen-ma \
+ -@rm -rf xen-ma mkdir xen-ma \
ln -s ../${XEN_BUILD:U${MACHINE_ARCH}} xen-ma/machine
.endif
.if ${KLINK_MACHINE} == evbmips
- @rm -f algor \
+ -@rm -f algor \
ln -s $S/arch/algor/include algor
- @rm -f sbmips \
+ -@rm -f sbmips \
ln -s $S/arch/sbmips/include sbmips
.endif
.endif
CVS commit: src/sys/ddb
Module Name:src Committed By: christos Date: Wed Jan 22 15:20:40 UTC 2014 Modified Files: src/sys/ddb: db_panic.c Log Message: add a return in the panic message To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/ddb/db_panic.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_panic.c diff -u src/sys/ddb/db_panic.c:1.2 src/sys/ddb/db_panic.c:1.3 --- src/sys/ddb/db_panic.c:1.2 Sun Feb 10 09:44:14 2013 +++ src/sys/ddb/db_panic.c Wed Jan 22 10:20:40 2014 @@ -25,7 +25,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: db_panic.c,v 1.2 2013/02/10 14:44:14 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: db_panic.c,v 1.3 2014/01/22 15:20:40 christos Exp $); #include sys/types.h #include sys/cpu.h @@ -57,7 +57,7 @@ void db_panic(void) cpu_index(curcpu())); intrace = 0; } else - printf(Faulted in mid-traceback; aborting...); + printf(Faulted in mid-traceback; aborting...\n); if (db_onpanic == 2) Debugger(); }
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: christos
Date: Wed Jan 22 15:21:08 UTC 2014
Modified Files:
src/sys/dev/ic: wd33c93.c
Log Message:
fix unused variable warnings
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/ic/wd33c93.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/wd33c93.c
diff -u src/sys/dev/ic/wd33c93.c:1.24 src/sys/dev/ic/wd33c93.c:1.25
--- src/sys/dev/ic/wd33c93.c:1.24 Sat Nov 13 08:52:02 2010
+++ src/sys/dev/ic/wd33c93.c Wed Jan 22 10:21:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: wd33c93.c,v 1.24 2010/11/13 13:52:02 uebayasi Exp $ */
+/* $NetBSD: wd33c93.c,v 1.25 2014/01/22 15:21:08 christos Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -79,7 +79,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wd33c93.c,v 1.24 2010/11/13 13:52:02 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: wd33c93.c,v 1.25 2014/01/22 15:21:08 christos Exp $);
#include opt_ddb.h
@@ -1240,6 +1240,7 @@ wd33c93_xfin(struct wd33c93_softc *sc, i
} else {
u_char foo;
GET_SBIC_data (sc, foo);
+__USE(foo);
}
wait = wd33c93_data_wait;
}
@@ -1377,7 +1378,6 @@ int
wd33c93_intr(struct wd33c93_softc *sc)
{
u_char asr, csr;
- int i;
/*
* pending interrupt?
@@ -1391,7 +1391,7 @@ wd33c93_intr(struct wd33c93_softc *sc)
do {
SBIC_DEBUG(INTS, (intr[csr=0x%x], csr));
- i = wd33c93_nextstate(sc, sc-sc_nexus, csr, asr);
+ (void)wd33c93_nextstate(sc, sc-sc_nexus, csr, asr);
WAIT_CIP(sc); /* XXX */
if (sc-sc_state == SBIC_CONNECTED) {
GET_SBIC_asr(sc, asr);
@@ -1421,7 +1421,7 @@ int
wd33c93_poll(struct wd33c93_softc *sc, struct wd33c93_acb *acb)
{
u_char asr, csr=0;
- int i, count;
+ int count;
struct scsipi_xfer *xs = acb-xs;
SBIC_WAIT(sc, SBIC_ASR_INT, wd33c93_cmd_wait);
@@ -1433,7 +1433,7 @@ wd33c93_poll(struct wd33c93_softc *sc, s
if (asr SBIC_ASR_INT) {
GET_SBIC_csr(sc, csr);
sc-sc_flags |= SBICF_NODMA;
- i = wd33c93_nextstate(sc, sc-sc_nexus, csr, asr);
+ (void)wd33c93_nextstate(sc, sc-sc_nexus, csr, asr);
WAIT_CIP(sc); /* XXX */
} else {
DELAY(1000);
@@ -1475,6 +1475,7 @@ wd33c93_msgin_phase(struct wd33c93_softc
u_char asr, csr, *msg;
GET_SBIC_asr(sc, asr);
+ __USE(asr);
SBIC_DEBUG(MSGS, (wd33c93msgin asr=%02x\n, asr));
CVS commit: src/sys/arch/emips/stand
Module Name:src Committed By: christos Date: Wed Jan 22 15:16:14 UTC 2014 Modified Files: src/sys/arch/emips/stand: Makefile.booters Log Message: Add NOMAN To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/emips/stand/Makefile.booters 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/emips/stand/Makefile.booters diff -u src/sys/arch/emips/stand/Makefile.booters:1.5 src/sys/arch/emips/stand/Makefile.booters:1.6 --- src/sys/arch/emips/stand/Makefile.booters:1.5 Wed Jan 15 20:15:33 2014 +++ src/sys/arch/emips/stand/Makefile.booters Wed Jan 22 10:16:14 2014 @@ -1,5 +1,6 @@ -# $NetBSD: Makefile.booters,v 1.5 2014/01/16 01:15:33 christos Exp $ +# $NetBSD: Makefile.booters,v 1.6 2014/01/22 15:16:14 christos Exp $ +NOMAN=1 .include bsd.own.mk # $S must correspond to the top of the 'sys' tree
CVS commit: src/external/mit/xorg/bin/appres
Module Name:src
Committed By: christos
Date: Wed Jan 22 15:23:06 UTC 2014
Modified Files:
src/external/mit/xorg/bin/appres: Makefile
Log Message:
Add missing libraries for static linking
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/appres/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/appres/Makefile
diff -u src/external/mit/xorg/bin/appres/Makefile:1.3 src/external/mit/xorg/bin/appres/Makefile:1.4
--- src/external/mit/xorg/bin/appres/Makefile:1.3 Fri May 31 01:41:50 2013
+++ src/external/mit/xorg/bin/appres/Makefile Wed Jan 22 10:23:06 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 05:41:50 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2014/01/22 15:23:06 christos Exp $
.include bsd.own.mk
@@ -6,8 +6,8 @@ PROG= appres
CPPFLAGS+= -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
-LDADD+= -lXt -lSM -lICE -lXext -lX11 -lXdmcp -lXau
-DPADD+= ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBXDMCP} ${LIBXAU}
+LDADD+= -lXt -lSM -lICE -lXext -lX11 -lxcb -lXdmcp -lXau
+DPADD+= ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBXCB} ${LIBXDMCP} ${LIBXAU}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
CVS commit: src/sys/arch/ews4800mips/stand/common
Module Name:src
Committed By: christos
Date: Wed Jan 22 16:27:01 UTC 2014
Modified Files:
src/sys/arch/ews4800mips/stand/common: fileread_bfs.c
Log Message:
remove unused var
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ews4800mips/stand/common/fileread_bfs.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/ews4800mips/stand/common/fileread_bfs.c
diff -u src/sys/arch/ews4800mips/stand/common/fileread_bfs.c:1.2 src/sys/arch/ews4800mips/stand/common/fileread_bfs.c:1.3
--- src/sys/arch/ews4800mips/stand/common/fileread_bfs.c:1.2 Mon Apr 28 16:23:18 2008
+++ src/sys/arch/ews4800mips/stand/common/fileread_bfs.c Wed Jan 22 11:27:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fileread_bfs.c,v 1.2 2008/04/28 20:23:18 martin Exp $ */
+/* $NetBSD: fileread_bfs.c,v 1.3 2014/01/22 16:27:01 christos Exp $ */
/*-
* Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -49,11 +49,10 @@ fileread(const char *fname, size_t *size
struct ux_partition *partition = vtoc-partition;
struct bfs_inode *inode = (void *)SDBOOT_INODEADDR;
struct bfs_dirent *dirent = (void *)SDBOOT_DIRENTADDR;
- int i, n, err, block_size, bfs_sector;
+ int i, n, err, bfs_sector;
if (pdinfo-magic != PDINFO_MAGIC)
return BERR_PDINFO;
- block_size = pdinfo-geometory.bytes_per_sector;
#if 0
{
CVS commit: src/sys/arch/ews4800mips/ews4800mips
Module Name:src
Committed By: christos
Date: Wed Jan 22 16:32:09 UTC 2014
Modified Files:
src/sys/arch/ews4800mips/ews4800mips: pdinfo.c
Log Message:
Fix debugging variables
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ews4800mips/ews4800mips/pdinfo.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/ews4800mips/ews4800mips/pdinfo.c
diff -u src/sys/arch/ews4800mips/ews4800mips/pdinfo.c:1.4 src/sys/arch/ews4800mips/ews4800mips/pdinfo.c:1.5
--- src/sys/arch/ews4800mips/ews4800mips/pdinfo.c:1.4 Mon Apr 28 16:23:18 2008
+++ src/sys/arch/ews4800mips/ews4800mips/pdinfo.c Wed Jan 22 11:32:09 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pdinfo.c,v 1.4 2008/04/28 20:23:18 martin Exp $ */
+/* $NetBSD: pdinfo.c,v 1.5 2014/01/22 16:32:09 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pdinfo.c,v 1.4 2008/04/28 20:23:18 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: pdinfo.c,v 1.5 2014/01/22 16:32:09 christos Exp $);
#include sys/types.h
#include sys/systm.h
@@ -71,16 +71,16 @@ pdinfo_valid(const struct pdinfo_sector
bool
pdinfo_sanity(const struct pdinfo_sector *disk)
{
- const struct disk_geometory *geom;
- const struct disk_ux *ux;
if (!pdinfo_valid(disk)) {
DPRINTF(no physical disk info.\n);
return false;
}
- geom = disk-geometory;
- ux = disk-ux;
+#ifdef PDINFO_DEBUG
+ const struct disk_geometory *geom = disk-geometory;
+ const struct disk_ux *ux = disk-ux;
+#endif
DPRINTF(physical disk sector size %dbyte\n, sizeof *disk);
DPRINTF([disk]\n);
DPRINTF(drive_id = %#x\n, disk-drive_id);
CVS commit: [riastradh-drm2] src/sys/external/bsd/drm2/drm
Module Name:src
Committed By: riastradh
Date: Wed Jan 22 16:40:54 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/drm [riastradh-drm2]: drm_drv.c drm_gem_vm.c
Log Message:
Little reference counting fix in drm_mmap.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.33 -r1.1.2.34 src/sys/external/bsd/drm2/drm/drm_drv.c
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/external/bsd/drm2/drm/drm_gem_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/external/bsd/drm2/drm/drm_drv.c
diff -u src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.33 src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.34
--- src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.33 Wed Jan 22 16:40:44 2014
+++ src/sys/external/bsd/drm2/drm/drm_drv.c Wed Jan 22 16:40:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_drv.c,v 1.1.2.33 2014/01/22 16:40:44 riastradh Exp $ */
+/* $NetBSD: drm_drv.c,v 1.1.2.34 2014/01/22 16:40:53 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: drm_drv.c,v 1.1.2.33 2014/01/22 16:40:44 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: drm_drv.c,v 1.1.2.34 2014/01/22 16:40:53 riastradh Exp $);
#include sys/param.h
#include sys/types.h
@@ -924,8 +924,10 @@ map: vm_prot = ((ISSET(prot, PROT_READ)?
/* XXX errno NetBSD-Linux */
ret = -uvm_map(curproc-p_vmspace-vm_map, vaddr, size, uobj, offset,
align, uvmflag);
- if (ret)
+ if (ret) {
+ (*uobj-pgops-pgo_detach)(uobj);
return ret;
+ }
/* Success! */
args-dnm_addr = (void *)vaddr;
Index: src/sys/external/bsd/drm2/drm/drm_gem_vm.c
diff -u src/sys/external/bsd/drm2/drm/drm_gem_vm.c:1.1.2.4 src/sys/external/bsd/drm2/drm/drm_gem_vm.c:1.1.2.5
--- src/sys/external/bsd/drm2/drm/drm_gem_vm.c:1.1.2.4 Wed Jan 22 16:40:44 2014
+++ src/sys/external/bsd/drm2/drm/drm_gem_vm.c Wed Jan 22 16:40:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_gem_vm.c,v 1.1.2.4 2014/01/22 16:40:44 riastradh Exp $ */
+/* $NetBSD: drm_gem_vm.c,v 1.1.2.5 2014/01/22 16:40:53 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: drm_gem_vm.c,v 1.1.2.4 2014/01/22 16:40:44 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: drm_gem_vm.c,v 1.1.2.5 2014/01/22 16:40:53 riastradh Exp $);
#include sys/types.h
@@ -107,7 +107,7 @@ drm_gem_mmap_object_locked(struct drm_de
KASSERT(obj-dev == dev);
/* Success! */
- drm_gem_object_reference(obj); /* XXX Locking? */
+ drm_gem_object_reference(obj);
*uobjp = obj-gemo_uvmobj;
return 0;
}
CVS commit: [riastradh-drm2] src/sys/external/bsd/drm2
Module Name:src
Committed By: riastradh
Date: Wed Jan 22 16:40:44 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm [riastradh-drm2]: drmP.h
src/sys/external/bsd/drm2/drm [riastradh-drm2]: drm_drv.c drm_gem_vm.c
drm_vm.c
Log Message:
Tidy up and reuse the code I had already written for gem mmapping.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.55 -r1.1.1.1.2.56 \
src/sys/external/bsd/drm2/dist/include/drm/drmP.h
cvs rdiff -u -r1.1.2.32 -r1.1.2.33 src/sys/external/bsd/drm2/drm/drm_drv.c
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/external/bsd/drm2/drm/drm_gem_vm.c \
src/sys/external/bsd/drm2/drm/drm_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/external/bsd/drm2/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.1.1.1.2.55 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.1.1.1.2.56
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.1.1.1.2.55 Wed Jan 15 21:25:29 2014
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Wed Jan 22 16:40:44 2014
@@ -1494,6 +1494,8 @@ extern int drm_release(struct inode *ino
/* Mapping support (drm_vm.h) */
#ifdef __NetBSD__
+extern int drm_mmap_object(struct drm_device *, off_t, size_t, int,
+struct uvm_object **);
extern paddr_t drm_mmap_paddr(struct drm_device *, off_t, int);
#else
extern int drm_mmap(struct file *filp, struct vm_area_struct *vma);
@@ -1846,7 +1848,7 @@ void drm_gem_object_handle_free(struct d
#ifdef __NetBSD__
void drm_gem_pager_reference(struct uvm_object *);
void drm_gem_pager_detach(struct uvm_object *);
-int drm_gem_mmap_object(struct drm_device *, off_t *, size_t,
+int drm_gem_mmap_object(struct drm_device *, off_t, size_t, int,
struct uvm_object **);
#else
void drm_gem_vm_open(struct vm_area_struct *vma);
Index: src/sys/external/bsd/drm2/drm/drm_drv.c
diff -u src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.32 src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.33
--- src/sys/external/bsd/drm2/drm/drm_drv.c:1.1.2.32 Wed Jan 22 14:58:47 2014
+++ src/sys/external/bsd/drm2/drm/drm_drv.c Wed Jan 22 16:40:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_drv.c,v 1.1.2.32 2014/01/22 14:58:47 riastradh Exp $ */
+/* $NetBSD: drm_drv.c,v 1.1.2.33 2014/01/22 16:40:44 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: drm_drv.c,v 1.1.2.32 2014/01/22 14:58:47 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: drm_drv.c,v 1.1.2.33 2014/01/22 16:40:44 riastradh Exp $);
#include sys/param.h
#include sys/types.h
@@ -43,13 +43,7 @@ __KERNEL_RCSID(0, $NetBSD: drm_drv.c,v
#include sys/poll.h
#include sys/select.h
-#include uvm/uvm.h
-#include uvm/uvm_device.h
#include uvm/uvm_extern.h
-#include uvm/uvm_fault.h
-#include uvm/uvm_page.h
-#include uvm/uvm_pmap.h
-#include uvm/uvm_prot.h
#include drm/drmP.h
@@ -104,8 +98,6 @@ static int drm_stat(struct file *, struc
static int drm_ioctl(struct file *, unsigned long, void *);
static int drm_version_string(char *, size_t *, const char *);
static paddr_t drm_mmap(dev_t, off_t, int);
-static int drm_do_mmap(struct uvm_object *, vm_prot_t, voff_t, size_t,
- vaddr_t *);
static drm_ioctl_t drm_version;
static drm_ioctl_t drm_mmap_ioctl;
@@ -886,101 +878,56 @@ drm_mmap_ioctl(struct drm_device *dev, v
const int prot = args-dnm_prot;
const int flags = args-dnm_flags;
const off_t offset = args-dnm_offset;
- struct drm_gem_mm *const mm = dev-mm_private;
- struct drm_hash_item *hash;
- vm_prot_t vm_prot;
- dev_t devno;
struct uvm_object *uobj;
- vaddr_t vaddr;
+ const vm_prot_t vm_maxprot = (VM_PROT_READ | VM_PROT_WRITE);
+ vm_prot_t vm_prot;
+ int uvmflag;
+ vaddr_t align, vaddr;
int ret;
/* XXX Copypasta from drm_gem_mmap. */
if (drm_device_is_unplugged(dev))
return -ENODEV;
- if (prot != (PROT_READ | PROT_WRITE))
+ if (prot != (prot (PROT_READ | PROT_WRITE)))
return -EACCES;
if (flags != MAP_SHARED)
return -EINVAL;
(void)addr; /* XXX ignore -- no MAP_FIXED for now */
- KASSERT(prot == (PROT_READ | PROT_WRITE));
- vm_prot = (VM_PROT_READ | VM_PROT_WRITE);
-
- mutex_lock(dev-struct_mutex);
- if (drm_ht_find_item(mm-offset_hash, atop(offset), hash) == 0) {
- /* GEM object. Map the GEM shared-memory uobj. */
-
- struct drm_local_map *const map =
- drm_hash_entry(hash, struct drm_map_list, hash)-map;
- if ((map == NULL) ||
- (ISSET(map-flags, _DRM_RESTRICTED) !DRM_SUSER())) {
- ret = -EPERM;
- goto out_unlock;
- }
- if (map-size size) {
- ret = -EINVAL;
- goto out_unlock;
- }
-
- struct drm_gem_object *const obj = map-handle;
- if (obj-dev-driver-gem_uvm_ops == NULL) {
- ret = -EINVAL;
- goto out_unlock;
- }
-
- uobj = obj-gemo_shm_uao;
- ret = drm_do_mmap(uobj, prot, offset, size, vaddr);
- if (ret)
-
CVS commit: src/sys/arch/ews4800mips/sbd
Module Name:src Committed By: christos Date: Wed Jan 22 18:20:41 UTC 2014 Modified Files: src/sys/arch/ews4800mips/sbd: if_iee_sbdio.c Log Message: fix set but unused variable To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/ews4800mips/sbd/if_iee_sbdio.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/ews4800mips/sbd/if_iee_sbdio.c diff -u src/sys/arch/ews4800mips/sbd/if_iee_sbdio.c:1.10 src/sys/arch/ews4800mips/sbd/if_iee_sbdio.c:1.11 --- src/sys/arch/ews4800mips/sbd/if_iee_sbdio.c:1.10 Tue Dec 1 18:16:00 2009 +++ src/sys/arch/ews4800mips/sbd/if_iee_sbdio.c Wed Jan 22 13:20:41 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: if_iee_sbdio.c,v 1.10 2009/12/01 23:16:00 skrll Exp $ */ +/* $NetBSD: if_iee_sbdio.c,v 1.11 2014/01/22 18:20:41 christos Exp $ */ /* * Copyright (c) 2003 Jochen Kunz. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_iee_sbdio.c,v 1.10 2009/12/01 23:16:00 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: if_iee_sbdio.c,v 1.11 2014/01/22 18:20:41 christos Exp $); #include sys/param.h #include sys/systm.h @@ -197,6 +197,7 @@ iee_sbdio_channel_attention(void *cookie /* Issue a Channel Attention */ dummy = *sc-sc_port; dummy = *sc-sc_port; + __USE(dummy); } static void
CVS commit: src/sys/arch/ews4800mips/sbd
Module Name:src Committed By: christos Date: Wed Jan 22 18:47:03 UTC 2014 Modified Files: src/sys/arch/ews4800mips/sbd: zs_sbdio.c Log Message: remove unused To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/ews4800mips/sbd/zs_sbdio.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/ews4800mips/sbd/zs_sbdio.c diff -u src/sys/arch/ews4800mips/sbd/zs_sbdio.c:1.10 src/sys/arch/ews4800mips/sbd/zs_sbdio.c:1.11 --- src/sys/arch/ews4800mips/sbd/zs_sbdio.c:1.10 Mon Apr 28 16:23:18 2008 +++ src/sys/arch/ews4800mips/sbd/zs_sbdio.c Wed Jan 22 13:47:03 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: zs_sbdio.c,v 1.10 2008/04/28 20:23:18 martin Exp $ */ +/* $NetBSD: zs_sbdio.c,v 1.11 2014/01/22 18:47:03 christos Exp $ */ /*- * Copyright (c) 1996, 2005 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: zs_sbdio.c,v 1.10 2008/04/28 20:23:18 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: zs_sbdio.c,v 1.11 2014/01/22 18:47:03 christos Exp $); #include sys/param.h #include sys/systm.h @@ -111,12 +111,11 @@ zs_sbdio_attach(device_t parent, device_ struct zschan *zc; struct zs_chanstate *cs; struct zsdevice *zs_addr; - int s, zs_unit, channel; + int s, channel; zsc-zsc_dev = self; aprint_normal(\n); - zs_unit = device_unit(self); zs_addr = (void *)MIPS_PHYS_TO_KSEG1(sa-sa_addr1); zsc-zsc_flags = sa-sa_flags;
CVS commit: src/sys/dev/wsfb
Module Name:src
Committed By: skrll
Date: Wed Jan 22 18:47:11 UTC 2014
Modified Files:
src/sys/dev/wsfb: genfb.c
Log Message:
Provide a wsdisplay_accessops.pollc
This makes sure that the screen gets painted properly during early boot
input (e.g. boot -a) on the Raspberry PI.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/wsfb/genfb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wsfb/genfb.c
diff -u src/sys/dev/wsfb/genfb.c:1.51 src/sys/dev/wsfb/genfb.c:1.52
--- src/sys/dev/wsfb/genfb.c:1.51 Wed Oct 9 17:20:54 2013
+++ src/sys/dev/wsfb/genfb.c Wed Jan 22 18:47:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb.c,v 1.51 2013/10/09 17:20:54 macallan Exp $ */
+/* $NetBSD: genfb.c,v 1.52 2014/01/22 18:47:11 skrll Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: genfb.c,v 1.51 2013/10/09 17:20:54 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfb.c,v 1.52 2014/01/22 18:47:11 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -68,6 +68,8 @@ __KERNEL_RCSID(0, $NetBSD: genfb.c,v 1.
static int genfb_ioctl(void *, void *, u_long, void *, int, struct lwp *);
static paddr_t genfb_mmap(void *, void *, off_t, int);
+static void genfb_pollc(void *, int);
+
static void genfb_init_screen(void *, struct vcons_screen *, int, long *);
static int genfb_putcmap(struct genfb_softc *, struct wsdisplay_cmap *);
@@ -234,6 +236,7 @@ genfb_attach(struct genfb_softc *sc, str
sc-sc_accessops.ioctl = genfb_ioctl;
sc-sc_accessops.mmap = genfb_mmap;
+ sc-sc_accessops.pollc = genfb_pollc;
#ifdef GENFB_SHADOWFB
sc-sc_shadowfb = kmem_alloc(sc-sc_fbsize, KM_SLEEP);
@@ -485,6 +488,21 @@ genfb_mmap(void *v, void *vs, off_t offs
}
static void
+genfb_pollc(void *v, int on)
+{
+ struct vcons_data *vd = v;
+ struct genfb_softc *sc = vd-cookie;
+
+ if (sc == NULL)
+ return;
+
+ if (on)
+ genfb_enable_polling(sc-sc_dev);
+ else
+ genfb_disable_polling(sc-sc_dev);
+}
+
+static void
genfb_init_screen(void *cookie, struct vcons_screen *scr,
int existing, long *defattr)
{
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: christos Date: Wed Jan 22 20:49:19 UTC 2014 Modified Files: src/sys/arch/mips/include: vmparam.h Log Message: remove dup define (already defined in mips_param.h) To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/arch/mips/include/vmparam.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/include/vmparam.h diff -u src/sys/arch/mips/include/vmparam.h:1.50 src/sys/arch/mips/include/vmparam.h:1.51 --- src/sys/arch/mips/include/vmparam.h:1.50 Wed Aug 24 12:01:53 2011 +++ src/sys/arch/mips/include/vmparam.h Wed Jan 22 15:49:19 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.50 2011/08/24 16:01:53 matt Exp $ */ +/* $NetBSD: vmparam.h,v 1.51 2014/01/22 20:49:19 christos Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -75,9 +75,6 @@ #define USRSTACK (VM_MAXUSER_ADDRESS-0x8000) /* Start of user stack */ #define USRSTACK32 ((uint32_t)VM_MAXUSER32_ADDRESS-0x8000) -/* alignment requirement for u-area space in bytes */ -#define USPACE_ALIGN USPACE - /* * Virtual memory related constants, all in bytes */
CVS commit: src/sys/rump/include/machine
Module Name:src
Committed By: christos
Date: Wed Jan 22 23:38:21 UTC 2014
Modified Files:
src/sys/rump/include/machine: cpu.h
Log Message:
Kludges like to procreate. Add alpha cpu_frequency() kludge.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/rump/include/machine/cpu.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/rump/include/machine/cpu.h
diff -u src/sys/rump/include/machine/cpu.h:1.17 src/sys/rump/include/machine/cpu.h:1.18
--- src/sys/rump/include/machine/cpu.h:1.17 Wed Oct 30 04:42:45 2013
+++ src/sys/rump/include/machine/cpu.h Wed Jan 22 18:38:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.17 2013/10/30 08:42:45 mrg Exp $ */
+/* $NetBSD: cpu.h,v 1.18 2014/01/22 23:38:21 christos Exp $ */
/*
* Copyright (c) 2008-2011 Antti Kantee. All Rights Reserved.
@@ -40,6 +40,10 @@ struct cpu_info {
struct cpu_info *ci_next;
+#ifdef __alpha__
+ uint64_t ci_pcc_freq;
+#endif
+
/*
* XXX: horrible workaround for vax lock.h.
* I eventually want to nuke rump include/machine, so don't waste
CVS commit: src/share/man/man9
Module Name:src Committed By: skrll Date: Wed Jan 22 23:43:13 UTC 2014 Modified Files: src/share/man/man9: pcu.9 Log Message: Update a little (don't trust myself to update anymore). Fix a macro problem while I'm here. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man9/pcu.9 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/man9/pcu.9 diff -u src/share/man/man9/pcu.9:1.2 src/share/man/man9/pcu.9:1.3 --- src/share/man/man9/pcu.9:1.2 Mon Dec 3 07:50:29 2012 +++ src/share/man/man9/pcu.9 Wed Jan 22 23:43:13 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: pcu.9,v 1.2 2012/12/03 07:50:29 wiz Exp $ +.\ $NetBSD: pcu.9,v 1.3 2014/01/22 23:43:13 skrll Exp $ .\ .\ Copyright (c) 2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -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 December 2, 2012 +.Dd January 22, 2014 .Dt PCU 9 .Os .Sh NAME @@ -84,16 +84,16 @@ trap on the execution of one of the PCU' .It Fn pcu_load Load (initialize) the PCU state of the current LWP on the current CPU. .It Fn pcu_save -Save the PCU state to the given LWP. +Save the specified PCU state to the given LWP. .It Fn pcu_discard -Discard the PCU state of the current LWP. +Discard the specified PCU state of the current LWP. .It Fn pcu_used_p Return true if PCU was used (i.e. -.Fn pcu_load +.Fn pcu_loa was called) by the LWP. Otherwise, return false. -.Fn pcu_save_all -save PCU state of the given LWP, so that it could be used later. +.It Fn pcu_save_all +Save all PCU state of the given LWP, so that it could be used later. .El .\ - .Sh CODE REFERENCES
CVS commit: src/lib/libc/arch/arm/hardfloat
Module Name:src Committed By: joerg Date: Thu Jan 23 00:00:16 UTC 2014 Modified Files: src/lib/libc/arch/arm/hardfloat: fpsetmask.S Log Message: One vmsr is enough. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/arm/hardfloat/fpsetmask.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/arm/hardfloat/fpsetmask.S diff -u src/lib/libc/arch/arm/hardfloat/fpsetmask.S:1.6 src/lib/libc/arch/arm/hardfloat/fpsetmask.S:1.7 --- src/lib/libc/arch/arm/hardfloat/fpsetmask.S:1.6 Fri Jan 11 13:55:26 2013 +++ src/lib/libc/arch/arm/hardfloat/fpsetmask.S Thu Jan 23 00:00:16 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: fpsetmask.S,v 1.6 2013/01/11 13:55:26 matt Exp $ */ +/* $NetBSD: fpsetmask.S,v 1.7 2014/01/23 00:00:16 joerg Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -52,7 +52,6 @@ ENTRY(fpsetmask) bic r1, r1, #VFP_FPSCR_ESUM orr r1, r1, r2, lsl #8 vmsr fpscr, r1 - mcr p10, 7, r1, c1, c0, 0 and r0, r0, #VFP_FPSCR_CSUM RET END(fpsetmask)
CVS commit: xsrc/xfree/xc/extras/Mesa/src/mesa/math
Module Name:xsrc Committed By: christos Date: Thu Jan 23 04:05:50 UTC 2014 Modified Files: xsrc/xfree/xc/extras/Mesa/src/mesa/math: m_debug_xform.c Log Message: minimal fix for cast from pointer to int of different size. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/xfree/xc/extras/Mesa/src/mesa/math/m_debug_xform.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/xfree/xc/extras/Mesa/src/mesa/math/m_debug_xform.c diff -u xsrc/xfree/xc/extras/Mesa/src/mesa/math/m_debug_xform.c:1.1.1.1 xsrc/xfree/xc/extras/Mesa/src/mesa/math/m_debug_xform.c:1.2 --- xsrc/xfree/xc/extras/Mesa/src/mesa/math/m_debug_xform.c:1.1.1.1 Fri Mar 18 08:06:49 2005 +++ xsrc/xfree/xc/extras/Mesa/src/mesa/math/m_debug_xform.c Wed Jan 22 23:05:50 2014 @@ -187,7 +187,7 @@ static int test_transform_function( tran mat-type = mtypes[mtype]; m = mat-m; - ASSERT( ((GLuint)m 15) == 0 ); + ASSERT( ((GLuint)(long)m 15) == 0 ); init_matrix( m );
