Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1036-2.6.25-xen-x86-panic-no-reboot.patch
Parent Directory | Revision Log
Revision 609 -
(show annotations)
(download)
Fri May 23 17:35:37 2008 UTC (16 years, 4 months ago) by niro
File size: 2216 byte(s)
Fri May 23 17:35:37 2008 UTC (16 years, 4 months ago) by niro
File size: 2216 byte(s)
-using opensuse xen patchset, updated kernel configs
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-04-02/arch/x86/kernel/setup_32-xen.c |
8 | =================================================================== |
9 | --- head-2008-04-02.orig/arch/x86/kernel/setup_32-xen.c 2008-04-02 15:13:11.000000000 +0200 |
10 | +++ head-2008-04-02/arch/x86/kernel/setup_32-xen.c 2008-04-02 15:18:59.000000000 +0200 |
11 | @@ -743,11 +743,13 @@ void __init setup_arch(char **cmdline_p) |
12 | |
13 | /* Force a quick death if the kernel panics (not domain 0). */ |
14 | extern int panic_timeout; |
15 | - if (!panic_timeout && !is_initial_xendomain()) |
16 | - panic_timeout = 1; |
17 | + if (!is_initial_xendomain()) { |
18 | + if (!panic_timeout) |
19 | + panic_timeout = 1; |
20 | |
21 | - /* Register a call for panic conditions. */ |
22 | - atomic_notifier_chain_register(&panic_notifier_list, &xen_panic_block); |
23 | + /* Register a call for panic conditions. */ |
24 | + atomic_notifier_chain_register(&panic_notifier_list, &xen_panic_block); |
25 | + } |
26 | |
27 | WARN_ON(HYPERVISOR_vm_assist(VMASST_CMD_enable, |
28 | VMASST_TYPE_4gb_segments)); |
29 | Index: head-2008-04-02/arch/x86/kernel/setup_64-xen.c |
30 | =================================================================== |
31 | --- head-2008-04-02.orig/arch/x86/kernel/setup_64-xen.c 2008-04-02 15:08:41.000000000 +0200 |
32 | +++ head-2008-04-02/arch/x86/kernel/setup_64-xen.c 2008-04-02 15:18:59.000000000 +0200 |
33 | @@ -323,9 +323,6 @@ void __init setup_arch(char **cmdline_p) |
34 | |
35 | printk(KERN_INFO "Command line: %s\n", boot_command_line); |
36 | |
37 | - /* Register a call for panic conditions. */ |
38 | - atomic_notifier_chain_register(&panic_notifier_list, &xen_panic_block); |
39 | - |
40 | WARN_ON(HYPERVISOR_vm_assist(VMASST_CMD_enable, |
41 | VMASST_TYPE_writable_pagetables)); |
42 | |
43 | @@ -343,9 +340,13 @@ void __init setup_arch(char **cmdline_p) |
44 | xen_start_info->console.dom0.info_size); |
45 | xen_start_info->console.domU.mfn = 0; |
46 | xen_start_info->console.domU.evtchn = 0; |
47 | - } else |
48 | + } else { |
49 | screen_info.orig_video_isVGA = 0; |
50 | |
51 | + /* Register a call for panic conditions. */ |
52 | + atomic_notifier_chain_register(&panic_notifier_list, &xen_panic_block); |
53 | + } |
54 | + |
55 | copy_edid(); |
56 | #else |
57 | printk(KERN_INFO "Command line: %s\n", boot_command_line); |