diff -urN linux-2.4.18-ctx9-no-panic/fs/proc/array.c linux-2.4.18-ctx9-no-x86only/fs/proc/array.c
--- linux-2.4.18-ctx9-no-panic/fs/proc/array.c	Sun Mar 31 12:29:48 2002
+++ linux-2.4.18-ctx9-no-x86only/fs/proc/array.c	Sun Mar 31 13:43:42 2002
@@ -295,9 +295,10 @@
 	}
 	buffer = task_sig(task, buffer);
 	buffer = task_cap(task, buffer);
+#ifdef __NR_new_s_context
 	buffer += sprintf (buffer,"s_context: %d\n",task->s_context);
-	buffer += sprintf (buffer,"ipv4root: %08lx\n",task->ipv4root);
-	buffer += sprintf (buffer,"ipv4root_bcast: %08lx\n",task->ipv4root_bcast);
+	buffer += sprintf (buffer,"ipv4root: %08x\n",task->ipv4root);
+	buffer += sprintf (buffer,"ipv4root_bcast: %08x\n",task->ipv4root_bcast);
 	if (task->s_info != NULL){
 		buffer += sprintf (buffer,"ctxticks: %d %ld %d\n"
 			,atomic_read(&task->s_info->ticks),task->counter
@@ -313,6 +314,7 @@
 	}
 	buffer += sprintf (buffer,"__NR_new_s_context: %d\n",__NR_new_s_context);
 	buffer += sprintf (buffer,"__NR_set_ipv4root: %d rev1\n",__NR_set_ipv4root);
+#endif
 #if defined(CONFIG_ARCH_S390)
 	buffer = task_show_regs(task, buffer);
 #endif
diff -urN linux-2.4.18-ctx9-no-panic/include/linux/sched.h linux-2.4.18-ctx9-no-x86only/include/linux/sched.h
--- linux-2.4.18-ctx9-no-panic/include/linux/sched.h	Sun Mar 31 12:29:48 2002
+++ linux-2.4.18-ctx9-no-x86only/include/linux/sched.h	Sun Mar 31 13:34:56 2002
@@ -433,8 +433,8 @@
 	int s_context;	/* Process can only deal with other processes */
 			/* with the same s_context */
 	__u32 cap_bset;	/* Maximum capability of this process and children */
-	unsigned long ipv4root;	/* Process can only bind to this iP */
-	unsigned long ipv4root_bcast;
+	__u32 ipv4root;	/* Process can only bind to this iP */
+	__u32 ipv4root_bcast;
 	struct context_info *s_info;
 	void *notifier_data;
 	sigset_t *notifier_mask;
diff -urN linux-2.4.18-ctx9-no-panic/net/socket.c linux-2.4.18-ctx9-no-x86only/net/socket.c
--- linux-2.4.18-ctx9-no-panic/net/socket.c	Sun Mar 31 12:29:48 2002
+++ linux-2.4.18-ctx9-no-x86only/net/socket.c	Sun Mar 31 13:34:56 2002
@@ -1764,7 +1764,7 @@
 	return len;
 }
 
-asmlinkage int sys_set_ipv4root (unsigned long ip, unsigned long bcast)
+asmlinkage int sys_set_ipv4root (__u32 ip, __u32 bcast)
 {
 	int ret = -EPERM;
 	if (current->ipv4root == 0