X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=fs%2Faio.c;h=b5253e77eb2f137ee5b1346f848514ad991801e1;hb=8b91ac09732895f928ed6107bda5318cf260520b;hp=99c2352906a021cf42e6673faf71a9519bea05d4;hpb=867a89e0b73af48838c7987e80899a1ff26dd6ff;p=linux-2.6-omap-h63xx.git

diff --git a/fs/aio.c b/fs/aio.c
index 99c2352906a..b5253e77eb2 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1078,9 +1078,7 @@ static void timeout_func(unsigned long data)
 
 static inline void init_timeout(struct aio_timeout *to)
 {
-	init_timer(&to->timer);
-	to->timer.data = (unsigned long)to;
-	to->timer.function = timeout_func;
+	setup_timer_on_stack(&to->timer, timeout_func, (unsigned long) to);
 	to->timed_out = 0;
 	to->p = current;
 }
@@ -1213,6 +1211,7 @@ retry:
 	if (timeout)
 		clear_timeout(&to);
 out:
+	destroy_timer_on_stack(&to.timer);
 	return i ? i : ret;
 }