072937888e
3.18.12 backported 61ada528dea028331e99e8ceaed87c683ad25de2 ("sched/wait:
Provide infrastructure to deal with nested blocking") from 3.19, causing
the following error on load:
[ 13.588000] compat: exports duplicate symbol woken_wake_function (owned by kernel)
Fix this by guarding it with a check for 3.18.11 or earlier instead of
3.19.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 45710
29 lines
865 B
Diff
29 lines
865 B
Diff
--- a/backport-include/linux/wait.h
|
|
+++ b/backport-include/linux/wait.h
|
|
@@ -23,7 +23,7 @@ backport_wait_on_bit_io(void *word, int
|
|
|
|
#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)
|
|
--- a/compat/backport-3.19.c
|
|
+++ b/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 *wa
|
|
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];
|