projects / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 2cb7cef9 BS |
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 | --- sle11-2009-07-31.orig/arch/x86/kernel/setup-xen.c 2009-07-31 15:13:24.000000000 +0200 | |
| 8 | +++ sle11-2009-07-31/arch/x86/kernel/setup-xen.c 2009-07-31 15:14:20.000000000 +0200 | |
| 9 | @@ -699,15 +699,16 @@ void __init setup_arch(char **cmdline_p) | |
| 10 | unsigned long p2m_pages; | |
| 11 | struct physdev_set_iopl set_iopl; | |
| 12 | ||
| 13 | + if (!is_initial_xendomain()) { | |
| 14 | #ifdef CONFIG_X86_32 | |
| 15 | - /* Force a quick death if the kernel panics (not domain 0). */ | |
| 16 | - extern int panic_timeout; | |
| 17 | - if (!panic_timeout && !is_initial_xendomain()) | |
| 18 | - panic_timeout = 1; | |
| 19 | + /* Force a quick death if the kernel panics (not domain 0). */ | |
| 20 | + extern int panic_timeout; | |
| 21 | + if (!panic_timeout) | |
| 22 | + panic_timeout = 1; | |
| 23 | #endif | |
| 24 | - | |
| 25 | - /* Register a call for panic conditions. */ | |
| 26 | - atomic_notifier_chain_register(&panic_notifier_list, &xen_panic_block); | |
| 27 | + /* Register a call for panic conditions. */ | |
| 28 | + atomic_notifier_chain_register(&panic_notifier_list, &xen_panic_block); | |
| 29 | + } | |
| 30 | ||
| 31 | WARN_ON(HYPERVISOR_vm_assist(VMASST_CMD_enable, | |
| 32 | VMASST_TYPE_writable_pagetables)); |