Files linux-2.6.8.1-vs1.9.2.20.7/include/linux/.vs_context.h.swp and linux-2.6.8.1-vs1.9.2.20.8/include/linux/.vs_context.h.swp differ
Files linux-2.6.8.1-vs1.9.2.20.7/include/linux/vserver/.context.h.swp and linux-2.6.8.1-vs1.9.2.20.8/include/linux/vserver/.context.h.swp differ
Files linux-2.6.8.1-vs1.9.2.20.7/kernel/vserver/.context.c.swp and linux-2.6.8.1-vs1.9.2.20.8/kernel/vserver/.context.c.swp differ
diff -NurpP --minimal linux-2.6.8.1-vs1.9.2.20.7/kernel/vserver/debug.c linux-2.6.8.1-vs1.9.2.20.8/kernel/vserver/debug.c
--- linux-2.6.8.1-vs1.9.2.20.7/kernel/vserver/debug.c	2004-08-24 07:39:51.000000000 +0200
+++ linux-2.6.8.1-vs1.9.2.20.8/kernel/vserver/debug.c	2004-08-24 09:30:38.000000000 +0200
@@ -31,6 +31,9 @@ struct _vx_history {
 };
 
 DEFINE_PER_CPU(struct _vx_history, vx_history_buffer);
+DEFINE_PER_CPU(struct _vx_hist_entry, vx_dummy_entry);
+
+unsigned int vxh_active = 1;
 
 static atomic_t sequence = ATOMIC_INIT(0);
 
@@ -38,13 +41,20 @@ static atomic_t sequence = ATOMIC_INIT(0
 struct _vx_hist_entry *vxh_advance(void *loc)
 {
 	unsigned int cpu = smp_processor_id();
-        struct _vx_history *hist = &per_cpu(vx_history_buffer, cpu);
-        unsigned int index = (hist->counter++ % VXH_SIZE);
-        struct _vx_hist_entry *entry = &hist->entry[index];
+	struct _vx_hist_entry *entry = &hist->entry[index];
 
-	atomic_inc(&sequence);
-	entry->seq = atomic_read(&sequence);
-        entry->loc = loc;
+	if (vxh_active) {
+	struct _vx_history *hist = &per_cpu(vx_history_buffer, cpu);
+	unsigned int index = (hist->counter++ % VXH_SIZE);
+
+		entry = &hist->entry[index];
+
+		atomic_inc(&sequence);
+		entry->seq = atomic_read(&sequence);
+	entry->loc = loc;
+	} else {
+		entry = &per_cpu(vx_dummy_entry, cpu);
+	}
         return entry;
 }
 
@@ -79,6 +89,7 @@ void	vxh_backtrace(void)
 {
 	unsigned int i,j;
 
+	vxh_active = 0;
 	smp_send_stop();
 
 	for (i=0; i < VXH_SIZE; i++) {