Merge git://git.infradead.org/users/dhowells/workq-2.6

* git://git.infradead.org/users/dhowells/workq-2.6:
  Actually update the fixed up compile failures.
  WorkQueue: Fix up arch-specific work items where possible
  WorkStruct: make allyesconfig
  WorkStruct: Pass the work_struct pointer instead of context data
  WorkStruct: Merge the pending bit into the wq_data pointer
  WorkStruct: Typedef the work function prototype
  WorkStruct: Separate delayable and non-delayable events.

1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index 2284e2ce1692..d6f4f185bf37 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -166,7 +166,7 @@ struct veth_msg {
 
 struct veth_lpar_connection {
         HvLpIndex remote_lp;
-        struct work_struct statemachine_wq;
+        struct delayed_work statemachine_wq;
         struct veth_msg *msgs;
         int num_events;
         struct veth_cap_data local_caps;
@@ -456,7 +456,7 @@ static struct kobj_type veth_port_ktype = {
 
 static inline void veth_kick_statemachine(struct veth_lpar_connection *cnx)
 {
-        schedule_work(&cnx->statemachine_wq);
+        schedule_delayed_work(&cnx->statemachine_wq, 0);
 }
 
 static void veth_take_cap(struct veth_lpar_connection *cnx,
@@ -638,9 +638,11 @@ static int veth_process_caps(struct veth_lpar_connection *cnx)
 }
 
 /* FIXME: The gotos here are a bit dubious */
-static void veth_statemachine(void *p)
+static void veth_statemachine(struct work_struct *work)
 {
-        struct veth_lpar_connection *cnx = (struct veth_lpar_connection *)p;
+        struct veth_lpar_connection *cnx =
+                container_of(work, struct veth_lpar_connection,
+                             statemachine_wq.work);
         int rlp = cnx->remote_lp;
         int rc;
 
@@ -827,7 +829,7 @@ static int veth_init_connection(u8 rlp)
 
         cnx->remote_lp = rlp;
         spin_lock_init(&cnx->lock);
-        INIT_WORK(&cnx->statemachine_wq, veth_statemachine, cnx);
+        INIT_DELAYED_WORK(&cnx->statemachine_wq, veth_statemachine);
 
         init_timer(&cnx->ack_timer);
         cnx->ack_timer.function = veth_timed_ack;