diff options
| author | kaf24@freefall.cl.cam.ac.uk <kaf24@freefall.cl.cam.ac.uk> | 2004-11-16 11:56:44 +0000 |
|---|---|---|
| committer | kaf24@freefall.cl.cam.ac.uk <kaf24@freefall.cl.cam.ac.uk> | 2004-11-16 11:56:44 +0000 |
| commit | 9a152b3fe0246f47765c4897cbfc22d7581cb0e4 (patch) | |
| tree | eef1f634dcee30b6e5caea5f693042a7930429cf | |
| parent | 9f9af87611c442c4a587a02f8dbe4b4eee631204 (diff) | |
| download | xen-9a152b3fe0246f47765c4897cbfc22d7581cb0e4.tar.gz xen-9a152b3fe0246f47765c4897cbfc22d7581cb0e4.tar.bz2 xen-9a152b3fe0246f47765c4897cbfc22d7581cb0e4.zip | |
bitkeeper revision 1.1159.174.4 (4199eafc-o43U-MPvkSymdEahhBVLg)
Fix panic() so that it flushes console messages and then kills the VM
cleanly (instead of spinning).
| -rw-r--r-- | linux-2.6.9-xen-sparse/arch/xen/i386/kernel/setup.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/setup.c b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/setup.c index e10a0aaf97..c9574a4311 100644 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/setup.c +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/setup.c @@ -1319,6 +1319,11 @@ void __init setup_arch(char **cmdline_p) unsigned long max_low_pfn; + /* Force a quick death if the kernel panics. */ + extern int panic_timeout; + if ( panic_timeout == 0 ) + panic_timeout = 1; + HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_4gb_segments); |