From: Pravin B Shelar Date: Wed, 20 Jun 2012 00:22:54 +0000 (-0700) Subject: datapath: Make 'struct work_struct' consistent with kernel definition. X-Git-Tag: sliver-openvswitch-1.8.90-0~48^2~348 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=699fec8cc02d2e2a367e64e89f5c64b902d3555a;p=sliver-openvswitch.git datapath: Make 'struct work_struct' consistent with kernel definition. 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 Acked-by: Jesse Gross --- diff --git a/datapath/linux/compat/include/linux/workqueue.h b/datapath/linux/compat/include/linux/workqueue.h index 79158f965..cb4886388 100644 --- a/datapath/linux/compat/include/linux/workqueue.h +++ b/datapath/linux/compat/include/linux/workqueue.h @@ -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)