You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
33 lines
1.1 KiB
33 lines
1.1 KiB
From: jbeulich@novell.com
|
|
Subject: Don't automatically reboot Dom0 on panic (match native)
|
|
Patch-mainline: obsolete
|
|
|
|
$subject says it all.
|
|
|
|
--- head-2011-01-03.orig/arch/x86/kernel/setup-xen.c 2011-01-03 13:29:09.000000000 +0100
|
|
+++ head-2011-01-03/arch/x86/kernel/setup-xen.c 2011-01-03 14:07:52.000000000 +0100
|
|
@@ -784,15 +784,17 @@ void __init setup_arch(char **cmdline_p)
|
|
unsigned long p2m_pages;
|
|
struct physdev_set_iopl set_iopl;
|
|
|
|
+ if (!is_initial_xendomain()) {
|
|
#ifdef CONFIG_X86_32
|
|
- /* Force a quick death if the kernel panics (not domain 0). */
|
|
- extern int panic_timeout;
|
|
- if (!panic_timeout && !is_initial_xendomain())
|
|
- panic_timeout = 1;
|
|
+ /* Force a quick death if the kernel panics (not domain 0). */
|
|
+ extern int panic_timeout;
|
|
+ if (!panic_timeout)
|
|
+ panic_timeout = 1;
|
|
#endif
|
|
|
|
- /* Register a call for panic conditions. */
|
|
- atomic_notifier_chain_register(&panic_notifier_list, &xen_panic_block);
|
|
+ /* Register a call for panic conditions. */
|
|
+ atomic_notifier_chain_register(&panic_notifier_list, &xen_panic_block);
|
|
+ }
|
|
|
|
set_iopl.iopl = 1;
|
|
WARN_ON(HYPERVISOR_physdev_op(PHYSDEVOP_set_iopl, &set_iopl));
|