diff -NurpP --minimal linux-2.6.10-vs1.9.3.14.6/include/linux/vserver/debug.h linux-2.6.10-vs1.9.3.14.7/include/linux/vserver/debug.h
--- linux-2.6.10-vs1.9.3.14.6/include/linux/vserver/debug.h	2005-01-01 19:18:24.000000000 +0100
+++ linux-2.6.10-vs1.9.3.14.7/include/linux/vserver/debug.h	2005-01-02 05:25:49.000000000 +0100
@@ -83,6 +83,8 @@ extern unsigned int vx_debug_cvirt;
 
 #ifdef	CONFIG_VSERVER_HISTORY
 
+extern unsigned volatile int vxh_active;
+
 struct _vxhe_vxi {
 	struct vx_info *ptr;
 	unsigned xid;
@@ -104,7 +106,6 @@ enum {
 
 	VXH_GET_VX_INFO,
 	VXH_PUT_VX_INFO,
-	VXH_RCU_PUT_VX_INFO,
 	VXH_SET_VX_INFO,
 	VXH_CLR_VX_INFO,
 	VXH_ALLOC_VX_INFO,
@@ -150,6 +151,9 @@ static inline void vxh_throw_oops(void)
 	struct _vx_hist_entry *entry = vxh_advance(VXH_HERE());
 
 	entry->type = VXH_THROW_OOPS;
+
+	/* prevent further acquisition */
+	vxh_active = 0;
 }
 
 static inline void vxh_get_vx_info(struct vx_info *vxi)
diff -NurpP --minimal linux-2.6.10-vs1.9.3.14.6/kernel/vserver/context.c linux-2.6.10-vs1.9.3.14.7/kernel/vserver/context.c
--- linux-2.6.10-vs1.9.3.14.6/kernel/vserver/context.c	2004-12-31 06:20:51.000000000 +0100
+++ linux-2.6.10-vs1.9.3.14.7/kernel/vserver/context.c	2005-01-02 05:31:44.000000000 +0100
@@ -185,7 +185,7 @@ void free_vx_info(struct vx_info *vxi)
 
 struct hlist_head vx_info_hash[VX_HASH_SIZE];
 
-// static spinlock_t vx_info_hash_lock = SPIN_LOCK_UNLOCKED;
+static spinlock_t vx_info_hash_lock = SPIN_LOCK_UNLOCKED;
 
 
 static inline unsigned int __hashval(xid_t xid)
@@ -210,7 +210,10 @@ static inline void __hash_vx_info(struct
 	vxi->vx_state |= VXS_HASHED;
 	vxh_hash_vx_info(vxi);
 	head = &vx_info_hash[__hashval(vxi->vx_id)];
+
+	spin_lock(&vx_info_hash_lock);
 	hlist_add_head_rcu(&vxi->vx_hlist, head);
+	spin_unlock(&vx_info_hash_lock);
 }
 
 /*	__unhash_vx_info()
@@ -223,7 +226,11 @@ static inline void __unhash_vx_info(stru
 	vxdprintk(VXD_CBIT(xid, 4),
 		"__unhash_vx_info: %p[#%d]", vxi, vxi->vx_id);
 	vxi->vx_state &= ~VXS_HASHED;
+
+	spin_lock(&vx_info_hash_lock);
 	hlist_del_rcu(&vxi->vx_hlist);
+	spin_unlock(&vx_info_hash_lock);
+
 	vxh_unhash_vx_info(vxi);
 	call_rcu(&vxi->vx_rcu, __rcu_put_vx_info);
 }
diff -NurpP --minimal linux-2.6.10-vs1.9.3.14.6/kernel/vserver/debug.c linux-2.6.10-vs1.9.3.14.7/kernel/vserver/debug.c
--- linux-2.6.10-vs1.9.3.14.6/kernel/vserver/debug.c	2005-01-01 19:31:19.000000000 +0100
+++ linux-2.6.10-vs1.9.3.14.7/kernel/vserver/debug.c	2005-01-02 05:26:53.000000000 +0100
@@ -37,7 +37,7 @@ struct _vx_history {
 
 DEFINE_PER_CPU(struct _vx_history, vx_history_buffer);
 
-unsigned int vxh_active = 1;
+unsigned volatile int vxh_active = 1;
 
 static atomic_t sequence = ATOMIC_INIT(0);
 
@@ -63,7 +63,7 @@ struct _vx_hist_entry *vxh_advance(void 
 #define	VXH_LOC_ARGS(e)	(e)->seq, cpu, (e)->loc
 
 
-#define	VXH_VXI_FMTS	"%p[#%u,%d.%d]"
+#define	VXH_VXI_FMTS	"%p[#%d,%d.%d]"
 
 #define	VXH_VXI_ARGS(e)	(e)->vxi.ptr, 			\
 			(e)->vxi.ptr?(e)->vxi.xid:0, 	\
@@ -79,11 +79,9 @@ void	vxh_dump_entry(struct _vx_hist_entr
 
 	case VXH_GET_VX_INFO:
 	case VXH_PUT_VX_INFO:
-	case VXH_RCU_PUT_VX_INFO:
 		printk( VXH_LOC_FMTS " %s_vx_info " VXH_VXI_FMTS "\n", 
 			VXH_LOC_ARGS(e),
-			(e->type==VXH_GET_VX_INFO)?"get":
-			(e->type==VXH_PUT_VX_INFO)?"put":"rcu_put",
+			(e->type==VXH_GET_VX_INFO)?"get":"put",
 			VXH_VXI_ARGS(e));
 		break;