git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[pandora-kernel.git]
/
arch
/
ia64
/
kernel
/
time.c
diff --git
a/arch/ia64/kernel/time.c
b/arch/ia64/kernel/time.c
index
ed6f22e
..
9702fa9
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;
}