PERFORCE change 148834 for review
Ed Schouten
ed at FreeBSD.org
Sat Aug 30 09:24:25 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=148834
Change 148834 by ed at ed_dull on 2008/08/30 09:23:35
IFC.
Affected files ...
.. //depot/projects/mpsafetty/lib/libarchive/test/test_write_disk.c#3 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/drm_drv.c#3 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/drm_lock.c#3 integrate
.. //depot/projects/mpsafetty/sys/kern/tty.c#36 integrate
.. //depot/projects/mpsafetty/sys/kern/tty_inq.c#8 integrate
.. //depot/projects/mpsafetty/sys/kern/tty_outq.c#10 integrate
.. //depot/projects/mpsafetty/sys/sys/ttyqueue.h#9 integrate
.. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/Makefile#5 integrate
Differences ...
==== //depot/projects/mpsafetty/lib/libarchive/test/test_write_disk.c#3 (text+ko) ====
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk.c,v 1.10 2008/08/28 06:40:22 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk.c,v 1.11 2008/08/30 05:31:23 kientzle Exp $");
#if ARCHIVE_VERSION_STAMP >= 1009000
@@ -97,8 +97,8 @@
failure("st.st_mode=%o archive_entry_mode(ae)=%o",
st.st_mode, archive_entry_mode(ae));
assertEqualInt(st.st_mode, (archive_entry_mode(ae) & ~UMASK));
- failure("Old bug: if no atime specified, atime got set to Jan 1, 1970");
- assert(st.st_atime != 0);
+ failure("No atime was specified, so atime should get set to mtime");
+ assertEqualInt(st.st_atime, st.st_mtime);
assertEqualInt(st.st_size, sizeof(data));
assertEqualInt(st.st_mtime, 123456789);
}
==== //depot/projects/mpsafetty/sys/dev/drm/drm_drv.c#3 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/drm/drm_drv.c,v 1.8 2008/08/23 20:59:12 rnoland Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/drm/drm_drv.c,v 1.10 2008/08/30 00:53:30 rnoland Exp $");
/** @file drm_drv.c
* The catch-all file for DRM device support, including module setup/teardown,
@@ -463,7 +463,9 @@
dev->magiclist[i].head = dev->magiclist[i].tail = NULL;
}
+ DRM_UNLOCK();
drm_drawable_free_all(dev);
+ DRM_LOCK();
/* Clear AGP information */
if ( dev->agp ) {
@@ -658,8 +660,11 @@
dev->agp = NULL;
}
- if (dev->driver.unload != NULL)
+ if (dev->driver.unload != NULL) {
+ DRM_LOCK();
dev->driver.unload(dev);
+ DRM_UNLOCK();
+ }
delete_unrhdr(dev->drw_unrhdr);
==== //depot/projects/mpsafetty/sys/dev/drm/drm_lock.c#3 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/drm/drm_lock.c,v 1.3 2008/08/23 20:59:12 rnoland Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/drm/drm_lock.c,v 1.4 2008/08/30 01:00:18 rnoland Exp $");
/** @file drm_lock.c
* Implementation of the ioctls and other support code for dealing with the
@@ -171,18 +171,23 @@
{
drm_lock_t *lock = data;
+ DRM_DEBUG("%d (pid %d) requests unlock (0x%08x), flags = 0x%08x\n",
+ lock->context, DRM_CURRENTPID, dev->lock.hw_lock->lock,
+ lock->flags);
+
if (lock->context == DRM_KERNEL_CONTEXT) {
DRM_ERROR("Process %d using kernel context %d\n",
DRM_CURRENTPID, lock->context);
return EINVAL;
}
+#if 0
/* Check that the context unlock being requested actually matches
* who currently holds the lock.
*/
if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock) ||
_DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock) != lock->context)
return EINVAL;
-
+#endif
DRM_SPINLOCK(&dev->tsk_lock);
if (dev->locked_task_call != NULL) {
dev->locked_task_call(dev);
==== //depot/projects/mpsafetty/sys/kern/tty.c#36 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.285 2008/08/27 19:37:21 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.286 2008/08/30 09:18:27 ed Exp $");
#include "opt_compat.h"
==== //depot/projects/mpsafetty/sys/kern/tty_inq.c#8 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/tty_inq.c,v 1.1 2008/08/20 08:31:58 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/tty_inq.c,v 1.2 2008/08/30 09:18:27 ed Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -108,9 +108,6 @@
tib = uma_zalloc(ttyinq_zone, M_WAITOK);
tty_lock(tp);
- if (tty_gone(tp))
- return;
-
TAILQ_INSERT_TAIL(&ti->ti_list, tib, tib_list);
ti->ti_nblocks++;
}
==== //depot/projects/mpsafetty/sys/kern/tty_outq.c#10 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/tty_outq.c,v 1.2 2008/08/23 13:32:21 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/tty_outq.c,v 1.3 2008/08/30 09:18:27 ed Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -97,9 +97,6 @@
tob = uma_zalloc(ttyoutq_zone, M_WAITOK);
tty_lock(tp);
- if (tty_gone(tp))
- return;
-
STAILQ_INSERT_TAIL(&to->to_list, tob, tob_list);
to->to_nblocks++;
}
==== //depot/projects/mpsafetty/sys/sys/ttyqueue.h#9 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/sys/ttyqueue.h,v 1.1 2008/08/20 08:31:58 ed Exp $
+ * $FreeBSD: src/sys/sys/ttyqueue.h,v 1.2 2008/08/30 09:18:27 ed Exp $
*/
#ifndef _SYS_TTYQUEUE_H_
==== //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/Makefile#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/tools/regression/bpf/bpf_filter/Makefile,v 1.10 2008/08/29 20:20:30 jkim Exp $
+# $FreeBSD: src/tools/regression/bpf/bpf_filter/Makefile,v 1.11 2008/08/29 20:58:01 jkim Exp $
TEST_CASES?= test0001 test0002 test0003 test0004 \
test0005 test0006 test0007 test0008 \
@@ -20,7 +20,7 @@
test0069 test0070 test0071 test0072 \
test0073 test0074 test0075 test0076 \
test0077 test0078 test0079 test0080 \
- test0081 test0082
+ test0081 test0082 test0083
SYSDIR?= ${.CURDIR}/../../../../sys
More information about the p4-projects
mailing list