Index: vanilla-2.6.17-rc3-mm1/arch/i386/kernel/alternative.c =================================================================== --- vanilla-2.6.17-rc3-mm1.orig/arch/i386/kernel/alternative.c 2006-05-10 12:25:39.000000000 +0200 +++ vanilla-2.6.17-rc3-mm1/arch/i386/kernel/alternative.c 2006-05-10 15:00:10.000000000 +0200 @@ -349,6 +349,9 @@ void __init alternative_instructions(voi smp_alt_once = 1; #endif + if (0 == (__smp_alt_end - __smp_alt_begin)) + return; /* no tables, nothing to patch (UP kernel) */ + if (smp_alt_once) { if (1 == num_possible_cpus()) { printk(KERN_INFO "SMP alternatives: switching to UP code\n");