[Resent to get past vgers filters]
Hi Avi,
Today's linux-next merge of the kvm tree got a conflict in
arch/x86/kernel/reboot.c between commit
14d7ca5c575853664d8fe4f225a77b8df1b7de7d ("x86: attempt reboot via port
CF9 if we have standard PCI ports") from the x86 tree and commit
87238e8d2a086678c246825bc1a9dd148bba77cb ("x86: disable VMX on all CPUs
on reboot") from the kvm tree.
Just a context change. I fixed it up (see below) and can carry the fix
as needed.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc arch/x86/kernel/reboot.c
index 0acde8f,a8b9304..0000000
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@@ -39,10 -40,13 +40,16 @@@ int reboot_force
static int reboot_cpu = -1;
#endif
+ /* This is set if we need to go through the 'emergency' path.
+ * When machine_emergency_restart() is called, we may be on
+ * an inconsistent state and won't be able to do a clean cleanup
+ */
+ static int reboot_emergency;
+
-/* reboot=b[ios] | s[mp] | t[riple] | k[bd] | e[fi] [, [w]arm | [c]old]
+/* This is set by the PCI code if either type 1 or type 2 PCI is detected */
+bool port_cf9_safe = false;
+
+/* reboot=b[ios] | s[mp] | t[riple] | k[bd] | e[fi] [, [w]arm | [c]old] | p[ci]
warm Don't set the cold reboot flag
cold Set the cold reboot flag
bios Reboot by jumping through the BIOS (only for X86_32)
--
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
