Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into merge

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index d3694498f3af..819e59f6f7c7 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -482,7 +482,7 @@ static void vio_cmo_balance(struct work_struct *work)
         cmo->excess.size = cmo->entitled - cmo->reserve.size;
         cmo->excess.free = cmo->excess.size - need;
 
-        cancel_delayed_work(container_of(work, struct delayed_work, work));
+        cancel_delayed_work(to_delayed_work(work));
         spin_unlock_irqrestore(&vio_cmo.lock, flags);
 }