From d5825e1d025a55cc81e5ce19e9375a84458f1dc6 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Tue, 25 Aug 2009 14:35:41 -0700
Subject: [PATCH] --- yaml --- r: 163079 b: refs/heads/master c:
 90cba64a5f672a239f43ec5cb9a11b806887331e h: refs/heads/master i:   163077:
 959106056f7ad48598623bf857d06c7d8b2d9282   163075:
 4e1e8cb754ff11489a1fb7c995cee4206183bb4e   163071:
 16f497a87ddfb74802858f8d1e55016a2f96c062 v: v3

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

diff --git a/[refs] b/[refs]
index 4ff1a2523a90..1d684b911a7a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36d47481b3824b661b464077db95d447984df799
+refs/heads/master: 90cba64a5f672a239f43ec5cb9a11b806887331e
diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c
index 33fc9d175f40..8e92be654dad 100644
--- a/trunk/kernel/timer.c
+++ b/trunk/kernel/timer.c
@@ -1023,8 +1023,8 @@ static inline void __run_timers(struct tvec_base *base)
 #ifdef CONFIG_NO_HZ
 /*
  * Find out when the next timer event is due to happen. This
- * is used on S/390 to stop all activity when a cpus is idle.
- * This functions needs to be called disabled.
+ * is used on S/390 to stop all activity when a CPU is idle.
+ * This function needs to be called with interrupts disabled.
  */
 static unsigned long __next_timer_interrupt(struct tvec_base *base)
 {