This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / i386 / kernel / traps.c

diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index adeaef6..2c4351d 100644 (file)
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -53,7 +53,6 @@
 
 #include <linux/irq.h>
 #include <linux/module.h>
-#include <linux/vserver/debug.h>
 
 #include "mach_traps.h"
 
@@ -307,7 +306,6 @@ void die(const char * str, struct pt_regs * regs, long err)
        };
        static int die_counter;
 
-       vxh_throw_oops();
        if (die.lock_owner != smp_processor_id()) {
                console_verbose();
                spin_lock_irq(&die.lock);
@@ -343,7 +341,6 @@ void die(const char * str, struct pt_regs * regs, long err)
        bust_spinlocks(0);
        die.lock_owner = -1;
        spin_unlock_irq(&die.lock);
-       vxh_dump_history();
        if (in_interrupt())
                panic("Fatal exception in interrupt");