WorkStruct: Merge the pending bit into the wq_data pointer

Reclaim a word from the size of the work_struct by folding the pending bit and
the wq_data pointer together.  This shouldn't cause misalignment problems as
all pointers should be at least 4-byte aligned.

Signed-Off-By: David Howells <dhowells@redhat.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 5a14fac13b12..aa1eb4466f9d 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -1868,7 +1868,7 @@ static void show_floppy(void)
         printk("fdc_busy=%lu\n", fdc_busy);
         if (do_floppy)
                 printk("do_floppy=%p\n", do_floppy);
-        if (floppy_work.pending)
+        if (work_pending(&floppy_work))
                 printk("floppy_work.func=%p\n", floppy_work.func);
         if (timer_pending(&fd_timer))
                 printk("fd_timer.function=%p\n", fd_timer.function);
@@ -4498,7 +4498,7 @@ static void floppy_release_irq_and_dma(void)
                 printk("floppy timer still active:%s\n", timeout_message);
         if (timer_pending(&fd_timer))
                 printk("auxiliary floppy timer still active\n");
-        if (floppy_work.pending)
+        if (work_pending(&floppy_work))
                 printk("work still pending\n");
 #endif
         old_fdc = fdc;