From: Charles Manning <cdhmanning@gmail.com>
Date: Wed, 18 Aug 2010 00:44:23 +0000 (+1200)
Subject: yaffs Handle init_timer properly for older kernels
X-Git-Tag: pre-name-change~17^2~6
X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=dadd2bbe7500ebd8c99868992483aaf7e59d55be;hp=af1e66bdb6be00b49d8500d01813cb207b930282

yaffs Handle init_timer properly for older kernels

Use init_timer for older kernels and init_timer_on_stack for newer
kernels.

Signed-off-by: Charles Manning <cdhmanning@gmail.com>
---

diff --git a/yaffs_fs.c b/yaffs_fs.c
index c3f11f4..7b55f18 100644
--- a/yaffs_fs.c
+++ b/yaffs_fs.c
@@ -116,6 +116,12 @@
 #define YPROC_ROOT  NULL
 #endif
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
+#define Y_INIT_TIMER(a)	init_timer(a)
+#else
+#define Y_INIT_TIMER(a)	init_timer_on_stack(a)
+#endif
+
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
 #define WRITE_SIZE_STR "writesize"
 #define WRITE_SIZE(mtd) ((mtd)->writesize)
@@ -2343,7 +2349,7 @@ static int yaffs_BackgroundThread(void *data)
 		if(time_before(expires,now))
 			expires = now + HZ;
 
-		init_timer_on_stack(&timer);
+		Y_INIT_TIMER(&timer);
 		timer.expires = expires+1;
 		timer.data = (unsigned long) current;
 		timer.function = yaffs_background_waker;