diff -NurpP --minimal linux-2.6.19.5-vs2.2.0-rc15.6/arch/alpha/mm/init.c linux-2.6.19.5-vs2.2.0-rc15.7/arch/alpha/mm/init.c --- linux-2.6.19.5-vs2.2.0-rc15.6/arch/alpha/mm/init.c 2006-11-08 04:57:39 +0100 +++ linux-2.6.19.5-vs2.2.0-rc15.7/arch/alpha/mm/init.c 2007-03-10 16:47:59 +0100 @@ -20,7 +20,6 @@ #include #include /* max_low_pfn */ #include -#include #include #include diff -NurpP --minimal linux-2.6.19.5-vs2.2.0-rc15.6/arch/um/kernel/syscall.c linux-2.6.19.5-vs2.2.0-rc15.7/arch/um/kernel/syscall.c --- linux-2.6.19.5-vs2.2.0-rc15.6/arch/um/kernel/syscall.c 2007-03-09 16:58:33 +0100 +++ linux-2.6.19.5-vs2.2.0-rc15.7/arch/um/kernel/syscall.c 2007-03-10 16:03:51 +0100 @@ -118,7 +118,6 @@ long sys_uname(struct old_utsname __user long sys_olduname(struct oldold_utsname __user * name) { long error; - struct new_utsname *ptr; if (!name) return -EFAULT; diff -NurpP --minimal linux-2.6.19.5-vs2.2.0-rc15.6/drivers/char/random.c linux-2.6.19.5-vs2.2.0-rc15.7/drivers/char/random.c --- linux-2.6.19.5-vs2.2.0-rc15.6/drivers/char/random.c 2006-11-08 04:57:40 +0100 +++ linux-2.6.19.5-vs2.2.0-rc15.7/drivers/char/random.c 2007-03-10 16:00:26 +0100 @@ -1178,7 +1178,7 @@ static char sysctl_bootid[16]; static int proc_do_uuid(ctl_table *table, int write, struct file *filp, void __user *buffer, size_t *lenp, loff_t *ppos) { - ctl_table fake_table = {0}; + ctl_table fake_table; unsigned char buf[64], tmp_uuid[16], *uuid; uuid = table->data; diff -NurpP --minimal linux-2.6.19.5-vs2.2.0-rc15.6/fs/xfs/linux-2.6/xfs_sysctl.c linux-2.6.19.5-vs2.2.0-rc15.7/fs/xfs/linux-2.6/xfs_sysctl.c --- linux-2.6.19.5-vs2.2.0-rc15.6/fs/xfs/linux-2.6/xfs_sysctl.c 2006-11-08 04:57:40 +0100 +++ linux-2.6.19.5-vs2.2.0-rc15.7/fs/xfs/linux-2.6/xfs_sysctl.c 2007-03-10 16:43:45 +0100 @@ -57,79 +57,79 @@ xfs_stats_clear_proc_handler( STATIC ctl_table xfs_table[] = { {XFS_RESTRICT_CHOWN, "restrict_chown", &xfs_params.restrict_chown.val, sizeof(int), 0644, NULL, &proc_dointvec_minmax, - NULL, &sysctl_intvec, NULL, + &sysctl_intvec, NULL, &xfs_params.restrict_chown.min, &xfs_params.restrict_chown.max}, {XFS_SGID_INHERIT, "irix_sgid_inherit", &xfs_params.sgid_inherit.val, sizeof(int), 0644, NULL, &proc_dointvec_minmax, - NULL, &sysctl_intvec, NULL, + &sysctl_intvec, NULL, &xfs_params.sgid_inherit.min, &xfs_params.sgid_inherit.max}, {XFS_SYMLINK_MODE, "irix_symlink_mode", &xfs_params.symlink_mode.val, sizeof(int), 0644, NULL, &proc_dointvec_minmax, - NULL, &sysctl_intvec, NULL, + &sysctl_intvec, NULL, &xfs_params.symlink_mode.min, &xfs_params.symlink_mode.max}, {XFS_PANIC_MASK, "panic_mask", &xfs_params.panic_mask.val, sizeof(int), 0644, NULL, &proc_dointvec_minmax, - NULL, &sysctl_intvec, NULL, + &sysctl_intvec, NULL, &xfs_params.panic_mask.min, &xfs_params.panic_mask.max}, {XFS_ERRLEVEL, "error_level", &xfs_params.error_level.val, sizeof(int), 0644, NULL, &proc_dointvec_minmax, - NULL, &sysctl_intvec, NULL, + &sysctl_intvec, NULL, &xfs_params.error_level.min, &xfs_params.error_level.max}, {XFS_SYNCD_TIMER, "xfssyncd_centisecs", &xfs_params.syncd_timer.val, sizeof(int), 0644, NULL, &proc_dointvec_minmax, - NULL, &sysctl_intvec, NULL, + &sysctl_intvec, NULL, &xfs_params.syncd_timer.min, &xfs_params.syncd_timer.max}, {XFS_INHERIT_SYNC, "inherit_sync", &xfs_params.inherit_sync.val, sizeof(int), 0644, NULL, &proc_dointvec_minmax, - NULL, &sysctl_intvec, NULL, + &sysctl_intvec, NULL, &xfs_params.inherit_sync.min, &xfs_params.inherit_sync.max}, {XFS_INHERIT_NODUMP, "inherit_nodump", &xfs_params.inherit_nodump.val, sizeof(int), 0644, NULL, &proc_dointvec_minmax, - NULL, &sysctl_intvec, NULL, + &sysctl_intvec, NULL, &xfs_params.inherit_nodump.min, &xfs_params.inherit_nodump.max}, {XFS_INHERIT_NOATIME, "inherit_noatime", &xfs_params.inherit_noatim.val, sizeof(int), 0644, NULL, &proc_dointvec_minmax, - NULL, &sysctl_intvec, NULL, + &sysctl_intvec, NULL, &xfs_params.inherit_noatim.min, &xfs_params.inherit_noatim.max}, {XFS_BUF_TIMER, "xfsbufd_centisecs", &xfs_params.xfs_buf_timer.val, sizeof(int), 0644, NULL, &proc_dointvec_minmax, - NULL, &sysctl_intvec, NULL, + &sysctl_intvec, NULL, &xfs_params.xfs_buf_timer.min, &xfs_params.xfs_buf_timer.max}, {XFS_BUF_AGE, "age_buffer_centisecs", &xfs_params.xfs_buf_age.val, sizeof(int), 0644, NULL, &proc_dointvec_minmax, - NULL, &sysctl_intvec, NULL, + &sysctl_intvec, NULL, &xfs_params.xfs_buf_age.min, &xfs_params.xfs_buf_age.max}, {XFS_INHERIT_NOSYM, "inherit_nosymlinks", &xfs_params.inherit_nosym.val, sizeof(int), 0644, NULL, &proc_dointvec_minmax, - NULL, &sysctl_intvec, NULL, + &sysctl_intvec, NULL, &xfs_params.inherit_nosym.min, &xfs_params.inherit_nosym.max}, {XFS_ROTORSTEP, "rotorstep", &xfs_params.rotorstep.val, sizeof(int), 0644, NULL, &proc_dointvec_minmax, - NULL, &sysctl_intvec, NULL, + &sysctl_intvec, NULL, &xfs_params.rotorstep.min, &xfs_params.rotorstep.max}, {XFS_INHERIT_NODFRG, "inherit_nodefrag", &xfs_params.inherit_nodfrg.val, sizeof(int), 0644, NULL, &proc_dointvec_minmax, - NULL, &sysctl_intvec, NULL, + &sysctl_intvec, NULL, &xfs_params.inherit_nodfrg.min, &xfs_params.inherit_nodfrg.max}, /* please keep this the last entry */ #ifdef CONFIG_PROC_FS {XFS_STATS_CLEAR, "stats_clear", &xfs_params.stats_clear.val, sizeof(int), 0644, NULL, &xfs_stats_clear_proc_handler, - NULL, &sysctl_intvec, NULL, + &sysctl_intvec, NULL, &xfs_params.stats_clear.min, &xfs_params.stats_clear.max}, #endif /* CONFIG_PROC_FS */ diff -NurpP --minimal linux-2.6.19.5-vs2.2.0-rc15.6/include/asm-i386/elf.h linux-2.6.19.5-vs2.2.0-rc15.7/include/asm-i386/elf.h --- linux-2.6.19.5-vs2.2.0-rc15.6/include/asm-i386/elf.h 2006-11-08 04:57:53 +0100 +++ linux-2.6.19.5-vs2.2.0-rc15.7/include/asm-i386/elf.h 2007-03-10 15:36:13 +0100 @@ -75,7 +75,7 @@ typedef struct user_fxsr_struct elf_fpxr the loader. We need to make sure that it is out of the way of the program that it will "exec", and that there is sufficient room for the brk. */ -#define ELF_ET_DYN_BASE ((TASK_UNMAPPED_BASE) * 2) +#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) /* regs is struct pt_regs, pr_reg is elf_gregset_t (which is now struct_user_regs, they are different) */ diff -NurpP --minimal linux-2.6.19.5-vs2.2.0-rc15.6/include/linux/sysctl.h linux-2.6.19.5-vs2.2.0-rc15.7/include/linux/sysctl.h --- linux-2.6.19.5-vs2.2.0-rc15.6/include/linux/sysctl.h 2006-11-08 21:52:09 +0100 +++ linux-2.6.19.5-vs2.2.0-rc15.7/include/linux/sysctl.h 2007-03-10 15:52:51 +0100 @@ -933,9 +933,6 @@ typedef int ctl_handler (ctl_table *tabl typedef int proc_handler (ctl_table *ctl, int write, struct file * filp, void __user *buffer, size_t *lenp, loff_t *ppos); -typedef int virt_handler (struct ctl_table *ctl, int write, xid_t xid, - void **datap, size_t *lenp); - extern int proc_dostring(ctl_table *, int, struct file *, void __user *, size_t *, loff_t *); extern int proc_dointvec(ctl_table *, int, struct file *, @@ -1020,7 +1017,6 @@ struct ctl_table mode_t mode; ctl_table *child; proc_handler *proc_handler; /* Callback for text formatting */ - virt_handler *virt_handler; /* Context virtualization */ ctl_handler *strategy; /* Callback function for all r/w */ struct proc_dir_entry *de; /* /proc control block */ void *extra1; diff -NurpP --minimal linux-2.6.19.5-vs2.2.0-rc15.6/init/Makefile linux-2.6.19.5-vs2.2.0-rc15.7/init/Makefile --- linux-2.6.19.5-vs2.2.0-rc15.6/init/Makefile 2006-12-06 21:03:02 +0100 +++ linux-2.6.19.5-vs2.2.0-rc15.7/init/Makefile 2007-03-10 15:37:02 +0100 @@ -15,7 +15,6 @@ clean-files := ../include/linux/compile. # dependencies on generated files need to be listed explicitly -$(obj)/main.o: include/linux/compile.h $(obj)/version.o: include/linux/compile.h # compile.h changes depending on hostname, generation number, etc, diff -NurpP --minimal linux-2.6.19.5-vs2.2.0-rc15.6/kernel/sys.c linux-2.6.19.5-vs2.2.0-rc15.7/kernel/sys.c --- linux-2.6.19.5-vs2.2.0-rc15.6/kernel/sys.c 2007-02-22 17:25:12 +0100 +++ linux-2.6.19.5-vs2.2.0-rc15.7/kernel/sys.c 2007-03-10 15:35:53 +0100 @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include