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@xxxxxxxxxxx>
Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
---
backport/backport-include/linux/wait.h | 2 +-
backport/compat/backport-3.19.c | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/backport/backport-include/linux/wait.h b/backport/backport-include/linux/wait.h
index 86ad2b0..4b02f52 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 0b59bef..8a241b7 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];
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe backports" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
