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 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
apb_timer.c
diff --git
a/arch/x86/kernel/apb_timer.c
b/arch/x86/kernel/apb_timer.c
index
ff469e4
..
a353475
100644
(file)
--- a/
arch/x86/kernel/apb_timer.c
+++ b/
arch/x86/kernel/apb_timer.c
@@
-429,7
+429,7
@@
static int apbt_cpuhp_notify(struct notifier_block *n,
static __init int apbt_late_init(void)
{
- if (disable_apbt_percpu)
+ if (disable_apbt_percpu
|| !apb_timer_block_enabled
)
return 0;
/* This notifier should be called after workqueue is ready */
hotcpu_notifier(apbt_cpuhp_notify, -20);