diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-10-05 20:22:44 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-10-23 19:24:40 +0200 |
| commit | a4dbb9f27b500262ce16cdb1fd8a6671eec8f030 (patch) | |
| tree | 00b6914d7814e744e409d2941ff0e793aa8207fc | |
| parent | 89bf01f6434923d86bc3ad98c8db064757828922 (diff) | |
backports: remove compat_wake_up_locked()
This was only needed for some of the DRM drivers, remove it.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | backport/backport-include/linux/wait.h | 14 | ||||
| -rw-r--r-- | backport/compat/compat-3.4.c | 28 |
2 files changed, 0 insertions, 42 deletions
diff --git a/backport/backport-include/linux/wait.h b/backport/backport-include/linux/wait.h index 7ada8bcd..664f24b7 100644 --- a/backport/backport-include/linux/wait.h +++ b/backport/backport-include/linux/wait.h @@ -2,20 +2,6 @@ #define __BACKPORT_LINUX_WAIT_H #include_next <linux/wait.h> -/* This backports: - * - * commit 63b2001169e75cd71e917ec953fdab572e3f944a - * Author: Thomas Gleixner <tglx@linutronix.de> - * Date: Thu Dec 1 00:04:00 2011 +0100 - * - * sched/wait: Add __wake_up_all_locked() API - */ - -#ifndef wake_up_all_locked -extern void compat_wake_up_locked(wait_queue_head_t *q, unsigned int mode, int nr); -#define wake_up_all_locked(x) compat_wake_up_locked((x), TASK_NORMAL, 0) -#endif - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) #define wake_up_interruptible_poll(x, m) \ __wake_up(x, TASK_INTERRUPTIBLE, 1, (void *) (m)) diff --git a/backport/compat/compat-3.4.c b/backport/compat/compat-3.4.c index f6b826d3..43f0c512 100644 --- a/backport/compat/compat-3.4.c +++ b/backport/compat/compat-3.4.c @@ -263,34 +263,6 @@ EXPORT_SYMBOL_GPL(devm_regmap_init_i2c); #endif /* defined(CONFIG_REGMAP) */ #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) */ -/* __wake_up_common was declared as part of the wait.h until - * 2.6.31 in which they made it private to the scheduler. Prefix it with - * compat to avoid double declaration issues. - */ -static void compat_wake_up_common(wait_queue_head_t *q, unsigned int mode, - int nr_exclusive, int wake_flags, void *key) -{ - wait_queue_t *curr, *next; - - list_for_each_entry_safe(curr, next, &q->task_list, task_list) { - unsigned flags = curr->flags; - - if (curr->func(curr, mode, wake_flags, key) && - (flags & WQ_FLAG_EXCLUSIVE) && !--nr_exclusive) - break; - } -} - -/* The last 'nr' parameter was added to the __wake_up_locked() function - * in 3.4 kernel. Define a new one prefixed with compat_ for the new API. - */ -void compat_wake_up_locked(wait_queue_head_t *q, unsigned int mode, int nr) -{ - compat_wake_up_common(q, mode, nr, 0, NULL); -} -EXPORT_SYMBOL_GPL(compat_wake_up_locked); - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) #include <linux/i2c.h> #include <linux/i2c-algo-bit.h> |