diff -rc2P linux-2.4.18ctx-9/Makefile linux-2.4.18ctx-10/Makefile
*** linux-2.4.18ctx-9/Makefile Wed Feb 27 16:13:27 2002
--- linux-2.4.18ctx-10/Makefile Tue Mar 19 23:20:34 2002
***************
*** 2,6 ****
PATCHLEVEL = 4
SUBLEVEL = 18
! EXTRAVERSION =ctx-9
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
--- 2,6 ----
PATCHLEVEL = 4
SUBLEVEL = 18
! EXTRAVERSION =ctx-10
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
diff -rc2P linux-2.4.18ctx-9/fs/proc/array.c linux-2.4.18ctx-10/fs/proc/array.c
*** linux-2.4.18ctx-9/fs/proc/array.c Mon Mar 18 12:13:32 2002
--- linux-2.4.18ctx-10/fs/proc/array.c Wed Apr 3 16:41:02 2002
***************
*** 296,302 ****
buffer = task_sig(task, buffer);
buffer = task_cap(task, buffer);
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);
if (task->s_info != NULL){
buffer += sprintf (buffer,"ctxticks: %d %ld %d\n"
--- 296,303 ----
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: %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"
***************
*** 314,317 ****
--- 315,319 ----
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);
diff -rc2P linux-2.4.18ctx-9/include/linux/sched.h linux-2.4.18ctx-10/include/linux/sched.h
*** linux-2.4.18ctx-9/include/linux/sched.h Mon Mar 18 12:11:01 2002
--- linux-2.4.18ctx-10/include/linux/sched.h Wed Apr 3 16:41:02 2002
***************
*** 434,439 ****
/* 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;
struct context_info *s_info;
void *notifier_data;
--- 434,439 ----
/* with the same s_context */
__u32 cap_bset; /* Maximum capability of this process and children */
! __u32 ipv4root; /* Process can only bind to this iP */
! __u32 ipv4root_bcast;
struct context_info *s_info;
void *notifier_data;
diff -rc2P linux-2.4.18ctx-9/include/net/sock.h linux-2.4.18ctx-10/include/net/sock.h
*** linux-2.4.18ctx-9/include/net/sock.h Mon Mar 18 12:13:37 2002
--- linux-2.4.18ctx-10/include/net/sock.h Wed Apr 3 16:45:16 2002
***************
*** 491,495 ****
__u32 daddr; /* Foreign IPv4 addr */
__u32 rcv_saddr; /* Bound local IPv4 addr */
- __u32 bcast_addr; /* Local bcast addr, for ipv4root */
__u16 dport; /* Destination port */
unsigned short num; /* Local port */
--- 491,494 ----
***************
*** 527,530 ****
--- 526,530 ----
unsigned int allocation; /* Allocation mode */
int sndbuf; /* Size of send buffer in bytes */
+ __u32 bcast_addr; /* Local bcast addr, for ipv4root */
struct sock *prev;
diff -rc2P linux-2.4.18ctx-9/net/socket.c linux-2.4.18ctx-10/net/socket.c
*** linux-2.4.18ctx-9/net/socket.c Mon Mar 18 12:13:03 2002
--- linux-2.4.18ctx-10/net/socket.c Wed Apr 3 16:41:02 2002
***************
*** 1765,1769 ****
}
! asmlinkage int sys_set_ipv4root (unsigned long ip, unsigned long bcast)
{
int ret = -EPERM;
--- 1765,1769 ----
}
! asmlinkage int sys_set_ipv4root (__u32 ip, __u32 bcast)
{
int ret = -EPERM;
