[PATCH] AT91RM9200 Ethernet: Add netpoll / netconsole support

[sfrench/cifs-2.6.git] / fs / file.c

diff --git a/fs/file.c b/fs/file.c
index 8e81775c5dc818bd3b9d66e3fd895524294f5c78..3787e82f54c19f55592a6f7e8dcb3abf8f392dfe 100644 (file)
--- a/fs/file.c
+++ b/fs/file.c
@@ -91,8 +91,10 @@ out:
        spin_unlock(&fddef->lock);
 }
 
-static void free_fdtable_work(struct fdtable_defer *f)
+static void free_fdtable_work(struct work_struct *work)
 {
+       struct fdtable_defer *f =
+               container_of(work, struct fdtable_defer, wq);
        struct fdtable *fdt;
 
        spin_lock_bh(&f->lock);
@@ -351,7 +353,7 @@ static void __devinit fdtable_defer_list_init(int cpu)
 {
        struct fdtable_defer *fddef = &per_cpu(fdtable_defer_list, cpu);
        spin_lock_init(&fddef->lock);
-       INIT_WORK(&fddef->wq, (void (*)(void *))free_fdtable_work, fddef);
+       INIT_WORK(&fddef->wq, free_fdtable_work);
        init_timer(&fddef->timer);
        fddef->timer.data = (unsigned long)fddef;
        fddef->timer.function = fdtable_timer;