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 'stable/generic' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
alternative.c
diff --git
a/arch/x86/kernel/alternative.c
b/arch/x86/kernel/alternative.c
index
553d0b0
..
1236085
100644
(file)
--- a/
arch/x86/kernel/alternative.c
+++ b/
arch/x86/kernel/alternative.c
@@
-353,6
+353,7
@@
void __init_or_module alternatives_smp_module_del(struct module *mod)
mutex_unlock(&smp_alt);
}
mutex_unlock(&smp_alt);
}
+bool skip_smp_alternatives;
void alternatives_smp_switch(int smp)
{
struct smp_alt_module *mod;
void alternatives_smp_switch(int smp)
{
struct smp_alt_module *mod;
@@
-368,7
+369,7
@@
void alternatives_smp_switch(int smp)
printk("lockdep: fixing up alternatives.\n");
#endif
printk("lockdep: fixing up alternatives.\n");
#endif
- if (noreplace_smp || smp_alt_once)
+ if (noreplace_smp || smp_alt_once
|| skip_smp_alternatives
)
return;
BUG_ON(!smp && (num_online_cpus() > 1));
return;
BUG_ON(!smp && (num_online_cpus() > 1));