]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blob - src/patches/60058_xen-x86-panic-no-reboot.patch1
Imported xen patches.
[people/teissler/ipfire-2.x.git] / src / patches / 60058_xen-x86-panic-no-reboot.patch1
1 From: jbeulich@novell.com
2 Subject: Don't automatically reboot Dom0 on panic (match native)
3 Patch-mainline: obsolete
4
5 $subject says it all.
6
7 Index: head-2008-11-17/arch/x86/kernel/setup-xen.c
8 ===================================================================
9 --- head-2008-11-17.orig/arch/x86/kernel/setup-xen.c 2008-11-17 13:57:02.000000000 +0100
10 +++ head-2008-11-17/arch/x86/kernel/setup-xen.c 2008-11-17 13:58:02.000000000 +0100
11 @@ -701,15 +701,16 @@ void __init setup_arch(char **cmdline_p)
12 unsigned long p2m_pages;
13 struct physdev_set_iopl set_iopl;
14
15 + if (!is_initial_xendomain()) {
16 #ifdef CONFIG_X86_32
17 - /* Force a quick death if the kernel panics (not domain 0). */
18 - extern int panic_timeout;
19 - if (!panic_timeout && !is_initial_xendomain())
20 - panic_timeout = 1;
21 + /* Force a quick death if the kernel panics (not domain 0). */
22 + extern int panic_timeout;
23 + if (!panic_timeout)
24 + panic_timeout = 1;
25 #endif
26 -
27 - /* Register a call for panic conditions. */
28 - atomic_notifier_chain_register(&panic_notifier_list, &xen_panic_block);
29 + /* Register a call for panic conditions. */
30 + atomic_notifier_chain_register(&panic_notifier_list, &xen_panic_block);
31 + }
32
33 WARN_ON(HYPERVISOR_vm_assist(VMASST_CMD_enable,
34 VMASST_TYPE_writable_pagetables));