diff -NurpP --minimal linux-2.6.17.7-vs2.0.2-rc28/arch/i386/kernel/traps.c linux-2.6.17.7-vs2.0.2-rc28x/arch/i386/kernel/traps.c --- linux-2.6.17.7-vs2.0.2-rc28/arch/i386/kernel/traps.c 2006-07-12 14:13:19 +0200 +++ linux-2.6.17.7-vs2.0.2-rc28x/arch/i386/kernel/traps.c 2006-08-14 22:34:17 +0200 @@ -404,7 +404,8 @@ void die(const char * str, struct pt_reg printk(KERN_EMERG "EIP: [<%08lx>] ", regs->eip); print_symbol("%s", regs->eip); printk(" SS:ESP %04x:%08lx\n", ss, esp); - } else + } + else regs = NULL; } else printk(KERN_EMERG "Recursive die() failure, output suppressed\n"); diff -NurpP --minimal linux-2.6.17.7-vs2.0.2-rc28/arch/um/kernel/process_kern.c linux-2.6.17.7-vs2.0.2-rc28x/arch/um/kernel/process_kern.c --- linux-2.6.17.7-vs2.0.2-rc28/arch/um/kernel/process_kern.c 2006-07-12 14:13:20 +0200 +++ linux-2.6.17.7-vs2.0.2-rc28x/arch/um/kernel/process_kern.c 2006-06-18 04:52:38 +0200 @@ -23,7 +23,6 @@ #include "linux/proc_fs.h" #include "linux/ptrace.h" #include "linux/random.h" - #include "asm/unistd.h" #include "asm/mman.h" #include "asm/segment.h" diff -NurpP --minimal linux-2.6.17.7-vs2.0.2-rc28/fs/ext2/inode.c linux-2.6.17.7-vs2.0.2-rc28x/fs/ext2/inode.c --- linux-2.6.17.7-vs2.0.2-rc28/fs/ext2/inode.c 2006-07-12 14:13:21 +0200 +++ linux-2.6.17.7-vs2.0.2-rc28x/fs/ext2/inode.c 2006-08-14 22:34:16 +0200 @@ -1356,7 +1356,6 @@ int ext2_setattr(struct dentry *dentry, if (error) return error; } - error = inode_setattr(inode, iattr); if (!error && (iattr->ia_valid & ATTR_MODE)) error = ext2_acl_chmod(inode); diff -NurpP --minimal linux-2.6.17.7-vs2.0.2-rc28/fs/jfs/jfs_dinode.h linux-2.6.17.7-vs2.0.2-rc28x/fs/jfs/jfs_dinode.h --- linux-2.6.17.7-vs2.0.2-rc28/fs/jfs/jfs_dinode.h 2006-07-12 14:13:21 +0200 +++ linux-2.6.17.7-vs2.0.2-rc28x/fs/jfs/jfs_dinode.h 2006-08-14 22:34:15 +0200 @@ -162,8 +162,8 @@ struct dinode { #define JFS_APPEND_FL 0x01000000 /* writes to file may only append */ #define JFS_IMMUTABLE_FL 0x02000000 /* Immutable file */ -#define JFS_BARRIER_FL 0x04000000 /* Barrier for chroot() */ -#define JFS_IUNLINK_FL 0x08000000 /* Immutable unlink */ +#define JFS_BARRIER_FL 0x04000000 /* Barrier for chroot() */ +#define JFS_IUNLINK_FL 0x08000000 /* Immutable unlink */ #define JFS_FL_USER_VISIBLE 0x0FF80000 #define JFS_FL_USER_MODIFIABLE 0x03F80000 @@ -173,4 +173,5 @@ struct dinode { #define JFS_IOC_GETFLAGS _IOR('f', 1, long) #define JFS_IOC_SETFLAGS _IOW('f', 2, long) + #endif /*_H_JFS_DINODE */ diff -NurpP --minimal linux-2.6.17.7-vs2.0.2-rc28/fs/jfs/jfs_xtree.c linux-2.6.17.7-vs2.0.2-rc28x/fs/jfs/jfs_xtree.c --- linux-2.6.17.7-vs2.0.2-rc28/fs/jfs/jfs_xtree.c 2006-07-12 14:13:21 +0200 +++ linux-2.6.17.7-vs2.0.2-rc28x/fs/jfs/jfs_xtree.c 2006-08-14 22:34:18 +0200 @@ -1251,7 +1251,7 @@ xtSplitPage(tid_t tid, struct inode *ip, rbn = addressPXD(pxd); /* Allocate blocks to quota. */ - if (DQUOT_ALLOC_BLOCK(ip, lengthPXD(pxd))) { + if (DQUOT_ALLOC_BLOCK(ip, lengthPXD(pxd))) { rc = -EDQUOT; goto clean_up; } diff -NurpP --minimal linux-2.6.17.7-vs2.0.2-rc28/fs/namei.c linux-2.6.17.7-vs2.0.2-rc28x/fs/namei.c --- linux-2.6.17.7-vs2.0.2-rc28/fs/namei.c 2006-07-26 21:36:28 +0200 +++ linux-2.6.17.7-vs2.0.2-rc28x/fs/namei.c 2006-08-14 22:34:19 +0200 @@ -2635,7 +2635,6 @@ int vfs_follow_link(struct nameidata *nd return __vfs_follow_link(nd, link); } - /* get the link contents into pagecache */ static char *page_getlink(struct dentry * dentry, struct page **ppage) { diff -NurpP --minimal linux-2.6.17.7-vs2.0.2-rc28/fs/ocfs2/inode.c linux-2.6.17.7-vs2.0.2-rc28x/fs/ocfs2/inode.c --- linux-2.6.17.7-vs2.0.2-rc28/fs/ocfs2/inode.c 2006-07-12 14:13:21 +0200 +++ linux-2.6.17.7-vs2.0.2-rc28x/fs/ocfs2/inode.c 2006-06-18 04:54:44 +0200 @@ -331,7 +331,6 @@ int ocfs2_populate_inode(struct inode *i OCFS2_LOCK_TYPE_DATA, inode); status = 0; - bail: mlog_exit(status); return status; diff -NurpP --minimal linux-2.6.17.7-vs2.0.2-rc28/fs/reiserfs/bitmap.c linux-2.6.17.7-vs2.0.2-rc28x/fs/reiserfs/bitmap.c --- linux-2.6.17.7-vs2.0.2-rc28/fs/reiserfs/bitmap.c 2006-07-12 14:13:21 +0200 +++ linux-2.6.17.7-vs2.0.2-rc28x/fs/reiserfs/bitmap.c 2006-08-14 22:34:18 +0200 @@ -1061,7 +1061,6 @@ static inline int blocknrs_and_prealloc_ if (quota_ret) hint->preallocate = hint->prealloc_size = 0; } - /* for unformatted nodes, force large allocations */ bigalloc = amount_needed; } diff -NurpP --minimal linux-2.6.17.7-vs2.0.2-rc28/include/asm-i386/elf.h linux-2.6.17.7-vs2.0.2-rc28x/include/asm-i386/elf.h --- linux-2.6.17.7-vs2.0.2-rc28/include/asm-i386/elf.h 2006-07-27 19:01:39 +0200 +++ linux-2.6.17.7-vs2.0.2-rc28x/include/asm-i386/elf.h 2006-08-14 22:34:07 +0200 @@ -71,7 +71,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_SIZE / 3 * 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.17.7-vs2.0.2-rc28/include/net/sock.h linux-2.6.17.7-vs2.0.2-rc28x/include/net/sock.h --- linux-2.6.17.7-vs2.0.2-rc28/include/net/sock.h 2006-07-12 14:13:22 +0200 +++ linux-2.6.17.7-vs2.0.2-rc28x/include/net/sock.h 2006-08-14 22:34:06 +0200 @@ -116,9 +116,9 @@ struct sock_common { unsigned int skc_hash; struct proto *skc_prot; xid_t skc_xid; - struct vx_info *skc_vx_info; + struct vx_info *skc_vx_info; nid_t skc_nid; - struct nx_info *skc_nx_info; + struct nx_info *skc_nx_info; }; /** diff -NurpP --minimal linux-2.6.17.7-vs2.0.2-rc28/kernel/capability.c linux-2.6.17.7-vs2.0.2-rc28x/kernel/capability.c --- linux-2.6.17.7-vs2.0.2-rc28/kernel/capability.c 2006-07-12 14:13:22 +0200 +++ linux-2.6.17.7-vs2.0.2-rc28x/kernel/capability.c 2006-08-14 22:34:19 +0200 @@ -253,4 +253,3 @@ int capable(int cap) return __capable(current, cap); } EXPORT_SYMBOL(capable); - diff -NurpP --minimal linux-2.6.17.7-vs2.0.2-rc28/kernel/exit.c linux-2.6.17.7-vs2.0.2-rc28x/kernel/exit.c --- linux-2.6.17.7-vs2.0.2-rc28/kernel/exit.c 2006-07-26 21:36:28 +0200 +++ linux-2.6.17.7-vs2.0.2-rc28x/kernel/exit.c 2006-08-14 22:34:19 +0200 @@ -294,7 +294,6 @@ static void reparent_to_init(void) ptrace_unlink(current); /* Reparent to init */ remove_parent(current); - /* FIXME: handle vchild_reaper/initpid */ current->parent = child_reaper; current->real_parent = child_reaper; add_parent(current); @@ -728,7 +727,6 @@ static void forget_original_parent(struc } list_for_each_safe(_p, _n, &father->ptrace_children) { p = list_entry(_p,struct task_struct,ptrace_list); - /* check for reaper context */ choose_new_parent(p, reaper); reparent_thread(p, father, 1); } diff -NurpP --minimal linux-2.6.17.7-vs2.0.2-rc28/kernel/fork.c linux-2.6.17.7-vs2.0.2-rc28x/kernel/fork.c --- linux-2.6.17.7-vs2.0.2-rc28/kernel/fork.c 2006-07-12 14:13:22 +0200 +++ linux-2.6.17.7-vs2.0.2-rc28x/kernel/fork.c 2006-08-14 22:34:17 +0200 @@ -1360,7 +1360,6 @@ long do_fork(unsigned long clone_flags, if (!pid) return -EAGAIN; - nr = pid->nr; if (unlikely(current->ptrace)) { trace = fork_traceflag (clone_flags); diff -NurpP --minimal linux-2.6.17.7-vs2.0.2-rc28/kernel/posix-timers.c linux-2.6.17.7-vs2.0.2-rc28x/kernel/posix-timers.c --- linux-2.6.17.7-vs2.0.2-rc28/kernel/posix-timers.c 2006-07-12 14:13:22 +0200 +++ linux-2.6.17.7-vs2.0.2-rc28x/kernel/posix-timers.c 2006-08-14 22:34:19 +0200 @@ -310,10 +310,9 @@ int posix_timer_event(struct k_itimer *t if (timr->it_sigev_notify & SIGEV_THREAD_ID) { struct task_struct *leader; - int ret; + int ret = send_sigqueue(timr->it_sigev_signo, timr->sigq, + timr->it_process); - ret = send_sigqueue(timr->it_sigev_signo, timr->sigq, - timr->it_process); if (likely(ret >= 0)) return ret; diff -NurpP --minimal linux-2.6.17.7-vs2.0.2-rc28/net/ipv4/udp.c linux-2.6.17.7-vs2.0.2-rc28x/net/ipv4/udp.c --- linux-2.6.17.7-vs2.0.2-rc28/net/ipv4/udp.c 2006-07-12 14:13:23 +0200 +++ linux-2.6.17.7-vs2.0.2-rc28x/net/ipv4/udp.c 2006-08-14 22:34:07 +0200 @@ -216,7 +216,6 @@ static void udp_v4_unhash(struct sock *s write_unlock_bh(&udp_hash_lock); } - /* UDP is nearly always wildcards out the wazoo, it makes no sense to try * harder than this. -DaveM */