diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-05-25 15:40:07 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-06-30 23:06:06 +0200 |
| commit | deccf7466a4a33988994c799df2051fa0dfa7dcb (patch) | |
| tree | a0acdc0572c5fde8088407591c4a6538d709766d | |
| parent | f5fe5cde46eecd0c3954f11a4f5247d642dffde7 (diff) | |
header: do not backport wait functions on kernel >= 3.18.12
Upstream commit: ca40a44408541d20ed602a7bff232da606ca0400
This feature was backported to kernel 3.18.12 and we should not
activate it on these kernel versions any more.
Reported-by: Jonas Gorski <jogo@openwrt.org>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | backport/backport-include/linux/wait.h | 2 | ||||
| -rw-r--r-- | backport/compat/backport-3.19.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/backport/backport-include/linux/wait.h b/backport/backport-include/linux/wait.h index 86ad2b04..4b02f52d 100644 --- a/backport/backport-include/linux/wait.h +++ b/backport/backport-include/linux/wait.h @@ -23,7 +23,7 @@ backport_wait_on_bit_io(void *word, int bit, unsigned mode) #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,18,12) #define WQ_FLAG_WOKEN 0x02 #define wait_woken LINUX_BACKPORT(wait_woken) diff --git a/backport/compat/backport-3.19.c b/backport/compat/backport-3.19.c index 0b59bef6..8a241b7d 100644 --- a/backport/compat/backport-3.19.c +++ b/backport/compat/backport-3.19.c @@ -15,6 +15,7 @@ #include <linux/netdevice.h> #include <linux/debugfs.h> +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,18,12) static inline bool is_kthread_should_stop(void) { return (current->flags & PF_KTHREAD) && kthread_should_stop(); @@ -79,6 +80,7 @@ int woken_wake_function(wait_queue_t *wait, unsigned mode, int sync, void *key) return default_wake_function(wait, mode, sync, key); } EXPORT_SYMBOL(woken_wake_function); +#endif #ifdef __BACKPORT_NETDEV_RSS_KEY_FILL u8 netdev_rss_key[NETDEV_RSS_KEY_LEN]; |