diff options
Diffstat (limited to 'trunk/2.6.22/20056_xen-x86-panic-no-reboot.patch1')
| -rw-r--r-- | trunk/2.6.22/20056_xen-x86-panic-no-reboot.patch1 | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/trunk/2.6.22/20056_xen-x86-panic-no-reboot.patch1 b/trunk/2.6.22/20056_xen-x86-panic-no-reboot.patch1 new file mode 100644 index 0000000..ccc42e1 --- /dev/null +++ b/trunk/2.6.22/20056_xen-x86-panic-no-reboot.patch1 @@ -0,0 +1,58 @@ +From: jbeulich@novell.com +Subject: Don't automatically reboot Dom0 on panic (match native) +Patch-mainline: obsolete + +$subject says it all. + +--- + arch/i386/kernel/setup-xen.c | 10 ++++++---- + arch/x86_64/kernel/setup-xen.c | 9 +++++---- + 2 files changed, 11 insertions(+), 8 deletions(-) + +--- a/arch/i386/kernel/setup-xen.c 2007-08-27 14:01:27.000000000 -0400 ++++ b/arch/i386/kernel/setup-xen.c 2007-08-27 14:01:46.000000000 -0400 +@@ -568,11 +568,13 @@ void __init setup_arch(char **cmdline_p) + + /* Force a quick death if the kernel panics (not domain 0). */ + extern int panic_timeout; +- if (!panic_timeout && !is_initial_xendomain()) +- panic_timeout = 1; ++ if (!is_initial_xendomain()) { ++ if (!panic_timeout) ++ panic_timeout = 1; + +- /* 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); ++ } + + HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_4gb_segments); + HYPERVISOR_vm_assist(VMASST_CMD_enable, +--- a/arch/x86_64/kernel/setup-xen.c 2007-08-27 14:01:27.000000000 -0400 ++++ b/arch/x86_64/kernel/setup-xen.c 2007-08-27 14:01:52.000000000 -0400 +@@ -282,9 +282,6 @@ void __init setup_arch(char **cmdline_p) + + printk(KERN_INFO "Command line: %s\n", boot_command_line); + +- /* Register a call for panic conditions. */ +- atomic_notifier_chain_register(&panic_notifier_list, &xen_panic_block); +- + ROOT_DEV = MKDEV(RAMDISK_MAJOR,0); + screen_info = SCREEN_INFO; + +@@ -308,9 +305,13 @@ void __init setup_arch(char **cmdline_p) + } + xen_start_info->console.domU.mfn = 0; + xen_start_info->console.domU.evtchn = 0; +- } else ++ } else { + screen_info.orig_video_isVGA = 0; + ++ /* Register a call for panic conditions. */ ++ atomic_notifier_chain_register(&panic_notifier_list, &xen_panic_block); ++ } ++ + copy_edid(); + saved_video_mode = SAVED_VIDEO_MODE; + bootloader_type = LOADER_TYPE; |