X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fi386%2Fkernel%2Ftraps.c;h=2c4351d73f223b94e2bdbb4ff3742d843706fd89;hb=8d362a01c24ecaf4a92ff4d951b686619b563126;hp=adeaef6051920a94185c51310137959cc526550c;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git

diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index adeaef605..2c4351d73 100644
--- 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");