Module Name: src
Committed By: riastradh
Date: Wed Jul 24 03:59:06 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/include/linux [riastradh-drm2]: workqueue.h
Log Message:
Use a non-NULL value for bogus <linux/workqueue.h> stubs.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 \
src/sys/external/bsd/drm2/include/linux/workqueue.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/external/bsd/drm2/include/linux/workqueue.h
diff -u src/sys/external/bsd/drm2/include/linux/workqueue.h:1.1.2.6 src/sys/external/bsd/drm2/include/linux/workqueue.h:1.1.2.7
--- src/sys/external/bsd/drm2/include/linux/workqueue.h:1.1.2.6 Wed Jul 24 03:37:04 2013
+++ src/sys/external/bsd/drm2/include/linux/workqueue.h Wed Jul 24 03:59:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: workqueue.h,v 1.1.2.6 2013/07/24 03:37:04 riastradh Exp $ */
+/* $NetBSD: workqueue.h,v 1.1.2.7 2013/07/24 03:59:06 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -107,12 +107,13 @@ struct workqueue_struct;
static inline struct workqueue_struct *
alloc_ordered_workqueue(const char *name __unused, int flags __unused)
{
- return NULL;
+ return (void *)(uintptr_t)0xdeadbeef;
}
static inline void
destroy_workqueue(struct workqueue_struct *wq __unused)
{
+ KASSERT(wq == (void *)(uintptr_t)0xdeadbeef);
}
#define flush_workqueue(wq) WARN(true, "Can't flush workqueues!");
@@ -121,6 +122,7 @@ destroy_workqueue(struct workqueue_struc
static inline void
queue_work(struct workqueue_struct *wq __unused, struct work_struct *work)
{
+ KASSERT(wq == (void *)(uintptr_t)0xdeadbeef);
schedule_work(work);
}
@@ -129,6 +131,7 @@ queue_delayed_work(struct workqueue_stru
struct delayed_work *dw,
unsigned int ticks)
{
+ KASSERT(wq == (void *)(uintptr_t)0xdeadbeef);
schedule_delayed_work(dw, ticks);
}
