From aa92c406df6ec0adf978deb12aaf33d2d81e38f5 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Thu, 9 Dec 2010 23:16:55 -0800
Subject: [PATCH] --- yaml --- r: 227831 b: refs/heads/master c:
 e7d282535c94cddc208c03b7cd0815f70d676a0e h: refs/heads/master i:   227829:
 aa795a461062abd5fe16592d42d375ea9f2309ea   227827:
 e80be98f012c40861764ec09141d54eecdc8ec88   227823:
 930d4cbe41095be7edb65098d85e4b474a29118e v: v3

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

diff --git a/[refs] b/[refs]
index 96d9e5501e6a..79e3f580a546 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 409e590572d980c314e989e94176bcb060130fae
+refs/heads/master: e7d282535c94cddc208c03b7cd0815f70d676a0e
diff --git a/trunk/arch/ia64/kernel/time.c b/trunk/arch/ia64/kernel/time.c
index ed6f22eb5b12..9702fa92489e 100644
--- a/trunk/arch/ia64/kernel/time.c
+++ b/trunk/arch/ia64/kernel/time.c
@@ -168,7 +168,7 @@ timer_interrupt (int irq, void *dev_id)
 {
 	unsigned long new_itm;
 
-	if (unlikely(cpu_is_offline(smp_processor_id()))) {
+	if (cpu_is_offline(smp_processor_id())) {
 		return IRQ_HANDLED;
 	}