datapath: Make 'struct work_struct' consistent with kernel definition.
authorPravin B Shelar <pshelar@nicira.com>
Wed, 20 Jun 2012 00:22:54 +0000 (17:22 -0700)
committerPravin B Shelar <pshelar@nicira.com>
Wed, 20 Jun 2012 00:22:54 +0000 (17:22 -0700)
From kernel 3.4 netdevice structure has delayed_work in
net_device->pm_qos_req. delayed_work needs work_struct definition.
OVS has its own workq implementation which redefines work_struct.
So we need to make it consistent with work_struct defined
in kernel workqueue.h to have correct net_device definition.

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
datapath/linux/compat/include/linux/workqueue.h

index 79158f965b699f4e1538598fa6caae9d90e78eb1..cb488638882ea41a6d60603b2f710e57d237ac3c 100644 (file)
@@ -25,6 +25,9 @@ struct work_struct {
        atomic_long_t data;
        struct list_head entry;
        work_func_t func;
+#ifdef CONFIG_LOCKDEP
+       struct lockdep_map lockdep_map;
+#endif
 };
 
 #define WORK_DATA_INIT()        ATOMIC_LONG_INIT(0)