don't print out SMP info on UP kernels.
On UP kernels, it's silly to print out info about SMP alternatives..
SMP alternatives: switching to UP code
Freeing SMP alternatives: 0k freed
Signed-off-by Dave Jones <[email protected]>
arch/i386/kernel/alternative.c renamed from arch/i386/kernel/alternative.c~ +6 -0
@@ -118,6 +118,7 @@ void apply_alternatives(struct alt_instr } } +#ifdef CONFIG_SMP static void alternatives_smp_save (struct alt_instr *start,struct alt_instr *end) {struct alt_instr *a;
@@ -282,6 +283,8 @@ void alternatives_smp_switch(int smp) }spin_unlock_irqrestore (&smp_alt, flags); } +#endif +void __init alternative_instructions (void ) {
@@ -290,6 +290,8 @@ void __init alternative_instructions(voi {apply_alternatives (__alt_instructions, __alt_instructions_end); +#ifdef CONFIG_SMP +/* switch to patch-once-at-boottime-only mode and free the * tables in case we know the number of CPUs will never ever * change */
@@ -318,4 +322,5 @@ void __init alternative_instructions(voi _text, _etext); alternatives_smp_switch(0); } +#endif }
arch/i386/kernel/module.c renamed from arch/i386/kernel/module.c~ +4 -0
@@ -125,6 +125,7 @@ int module_finalize(const Elf_Ehdr *hdr,void *aseg = (void *)alt->sh_addr;apply_alternatives (aseg, aseg + alt->sh_size); } +#ifdef CONFIG_SMP if (locks && text) {void *lseg = (void *)locks->sh_addr;void *tseg = (void *)text->sh_addr;
@@ -132,10 +133,13 @@ int module_finalize(const Elf_Ehdr *hdr, lseg, lseg + locks->sh_size, tseg, tseg + text->sh_size); } +#endif return 0 ; }void module_arch_cleanup (struct module *mod) { +#ifdef CONFIG_SMP alternatives_smp_module_del (mod); +#endif }
Signature · 1 line
http://www.codemonkey.org.uk