---

yaml --- r: 227831 b: refs/heads/master c: e7d2825 h: refs/heads/master i: 227829: aa795a4 227827: e80be98 227823: 930d4cb v: v3
git-mirror · Dec 28, 2010 · aa92c40 · aa92c40
1 parent 3336b96
commit aa92c40
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 	}