Hi Josh,
Today's linux-next merge of the tiny tree got a conflict in
arch/x86/kernel/cpu/common.c between commit ce4b1b16502b ("x86/smpboot:
Initialize secondary CPU only if master CPU will wait for it") from the
tip tree and commit e4a191d1e05b ("x86: Support compiling out userspace
I/O (iopl and ioperm)") from the tiny tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell [email protected] diff --cc arch/x86/kernel/cpu/common.c index 3d05d4699dbd,11e08cefdb6e..000000000000 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@@ -1294,10 -1281,7 +1294,9 @@@ void cpu_init(void struct task_struct *me; struct tss_struct *t; unsigned long v; - int cpu; + int cpu = stack_smp_processor_id(); - int i; + + wait_for_master_cpu(cpu); /* * Load microcode on this cpu if a valid microcode is available.
signature.asc
Description: PGP signature
