diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/Makefile linux-2.6.15.4-vs2.0.2-rc3/Makefile --- linux-2.6.15.4-vs2.0.2-rc2/Makefile 2006-02-13 10:41:23 +0100 +++ linux-2.6.15.4-vs2.0.2-rc3/Makefile 2006-02-13 18:45:05 +0100 @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 15 -EXTRAVERSION = .4-vs2.0.2-rc2 +EXTRAVERSION = .4-vs2.0.2-rc3 NAME=Sliding Snow Leopard # *DOCUMENTATION* diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/arch/alpha/kernel/ptrace.c linux-2.6.15.4-vs2.0.2-rc3/arch/alpha/kernel/ptrace.c --- linux-2.6.15.4-vs2.0.2-rc2/arch/alpha/kernel/ptrace.c 2006-01-04 19:50:18 +0100 +++ linux-2.6.15.4-vs2.0.2-rc3/arch/alpha/kernel/ptrace.c 2006-02-13 17:39:00 +0100 @@ -15,6 +15,7 @@ #include #include #include +#include #include #include diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/arch/frv/mm/mmu-context.c linux-2.6.15.4-vs2.0.2-rc3/arch/frv/mm/mmu-context.c --- linux-2.6.15.4-vs2.0.2-rc2/arch/frv/mm/mmu-context.c 2005-03-02 12:38:20 +0100 +++ linux-2.6.15.4-vs2.0.2-rc3/arch/frv/mm/mmu-context.c 2006-02-13 17:39:00 +0100 @@ -11,6 +11,7 @@ #include #include +#include #include #define NR_CXN 4096 diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/arch/ia64/ia32/binfmt_elf32.c linux-2.6.15.4-vs2.0.2-rc3/arch/ia64/ia32/binfmt_elf32.c --- linux-2.6.15.4-vs2.0.2-rc2/arch/ia64/ia32/binfmt_elf32.c 2006-01-04 19:50:18 +0100 +++ linux-2.6.15.4-vs2.0.2-rc3/arch/ia64/ia32/binfmt_elf32.c 2006-02-13 16:40:19 +0100 @@ -199,7 +199,7 @@ ia64_elf32_init (struct pt_regs *regs) int ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack) { - unsigned long stack_base, grow; + unsigned long stack_base; struct vm_area_struct *mpnt; struct mm_struct *mm = current->mm; int i, ret; diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/arch/ia64/ia32/sys_ia32.c linux-2.6.15.4-vs2.0.2-rc3/arch/ia64/ia32/sys_ia32.c --- linux-2.6.15.4-vs2.0.2-rc2/arch/ia64/ia32/sys_ia32.c 2006-01-03 17:29:09 +0100 +++ linux-2.6.15.4-vs2.0.2-rc3/arch/ia64/ia32/sys_ia32.c 2006-02-13 17:39:00 +0100 @@ -51,6 +51,7 @@ #include #include #include +#include #include #include diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/arch/ia64/kernel/ptrace.c linux-2.6.15.4-vs2.0.2-rc3/arch/ia64/kernel/ptrace.c --- linux-2.6.15.4-vs2.0.2-rc2/arch/ia64/kernel/ptrace.c 2006-01-04 19:50:18 +0100 +++ linux-2.6.15.4-vs2.0.2-rc3/arch/ia64/kernel/ptrace.c 2006-02-13 17:39:00 +0100 @@ -18,6 +18,7 @@ #include #include #include +#include #include #include diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/arch/ia64/kernel/signal.c linux-2.6.15.4-vs2.0.2-rc3/arch/ia64/kernel/signal.c --- linux-2.6.15.4-vs2.0.2-rc2/arch/ia64/kernel/signal.c 2006-01-03 17:29:09 +0100 +++ linux-2.6.15.4-vs2.0.2-rc3/arch/ia64/kernel/signal.c 2006-02-13 17:39:00 +0100 @@ -21,6 +21,7 @@ #include #include #include +#include #include #include diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/arch/ia64/sn/kernel/xpc_main.c linux-2.6.15.4-vs2.0.2-rc3/arch/ia64/sn/kernel/xpc_main.c --- linux-2.6.15.4-vs2.0.2-rc2/arch/ia64/sn/kernel/xpc_main.c 2006-01-03 17:29:09 +0100 +++ linux-2.6.15.4-vs2.0.2-rc3/arch/ia64/sn/kernel/xpc_main.c 2006-02-13 16:44:25 +0100 @@ -105,6 +105,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] = 0644, NULL, &proc_dointvec_minmax, + NULL, &sysctl_intvec, NULL, &xpc_hb_min_interval, @@ -118,6 +119,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] = 0644, NULL, &proc_dointvec_minmax, + NULL, &sysctl_intvec, NULL, &xpc_hb_check_min_interval, @@ -142,6 +144,7 @@ static ctl_table xpc_sys_xpc_dir[] = { 0644, NULL, &proc_dointvec_minmax, + NULL, &sysctl_intvec, NULL, &xpc_disengage_request_min_timelimit, diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/arch/m32r/kernel/ptrace.c linux-2.6.15.4-vs2.0.2-rc3/arch/m32r/kernel/ptrace.c --- linux-2.6.15.4-vs2.0.2-rc2/arch/m32r/kernel/ptrace.c 2006-01-03 17:29:10 +0100 +++ linux-2.6.15.4-vs2.0.2-rc3/arch/m32r/kernel/ptrace.c 2006-02-13 17:39:00 +0100 @@ -25,6 +25,7 @@ #include #include #include +#include #include #include diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/arch/mips/kernel/ptrace32.c linux-2.6.15.4-vs2.0.2-rc3/arch/mips/kernel/ptrace32.c --- linux-2.6.15.4-vs2.0.2-rc2/arch/mips/kernel/ptrace32.c 2006-01-03 17:29:11 +0100 +++ linux-2.6.15.4-vs2.0.2-rc3/arch/mips/kernel/ptrace32.c 2006-02-13 17:39:00 +0100 @@ -24,6 +24,7 @@ #include #include #include +#include #include #include diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/arch/powerpc/kernel/ptrace32.c linux-2.6.15.4-vs2.0.2-rc3/arch/powerpc/kernel/ptrace32.c --- linux-2.6.15.4-vs2.0.2-rc2/arch/powerpc/kernel/ptrace32.c 2006-01-03 17:29:13 +0100 +++ linux-2.6.15.4-vs2.0.2-rc3/arch/powerpc/kernel/ptrace32.c 2006-02-13 17:39:00 +0100 @@ -28,6 +28,7 @@ #include #include #include +#include #include #include diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/arch/s390/kernel/ptrace.c linux-2.6.15.4-vs2.0.2-rc3/arch/s390/kernel/ptrace.c --- linux-2.6.15.4-vs2.0.2-rc2/arch/s390/kernel/ptrace.c 2006-01-04 19:50:18 +0100 +++ linux-2.6.15.4-vs2.0.2-rc3/arch/s390/kernel/ptrace.c 2006-02-13 17:39:00 +0100 @@ -33,6 +33,7 @@ #include #include #include +#include #include #include diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/arch/sparc/kernel/ptrace.c linux-2.6.15.4-vs2.0.2-rc3/arch/sparc/kernel/ptrace.c --- linux-2.6.15.4-vs2.0.2-rc2/arch/sparc/kernel/ptrace.c 2006-01-04 19:50:18 +0100 +++ linux-2.6.15.4-vs2.0.2-rc3/arch/sparc/kernel/ptrace.c 2006-02-13 17:39:00 +0100 @@ -19,6 +19,7 @@ #include #include #include +#include #include #include diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/arch/sparc64/kernel/ptrace.c linux-2.6.15.4-vs2.0.2-rc3/arch/sparc64/kernel/ptrace.c --- linux-2.6.15.4-vs2.0.2-rc2/arch/sparc64/kernel/ptrace.c 2006-01-04 19:50:18 +0100 +++ linux-2.6.15.4-vs2.0.2-rc3/arch/sparc64/kernel/ptrace.c 2006-02-13 17:39:00 +0100 @@ -22,6 +22,7 @@ #include #include #include +#include #include #include diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/arch/um/drivers/mconsole_kern.c linux-2.6.15.4-vs2.0.2-rc3/arch/um/drivers/mconsole_kern.c --- linux-2.6.15.4-vs2.0.2-rc2/arch/um/drivers/mconsole_kern.c 2005-10-28 20:49:17 +0200 +++ linux-2.6.15.4-vs2.0.2-rc3/arch/um/drivers/mconsole_kern.c 2006-02-13 17:39:00 +0100 @@ -20,6 +20,7 @@ #include "linux/namei.h" #include "linux/proc_fs.h" #include "linux/syscalls.h" +#include "linux/vs_cvirt.h" #include "asm/irq.h" #include "asm/uaccess.h" #include "user_util.h" diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/arch/x86_64/ia32/ia32_binfmt.c linux-2.6.15.4-vs2.0.2-rc3/arch/x86_64/ia32/ia32_binfmt.c --- linux-2.6.15.4-vs2.0.2-rc2/arch/x86_64/ia32/ia32_binfmt.c 2006-01-04 19:50:18 +0100 +++ linux-2.6.15.4-vs2.0.2-rc3/arch/x86_64/ia32/ia32_binfmt.c 2006-02-13 16:39:55 +0100 @@ -337,7 +337,7 @@ static void elf32_init(struct pt_regs *r int ia32_setup_arg_pages(struct linux_binprm *bprm, unsigned long stack_top, int executable_stack) { - unsigned long stack_base, grow; + unsigned long stack_base; struct vm_area_struct *mpnt; struct mm_struct *mm = current->mm; int i, ret; diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/arch/x86_64/ia32/ptrace32.c linux-2.6.15.4-vs2.0.2-rc3/arch/x86_64/ia32/ptrace32.c --- linux-2.6.15.4-vs2.0.2-rc2/arch/x86_64/ia32/ptrace32.c 2005-08-29 22:24:57 +0200 +++ linux-2.6.15.4-vs2.0.2-rc3/arch/x86_64/ia32/ptrace32.c 2006-02-13 17:39:00 +0100 @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/fs/proc/base.c linux-2.6.15.4-vs2.0.2-rc3/fs/proc/base.c --- linux-2.6.15.4-vs2.0.2-rc2/fs/proc/base.c 2006-02-11 01:25:01 +0100 +++ linux-2.6.15.4-vs2.0.2-rc3/fs/proc/base.c 2006-02-13 17:35:53 +0100 @@ -71,6 +71,7 @@ #include #include #include +#include #include #include "internal.h" diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/include/linux/ptrace.h linux-2.6.15.4-vs2.0.2-rc3/include/linux/ptrace.h --- linux-2.6.15.4-vs2.0.2-rc2/include/linux/ptrace.h 2006-01-04 19:50:18 +0100 +++ linux-2.6.15.4-vs2.0.2-rc3/include/linux/ptrace.h 2006-02-13 17:35:53 +0100 @@ -77,8 +77,6 @@ #include /* For unlikely. */ #include /* For struct task_struct. */ -#include -#include extern long arch_ptrace(struct task_struct *child, long request, long addr, long data); diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/include/linux/vserver/network.h linux-2.6.15.4-vs2.0.2-rc3/include/linux/vserver/network.h --- linux-2.6.15.4-vs2.0.2-rc2/include/linux/vserver/network.h 2006-01-04 19:50:18 +0100 +++ linux-2.6.15.4-vs2.0.2-rc3/include/linux/vserver/network.h 2006-02-13 18:42:46 +0100 @@ -83,12 +83,35 @@ extern long vs_net_change(struct nx_info struct in_ifaddr; struct net_device; +#ifdef CONFIG_INET int ifa_in_nx_info(struct in_ifaddr *, struct nx_info *); int dev_in_nx_info(struct net_device *, struct nx_info *); +#else /* CONFIG_INET */ +static inline +int ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n) +{ + return 1; +} + +static inline +int dev_in_nx_info(struct net_device *d, struct nx_info *n) +{ + return 1; +} +#endif /* CONFIG_INET */ + struct sock; +#ifdef CONFIG_INET int nx_addr_conflict(struct nx_info *, uint32_t, struct sock *); +#else /* CONFIG_INET */ +static inline +int nx_addr_conflict(struct nx_info *n, uint32_t a, struct sock *s) +{ + return 1; +} +#endif /* CONFIG_INET */ #endif /* __KERNEL__ */ #else /* _VX_NETWORK_H */ diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/ipc/shm.c linux-2.6.15.4-vs2.0.2-rc3/ipc/shm.c --- linux-2.6.15.4-vs2.0.2-rc2/ipc/shm.c 2006-01-04 19:50:18 +0100 +++ linux-2.6.15.4-vs2.0.2-rc3/ipc/shm.c 2006-02-13 17:35:53 +0100 @@ -29,6 +29,7 @@ #include #include #include +#include #include #include diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/kernel/exit.c linux-2.6.15.4-vs2.0.2-rc3/kernel/exit.c --- linux-2.6.15.4-vs2.0.2-rc2/kernel/exit.c 2006-01-04 19:50:18 +0100 +++ linux-2.6.15.4-vs2.0.2-rc3/kernel/exit.c 2006-02-13 17:35:53 +0100 @@ -30,7 +30,9 @@ #include #include #include +#include #include +#include #include #include diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/kernel/fork.c linux-2.6.15.4-vs2.0.2-rc3/kernel/fork.c --- linux-2.6.15.4-vs2.0.2-rc2/kernel/fork.c 2006-01-04 19:50:18 +0100 +++ linux-2.6.15.4-vs2.0.2-rc3/kernel/fork.c 2006-02-13 17:41:52 +0100 @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/kernel/ptrace.c linux-2.6.15.4-vs2.0.2-rc3/kernel/ptrace.c --- linux-2.6.15.4-vs2.0.2-rc2/kernel/ptrace.c 2006-01-04 19:50:18 +0100 +++ linux-2.6.15.4-vs2.0.2-rc3/kernel/ptrace.c 2006-02-13 17:35:53 +0100 @@ -17,6 +17,7 @@ #include #include #include +#include #include #include diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/kernel/signal.c linux-2.6.15.4-vs2.0.2-rc3/kernel/signal.c --- linux-2.6.15.4-vs2.0.2-rc2/kernel/signal.c 2006-01-04 19:50:18 +0100 +++ linux-2.6.15.4-vs2.0.2-rc3/kernel/signal.c 2006-02-13 17:36:29 +0100 @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/kernel/vserver/network.c linux-2.6.15.4-vs2.0.2-rc3/kernel/vserver/network.c --- linux-2.6.15.4-vs2.0.2-rc2/kernel/vserver/network.c 2006-01-07 06:07:51 +0100 +++ linux-2.6.15.4-vs2.0.2-rc3/kernel/vserver/network.c 2006-02-13 18:24:13 +0100 @@ -393,10 +393,11 @@ out: } +#ifdef CONFIG_INET + #include #include - int ifa_in_nx_info(struct in_ifaddr *ifa, struct nx_info *nxi) { if (!nxi) @@ -484,6 +485,7 @@ int nx_addr_conflict(struct nx_info *nxi } } +#endif /* CONFIG_INET */ /* vserver syscall commands below here */ diff -NurpP linux-2.6.15.4-vs2.0.2-rc2/mm/mempolicy.c linux-2.6.15.4-vs2.0.2-rc3/mm/mempolicy.c --- linux-2.6.15.4-vs2.0.2-rc2/mm/mempolicy.c 2006-01-03 17:30:13 +0100 +++ linux-2.6.15.4-vs2.0.2-rc3/mm/mempolicy.c 2006-02-13 17:37:06 +0100 @@ -83,6 +83,7 @@ #include #include #include +#include #include #include