diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2006-03-30 00:11:53 +0100 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2006-03-30 00:11:53 +0100 |
| commit | 919a239a3c8f70cdb6963f76787588bd7a2a17a7 (patch) | |
| tree | 0cb67980b5ffbbbf7fe2484c2f8b7839391acfae | |
| parent | 5ed66abe17f3f16ff1323695daea15785c2701d4 (diff) | |
| download | xen-919a239a3c8f70cdb6963f76787588bd7a2a17a7.tar.gz xen-919a239a3c8f70cdb6963f76787588bd7a2a17a7.tar.bz2 xen-919a239a3c8f70cdb6963f76787588bd7a2a17a7.zip | |
Same panic() behaviour as native Linux when running as domain 0.
That is, no reboot: just sit there and flash the keyboard LEDs.
Signed-off-by: Keir Fraser <keir@xensource.com>
| -rw-r--r-- | linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c index 6e3a87ae5b..8a83da25e7 100644 --- a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c +++ b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c @@ -1633,9 +1633,9 @@ void __init setup_arch(char **cmdline_p) physdev_op_t op; unsigned long max_low_pfn; - /* Force a quick death if the kernel panics. */ + /* Force a quick death if the kernel panics (not domain 0). */ extern int panic_timeout; - if (panic_timeout == 0) + if (!panic_timeout && !(xen_start_info->flags & SIF_INITDOMAIN)) panic_timeout = 1; /* Register a call for panic conditions. */ |