X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=mm%2Fpage-writeback.c;h=0166ea15c9ee8d61f08ddc6e100de841e59205c7;hb=238f58d898df941aa9d1cb390fb27ff4febe8965;hp=a6329fa8f862da5aea02238c687e93843ba2a80e;hpb=2f058256cb64e346f4fb4499ff4e0f1c2791a4b4;p=linux-2.6

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index a6329fa8f8..0166ea15c9 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -368,10 +368,8 @@ int wakeup_pdflush(long nr_pages)
 static void wb_timer_fn(unsigned long unused);
 static void laptop_timer_fn(unsigned long unused);
 
-static struct timer_list wb_timer =
-			TIMER_INITIALIZER(wb_timer_fn, 0, 0);
-static struct timer_list laptop_mode_wb_timer =
-			TIMER_INITIALIZER(laptop_timer_fn, 0, 0);
+static DEFINE_TIMER(wb_timer, wb_timer_fn, 0, 0);
+static DEFINE_TIMER(laptop_mode_wb_timer, laptop_timer_fn, 0, 0);
 
 /*
  * Periodic writeback of "old" data.