From 9e994da55412f4ca91e74b0aab97183a9cf1dfaf Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 1 Feb 2006 05:56:41 -0500
Subject: [PATCH] --- yaml --- r: 20039 b: refs/heads/master c:
 53f087febfd12e74ba9f1082e71e9a45adc039ad h: refs/heads/master i:   20037:
 89a4779a335cc6b58ecfe40f80ae8e69273d8f52   20035:
 31932f066a1ecde08ccb855d67ff572dabed9e53   20031:
 d3caf043652d34719e42bbfea9ba4011548a2ecf v: v3

---
 [refs]               | 2 +-
 trunk/kernel/timer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f28f3bac459b..7fd7c81552fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76edc6051e02186fe664ab880447e2d1f96fd884
+refs/heads/master: 53f087febfd12e74ba9f1082e71e9a45adc039ad
diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c
index 4f1cb0ab5251..b9dad3994676 100644
--- a/trunk/kernel/timer.c
+++ b/trunk/kernel/timer.c
@@ -495,7 +495,7 @@ unsigned long next_timer_interrupt(void)
 	base = &__get_cpu_var(tvec_bases);
 	spin_lock(&base->t_base.lock);
 	expires = base->timer_jiffies + (LONG_MAX >> 1);
-	list = 0;
+	list = NULL;
 
 	/* Look for timer events in tv1. */
 	j = base->timer_jiffies & TVR_MASK;