diff -NurpP linux-2.6.22.6-vs2.3.0.24/arch/x86_64/kernel/traps.c linux-2.6.22.6-vs2.3.0.24.1/arch/x86_64/kernel/traps.c
--- linux-2.6.22.6-vs2.3.0.24/arch/x86_64/kernel/traps.c	2007-08-05 20:53:12 +0200
+++ linux-2.6.22.6-vs2.3.0.24.1/arch/x86_64/kernel/traps.c	2007-09-28 23:02:20 +0200
@@ -33,6 +33,8 @@
 #include <linux/uaccess.h>
 #include <linux/bug.h>
 #include <linux/kdebug.h>
+#include <linux/vs_context.h>
+#include <linux/vserver/history.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
@@ -519,6 +520,7 @@ void __kprobes __die(const char * str, s
 	printk("\n");
 	notify_die(DIE_OOPS, str, regs, err, current->thread.trap_no, SIGSEGV);
 	show_registers(regs);
+	vxh_dump_history();
 	/* Executive summary in case the oops scrolled away */
 	printk(KERN_ALERT "RIP ");
 	printk_address(regs->rip); 
@@ -531,6 +533,7 @@ void die(const char * str, struct pt_reg
 {
 	unsigned long flags = oops_begin();
 
+	vxh_throw_oops();
 	if (!user_mode(regs))
 		report_bug(regs->rip);