projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-for-linus-migration' of git://git.kernel.org/pub/scm/linux/kerne...
[linux-2.6-block.git]
/
arch
/
x86
/
kernel
/
apic
/
x2apic_uv_x.c
diff --git
a/arch/x86/kernel/apic/x2apic_uv_x.c
b/arch/x86/kernel/apic/x2apic_uv_x.c
index ef0ae207a7c82cb64f7a0a7758a91dc22b0f8fee..096d19aea2f7180b40be33870a0225ac822f71d3 100644
(file)
--- a/
arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/
arch/x86/kernel/apic/x2apic_uv_x.c
@@
-463,7
+463,7
@@
static void uv_heartbeat(unsigned long ignored)
uv_set_scir_bits(bits);
/* enable next timer period */
- mod_timer(timer, jiffies + SCIR_CPU_HB_INTERVAL);
+ mod_timer
_pinned
(timer, jiffies + SCIR_CPU_HB_INTERVAL);
}
static void __cpuinit uv_heartbeat_enable(int cpu)