From: Joe Perches <joe@perches.com>
Date: Fri, 10 Dec 2010 07:16:55 +0000 (-0800)
Subject: [IA64] Remove unlikely from cpu_is_offline
X-Git-Tag: v2.6.38-rc1~426^2^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7d282535c94cddc208c03b7cd0815f70d676a0e;p=thirdparty%2Flinux.git

[IA64] Remove unlikely from cpu_is_offline

cpu_is_offline already uses unlikely internally.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
---

diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index ed6f22eb5b12a..9702fa92489ed 100644
--- a/arch/ia64/kernel/time.c
+++ b/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;
 	}