Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2

[yaffs2.git] / yaffs_fs.c

diff --git a/yaffs_fs.c b/yaffs_fs.c
index 7c51041184350166bea88fbaa3628badd95103f8..ecf2bbe4d48bc458fff4396e663b8b1bc8a3e781 100644 (file)
--- a/yaffs_fs.c
+++ b/yaffs_fs.c
@@ -117,6 +117,12 @@
 #define YPROC_ROOT  NULL
 #endif
 
 #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)
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
 #define WRITE_SIZE_STR "writesize"
 #define WRITE_SIZE(mtd) ((mtd)->writesize)


@@ -2358,7 +2364,7 @@ static int yaffs_BackgroundThread(void *data)
                if(time_before(expires,now))
                        expires = now + HZ;
 
                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;
                timer.expires = expires+1;
                timer.data = (unsigned long) current;
                timer.function = yaffs_background_waker;