Hi Rusty,
Today's linux-next merge of the boot-params tree got a conflict in
arch/x86/kernel/cpu/common.c between commit
88b094fb8d4fe43b7025ea8d487059e8813e02cd ("x86: Hypervisor detection and
get tsc_freq from hypervisor") from Linus' tree and commit
568991994fb3aad34504e9bdac458a2bfd388c7f ("x86: clean up
setup_clear/force_cpu_cap handling") from the boot-params tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix for now.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc arch/x86/kernel/cpu/common.c
index 42e0853,63531c9..0000000
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@@ -704,7 -716,9 +717,11 @@@ static void __cpuinit identify_cpu(stru
detect_ht(c);
#endif
+ init_hypervisor(c);
++
+ /* Command-line override before we AND into smp all cpus cap. */
+ override_capabilities(c->x86_capability);
+
/*
* On SMP, boot_cpu_data holds the common feature set between
* all CPUs; so make sure that we indicate which features are
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
