Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / ia64 / kernel / time.c

diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index ed6f22eb5b12adcd647abb384a44ff55e4e14604..9702fa92489edb3f7aa04d21ad1a801afc8a1807 100644 (file)
--- 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;
        }