Author: arekm Date: Mon Feb 13 20:03:27 2012 GMT Module: packages Tag: LINUX_3_0 ---- Log message: - up to 3.0.21; updated vserver and unionfs
---- Files affected: packages/kernel: kernel-unionfs.patch (1.14.2.1 -> 1.14.2.2) , kernel-vserver-2.3.patch (1.83.2.9 -> 1.83.2.10) , kernel.spec (1.987.2.33 -> 1.987.2.34) ---- Diffs: ================================================================ Index: packages/kernel/kernel-unionfs.patch diff -u packages/kernel/kernel-unionfs.patch:1.14.2.1 packages/kernel/kernel-unionfs.patch:1.14.2.2 --- packages/kernel/kernel-unionfs.patch:1.14.2.1 Tue Nov 22 10:50:51 2011 +++ packages/kernel/kernel-unionfs.patch Mon Feb 13 21:03:21 2012 @@ -532,7 +532,7 @@ + +For more information, see <http://unionfs.filesystems.org/>. diff --git a/MAINTAINERS b/MAINTAINERS -index 187282d..f77de31 100644 +index de85391..aacd198 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6386,6 +6386,14 @@ F: Documentation/cdrom/ @@ -575,10 +575,10 @@ obj-$(CONFIG_NFS_FS) += nfs/ obj-$(CONFIG_EXPORTFS) += exportfs/ diff --git a/fs/namei.c b/fs/namei.c -index 14ab8d3..9b73afa 100644 +index f7593c0..c988d59 100644 --- a/fs/namei.c +++ b/fs/namei.c -@@ -486,6 +486,7 @@ void release_open_intent(struct nameidata *nd) +@@ -488,6 +488,7 @@ void release_open_intent(struct nameidata *nd) fput(file); } } @@ -586,7 +586,7 @@ static inline int d_revalidate(struct dentry *dentry, struct nameidata *nd) { -@@ -1747,6 +1748,42 @@ struct dentry *lookup_one_len(const char *name, struct dentry *base, int len) +@@ -1755,6 +1756,42 @@ struct dentry *lookup_one_len(const char *name, struct dentry *base, int len) return __lookup_hash(&this, base, NULL); } @@ -626,10 +626,10 @@ + return __lookup_hash(&this, base, nd); +} + - int user_path_at(int dfd, const char __user *name, unsigned flags, - struct path *path) + int user_path_at_empty(int dfd, const char __user *name, unsigned flags, + struct path *path, int *empty) { -@@ -3346,6 +3383,7 @@ EXPORT_SYMBOL(get_write_access); /* binfmt_aout */ +@@ -3375,6 +3412,7 @@ EXPORT_SYMBOL(get_write_access); /* binfmt_aout */ EXPORT_SYMBOL(getname); EXPORT_SYMBOL(lock_rename); EXPORT_SYMBOL(lookup_one_len); @@ -774,11 +774,11 @@ + If you say Y here, you can turn on debugging output from Unionfs. diff --git a/fs/unionfs/Makefile b/fs/unionfs/Makefile new file mode 100644 -index 0000000..a1e4354 +index 0000000..16ce225 --- /dev/null +++ b/fs/unionfs/Makefile @@ -0,0 +1,17 @@ -+UNIONFS_VERSION="2.5.10 (for 3.0.4)" ++UNIONFS_VERSION="2.5.11 (for 3.0.18)" + +EXTRA_CFLAGS += -DUNIONFS_VERSION=\"$(UNIONFS_VERSION)\" + @@ -6525,7 +6525,7 @@ +} diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c new file mode 100644 -index 0000000..f4bcd89 +index 0000000..99aab4c --- /dev/null +++ b/fs/unionfs/main.c @@ -0,0 +1,763 @@ @@ -7231,7 +7231,7 @@ + struct dentry *dentry; + + dentry = mount_nodev(fs_type, flags, raw_data, unionfs_read_super); -+ if (!PTR_ERR(dentry)) ++ if (!IS_ERR(dentry)) + UNIONFS_SB(dentry->d_sb)->dev_name = + kstrdup(dev_name, GFP_KERNEL); + return dentry; @@ -11342,10 +11342,10 @@ #define USBDEVICE_SUPER_MAGIC 0x9fa2 #define CGROUP_SUPER_MAGIC 0x27e0eb diff --git a/include/linux/namei.h b/include/linux/namei.h -index eba45ea..8e19e9c 100644 +index 82ab16b..0afd70b 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h -@@ -81,8 +81,11 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, +@@ -83,8 +83,11 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, int (*open)(struct inode *, struct file *)); ================================================================ Index: packages/kernel/kernel-vserver-2.3.patch diff -u packages/kernel/kernel-vserver-2.3.patch:1.83.2.9 packages/kernel/kernel-vserver-2.3.patch:1.83.2.10 --- packages/kernel/kernel-vserver-2.3.patch:1.83.2.9 Fri Feb 3 23:18:45 2012 +++ packages/kernel/kernel-vserver-2.3.patch Mon Feb 13 21:03:21 2012 @@ -1,6 +1,6 @@ -diff -NurpP --minimal linux-3.0.18/Documentation/vserver/debug.txt linux-3.0.18-vs2.3.2.2/Documentation/vserver/debug.txt ---- linux-3.0.18/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.0.18-vs2.3.2.2/Documentation/vserver/debug.txt 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/Documentation/vserver/debug.txt linux-3.0.20-vs2.3.2.2/Documentation/vserver/debug.txt +--- linux-3.0.20/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.0.20-vs2.3.2.2/Documentation/vserver/debug.txt 2011-06-10 22:11:24.000000000 +0200 @@ -0,0 +1,154 @@ + +debug_cvirt: @@ -156,9 +156,9 @@ + m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s" + "vx_acc_pages[%5d,%s,%2d]: %5d += %5d" + "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d" -diff -NurpP --minimal linux-3.0.18/arch/alpha/Kconfig linux-3.0.18-vs2.3.2.2/arch/alpha/Kconfig ---- linux-3.0.18/arch/alpha/Kconfig 2011-07-22 11:17:32.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/alpha/Kconfig 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/alpha/Kconfig linux-3.0.20-vs2.3.2.2/arch/alpha/Kconfig +--- linux-3.0.20/arch/alpha/Kconfig 2011-07-22 11:17:32.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/alpha/Kconfig 2011-06-10 22:11:24.000000000 +0200 @@ -668,6 +668,8 @@ config DUMMY_CONSOLE depends on VGA_HOSE default y @@ -168,9 +168,9 @@ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.0.18/arch/alpha/kernel/entry.S linux-3.0.18-vs2.3.2.2/arch/alpha/kernel/entry.S ---- linux-3.0.18/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/alpha/kernel/entry.S 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/alpha/kernel/entry.S linux-3.0.20-vs2.3.2.2/arch/alpha/kernel/entry.S +--- linux-3.0.20/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/alpha/kernel/entry.S 2011-06-10 22:11:24.000000000 +0200 @@ -860,24 +860,15 @@ sys_getxgid: .globl sys_getxpid .ent sys_getxpid @@ -203,9 +203,9 @@ ret .end sys_getxpid -diff -NurpP --minimal linux-3.0.18/arch/alpha/kernel/ptrace.c linux-3.0.18-vs2.3.2.2/arch/alpha/kernel/ptrace.c ---- linux-3.0.18/arch/alpha/kernel/ptrace.c 2011-01-05 21:48:40.000000000 +0100 -+++ linux-3.0.18-vs2.3.2.2/arch/alpha/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/alpha/kernel/ptrace.c linux-3.0.20-vs2.3.2.2/arch/alpha/kernel/ptrace.c +--- linux-3.0.20/arch/alpha/kernel/ptrace.c 2011-01-05 21:48:40.000000000 +0100 ++++ linux-3.0.20-vs2.3.2.2/arch/alpha/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200 @@ -13,6 +13,7 @@ #include <linux/user.h> #include <linux/security.h> @@ -214,9 +214,9 @@ #include <asm/uaccess.h> #include <asm/pgtable.h> -diff -NurpP --minimal linux-3.0.18/arch/alpha/kernel/systbls.S linux-3.0.18-vs2.3.2.2/arch/alpha/kernel/systbls.S ---- linux-3.0.18/arch/alpha/kernel/systbls.S 2011-07-22 11:17:32.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/alpha/kernel/systbls.S 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/alpha/kernel/systbls.S linux-3.0.20-vs2.3.2.2/arch/alpha/kernel/systbls.S +--- linux-3.0.20/arch/alpha/kernel/systbls.S 2011-07-22 11:17:32.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/alpha/kernel/systbls.S 2011-06-10 22:11:24.000000000 +0200 @@ -446,7 +446,7 @@ sys_call_table: .quad sys_stat64 /* 425 */ .quad sys_lstat64 @@ -226,9 +226,9 @@ .quad sys_ni_syscall /* sys_mbind */ .quad sys_ni_syscall /* sys_get_mempolicy */ .quad sys_ni_syscall /* sys_set_mempolicy */ -diff -NurpP --minimal linux-3.0.18/arch/alpha/kernel/traps.c linux-3.0.18-vs2.3.2.2/arch/alpha/kernel/traps.c ---- linux-3.0.18/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/alpha/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/alpha/kernel/traps.c linux-3.0.20-vs2.3.2.2/arch/alpha/kernel/traps.c +--- linux-3.0.20/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/alpha/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200 @@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs #ifdef CONFIG_SMP printk("CPU %d ", hard_smp_processor_id()); @@ -239,9 +239,9 @@ dik_show_regs(regs, r9_15); add_taint(TAINT_DIE); dik_show_trace((unsigned long *)(regs+1)); -diff -NurpP --minimal linux-3.0.18/arch/arm/Kconfig linux-3.0.18-vs2.3.2.2/arch/arm/Kconfig ---- linux-3.0.18/arch/arm/Kconfig 2012-01-26 08:35:25.000000000 +0100 -+++ linux-3.0.18-vs2.3.2.2/arch/arm/Kconfig 2011-12-19 15:55:53.000000000 +0100 +diff -NurpP --minimal linux-3.0.20/arch/arm/Kconfig linux-3.0.20-vs2.3.2.2/arch/arm/Kconfig +--- linux-3.0.20/arch/arm/Kconfig 2012-02-07 01:50:09.000000000 +0100 ++++ linux-3.0.20-vs2.3.2.2/arch/arm/Kconfig 2011-12-19 15:55:53.000000000 +0100 @@ -2061,6 +2061,8 @@ source "fs/Kconfig" source "arch/arm/Kconfig.debug" @@ -251,9 +251,9 @@ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.0.18/arch/arm/kernel/calls.S linux-3.0.18-vs2.3.2.2/arch/arm/kernel/calls.S ---- linux-3.0.18/arch/arm/kernel/calls.S 2011-07-22 11:17:32.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/arm/kernel/calls.S 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/arm/kernel/calls.S linux-3.0.20-vs2.3.2.2/arch/arm/kernel/calls.S +--- linux-3.0.20/arch/arm/kernel/calls.S 2011-07-22 11:17:32.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/arm/kernel/calls.S 2011-06-10 22:11:24.000000000 +0200 @@ -322,7 +322,7 @@ /* 310 */ CALL(sys_request_key) CALL(sys_keyctl) @@ -263,9 +263,9 @@ CALL(sys_ioprio_set) /* 315 */ CALL(sys_ioprio_get) CALL(sys_inotify_init) -diff -NurpP --minimal linux-3.0.18/arch/arm/kernel/process.c linux-3.0.18-vs2.3.2.2/arch/arm/kernel/process.c ---- linux-3.0.18/arch/arm/kernel/process.c 2012-01-26 08:35:25.000000000 +0100 -+++ linux-3.0.18-vs2.3.2.2/arch/arm/kernel/process.c 2011-12-19 15:55:53.000000000 +0100 +diff -NurpP --minimal linux-3.0.20/arch/arm/kernel/process.c linux-3.0.20-vs2.3.2.2/arch/arm/kernel/process.c +--- linux-3.0.20/arch/arm/kernel/process.c 2012-02-07 01:50:09.000000000 +0100 ++++ linux-3.0.20-vs2.3.2.2/arch/arm/kernel/process.c 2011-12-19 15:55:53.000000000 +0100 @@ -318,7 +318,8 @@ void __show_regs(struct pt_regs *regs) void show_regs(struct pt_regs * regs) { @@ -276,9 +276,9 @@ __show_regs(regs); __backtrace(); } -diff -NurpP --minimal linux-3.0.18/arch/arm/kernel/traps.c linux-3.0.18-vs2.3.2.2/arch/arm/kernel/traps.c ---- linux-3.0.18/arch/arm/kernel/traps.c 2011-07-22 11:17:32.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/arm/kernel/traps.c 2011-06-22 12:39:12.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/arm/kernel/traps.c linux-3.0.20-vs2.3.2.2/arch/arm/kernel/traps.c +--- linux-3.0.20/arch/arm/kernel/traps.c 2011-07-22 11:17:32.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/arm/kernel/traps.c 2011-06-22 12:39:12.000000000 +0200 @@ -242,8 +242,8 @@ static int __die(const char *str, int er print_modules(); @@ -290,9 +290,9 @@ if (!user_mode(regs) || in_interrupt()) { dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp, -diff -NurpP --minimal linux-3.0.18/arch/cris/Kconfig linux-3.0.18-vs2.3.2.2/arch/cris/Kconfig ---- linux-3.0.18/arch/cris/Kconfig 2011-07-22 11:17:35.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/cris/Kconfig 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/cris/Kconfig linux-3.0.20-vs2.3.2.2/arch/cris/Kconfig +--- linux-3.0.20/arch/cris/Kconfig 2011-07-22 11:17:35.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/cris/Kconfig 2011-06-10 22:11:24.000000000 +0200 @@ -678,6 +678,8 @@ source "drivers/staging/Kconfig" source "arch/cris/Kconfig.debug" @@ -302,9 +302,9 @@ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.0.18/arch/frv/kernel/kernel_thread.S linux-3.0.18-vs2.3.2.2/arch/frv/kernel/kernel_thread.S ---- linux-3.0.18/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.0.18-vs2.3.2.2/arch/frv/kernel/kernel_thread.S 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/frv/kernel/kernel_thread.S linux-3.0.20-vs2.3.2.2/arch/frv/kernel/kernel_thread.S +--- linux-3.0.20/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100 ++++ linux-3.0.20-vs2.3.2.2/arch/frv/kernel/kernel_thread.S 2011-06-10 22:11:24.000000000 +0200 @@ -37,7 +37,7 @@ kernel_thread: # start by forking the current process, but with shared VM @@ -314,9 +314,9 @@ sethi.p #0xe4e4,gr9 ; second syscall arg [newsp] setlo #0xe4e4,gr9 setlos.p #0,gr10 ; third syscall arg [parent_tidptr] -diff -NurpP --minimal linux-3.0.18/arch/h8300/Kconfig linux-3.0.18-vs2.3.2.2/arch/h8300/Kconfig ---- linux-3.0.18/arch/h8300/Kconfig 2011-07-22 11:17:35.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/h8300/Kconfig 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/h8300/Kconfig linux-3.0.20-vs2.3.2.2/arch/h8300/Kconfig +--- linux-3.0.20/arch/h8300/Kconfig 2011-07-22 11:17:35.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/h8300/Kconfig 2011-06-10 22:11:24.000000000 +0200 @@ -213,6 +213,8 @@ source "fs/Kconfig" source "arch/h8300/Kconfig.debug" @@ -326,9 +326,9 @@ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.0.18/arch/ia64/Kconfig linux-3.0.18-vs2.3.2.2/arch/ia64/Kconfig ---- linux-3.0.18/arch/ia64/Kconfig 2011-07-22 11:17:35.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/ia64/Kconfig 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/ia64/Kconfig linux-3.0.20-vs2.3.2.2/arch/ia64/Kconfig +--- linux-3.0.20/arch/ia64/Kconfig 2011-07-22 11:17:35.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/ia64/Kconfig 2011-06-10 22:11:24.000000000 +0200 @@ -671,6 +671,8 @@ source "fs/Kconfig" source "arch/ia64/Kconfig.debug" @@ -338,9 +338,9 @@ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.0.18/arch/ia64/include/asm/tlb.h linux-3.0.18-vs2.3.2.2/arch/ia64/include/asm/tlb.h ---- linux-3.0.18/arch/ia64/include/asm/tlb.h 2011-07-22 11:17:35.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/ia64/include/asm/tlb.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/ia64/include/asm/tlb.h linux-3.0.20-vs2.3.2.2/arch/ia64/include/asm/tlb.h +--- linux-3.0.20/arch/ia64/include/asm/tlb.h 2011-07-22 11:17:35.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/ia64/include/asm/tlb.h 2011-06-10 22:11:24.000000000 +0200 @@ -40,6 +40,7 @@ #include <linux/mm.h> #include <linux/pagemap.h> @@ -349,9 +349,9 @@ #include <asm/pgalloc.h> #include <asm/processor.h> -diff -NurpP --minimal linux-3.0.18/arch/ia64/kernel/entry.S linux-3.0.18-vs2.3.2.2/arch/ia64/kernel/entry.S ---- linux-3.0.18/arch/ia64/kernel/entry.S 2011-07-22 11:17:35.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/ia64/kernel/entry.S 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/ia64/kernel/entry.S linux-3.0.20-vs2.3.2.2/arch/ia64/kernel/entry.S +--- linux-3.0.20/arch/ia64/kernel/entry.S 2011-07-22 11:17:35.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/ia64/kernel/entry.S 2011-06-10 22:11:24.000000000 +0200 @@ -1714,7 +1714,7 @@ sys_call_table: data8 sys_mq_notify data8 sys_mq_getsetattr @@ -361,9 +361,9 @@ data8 sys_waitid // 1270 data8 sys_add_key data8 sys_request_key -diff -NurpP --minimal linux-3.0.18/arch/ia64/kernel/perfmon.c linux-3.0.18-vs2.3.2.2/arch/ia64/kernel/perfmon.c ---- linux-3.0.18/arch/ia64/kernel/perfmon.c 2011-03-15 18:06:39.000000000 +0100 -+++ linux-3.0.18-vs2.3.2.2/arch/ia64/kernel/perfmon.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/ia64/kernel/perfmon.c linux-3.0.20-vs2.3.2.2/arch/ia64/kernel/perfmon.c +--- linux-3.0.20/arch/ia64/kernel/perfmon.c 2011-03-15 18:06:39.000000000 +0100 ++++ linux-3.0.20-vs2.3.2.2/arch/ia64/kernel/perfmon.c 2011-06-10 22:11:24.000000000 +0200 @@ -42,6 +42,7 @@ #include <linux/completion.h> #include <linux/tracehook.h> @@ -372,9 +372,9 @@ #include <asm/errno.h> #include <asm/intrinsics.h> -diff -NurpP --minimal linux-3.0.18/arch/ia64/kernel/process.c linux-3.0.18-vs2.3.2.2/arch/ia64/kernel/process.c ---- linux-3.0.18/arch/ia64/kernel/process.c 2011-03-15 18:06:39.000000000 +0100 -+++ linux-3.0.18-vs2.3.2.2/arch/ia64/kernel/process.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/ia64/kernel/process.c linux-3.0.20-vs2.3.2.2/arch/ia64/kernel/process.c +--- linux-3.0.20/arch/ia64/kernel/process.c 2011-03-15 18:06:39.000000000 +0100 ++++ linux-3.0.20-vs2.3.2.2/arch/ia64/kernel/process.c 2011-06-10 22:11:24.000000000 +0200 @@ -109,8 +109,8 @@ show_regs (struct pt_regs *regs) unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri; @@ -386,9 +386,9 @@ printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n", regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(), init_utsname()->release); -diff -NurpP --minimal linux-3.0.18/arch/ia64/kernel/ptrace.c linux-3.0.18-vs2.3.2.2/arch/ia64/kernel/ptrace.c ---- linux-3.0.18/arch/ia64/kernel/ptrace.c 2011-01-05 21:48:59.000000000 +0100 -+++ linux-3.0.18-vs2.3.2.2/arch/ia64/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/ia64/kernel/ptrace.c linux-3.0.20-vs2.3.2.2/arch/ia64/kernel/ptrace.c +--- linux-3.0.20/arch/ia64/kernel/ptrace.c 2011-01-05 21:48:59.000000000 +0100 ++++ linux-3.0.20-vs2.3.2.2/arch/ia64/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200 @@ -21,6 +21,7 @@ #include <linux/regset.h> #include <linux/elf.h> @@ -397,9 +397,9 @@ #include <asm/pgtable.h> #include <asm/processor.h> -diff -NurpP --minimal linux-3.0.18/arch/ia64/kernel/traps.c linux-3.0.18-vs2.3.2.2/arch/ia64/kernel/traps.c ---- linux-3.0.18/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/ia64/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/ia64/kernel/traps.c linux-3.0.20-vs2.3.2.2/arch/ia64/kernel/traps.c +--- linux-3.0.20/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/ia64/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200 @@ -59,8 +59,9 @@ die (const char *str, struct pt_regs *re put_cpu(); @@ -424,9 +424,9 @@ } } } -diff -NurpP --minimal linux-3.0.18/arch/ia64/mm/fault.c linux-3.0.18-vs2.3.2.2/arch/ia64/mm/fault.c ---- linux-3.0.18/arch/ia64/mm/fault.c 2011-07-22 11:17:35.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/ia64/mm/fault.c 2011-06-10 22:28:23.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/ia64/mm/fault.c linux-3.0.20-vs2.3.2.2/arch/ia64/mm/fault.c +--- linux-3.0.20/arch/ia64/mm/fault.c 2011-07-22 11:17:35.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/ia64/mm/fault.c 2011-06-10 22:28:23.000000000 +0200 @@ -11,6 +11,7 @@ #include <linux/kprobes.h> #include <linux/kdebug.h> @@ -435,9 +435,9 @@ #include <asm/pgtable.h> #include <asm/processor.h> -diff -NurpP --minimal linux-3.0.18/arch/m32r/kernel/traps.c linux-3.0.18-vs2.3.2.2/arch/m32r/kernel/traps.c ---- linux-3.0.18/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100 -+++ linux-3.0.18-vs2.3.2.2/arch/m32r/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/m32r/kernel/traps.c linux-3.0.20-vs2.3.2.2/arch/m32r/kernel/traps.c +--- linux-3.0.20/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100 ++++ linux-3.0.20-vs2.3.2.2/arch/m32r/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200 @@ -196,8 +196,9 @@ static void show_registers(struct pt_reg } else { printk("SPI: %08lx\n", sp); @@ -450,9 +450,9 @@ /* * When in-kernel, we also print out the stack and code at the -diff -NurpP --minimal linux-3.0.18/arch/m68k/Kconfig linux-3.0.18-vs2.3.2.2/arch/m68k/Kconfig ---- linux-3.0.18/arch/m68k/Kconfig 2011-07-22 11:17:35.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/m68k/Kconfig 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/m68k/Kconfig linux-3.0.20-vs2.3.2.2/arch/m68k/Kconfig +--- linux-3.0.20/arch/m68k/Kconfig 2011-07-22 11:17:35.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/m68k/Kconfig 2011-06-10 22:11:24.000000000 +0200 @@ -241,6 +241,8 @@ source "fs/Kconfig" source "arch/m68k/Kconfig.debug" @@ -462,9 +462,9 @@ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.0.18/arch/mips/Kconfig linux-3.0.18-vs2.3.2.2/arch/mips/Kconfig ---- linux-3.0.18/arch/mips/Kconfig 2011-07-22 11:17:35.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/mips/Kconfig 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/mips/Kconfig linux-3.0.20-vs2.3.2.2/arch/mips/Kconfig +--- linux-3.0.20/arch/mips/Kconfig 2011-07-22 11:17:35.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/mips/Kconfig 2011-06-10 22:11:24.000000000 +0200 @@ -2485,6 +2485,8 @@ source "fs/Kconfig" source "arch/mips/Kconfig.debug" @@ -474,9 +474,9 @@ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.0.18/arch/mips/kernel/ptrace.c linux-3.0.18-vs2.3.2.2/arch/mips/kernel/ptrace.c ---- linux-3.0.18/arch/mips/kernel/ptrace.c 2011-07-22 11:17:36.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/mips/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/mips/kernel/ptrace.c linux-3.0.20-vs2.3.2.2/arch/mips/kernel/ptrace.c +--- linux-3.0.20/arch/mips/kernel/ptrace.c 2011-07-22 11:17:36.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/mips/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200 @@ -25,6 +25,7 @@ #include <linux/security.h> #include <linux/audit.h> @@ -495,9 +495,9 @@ switch (request) { /* when I and D space are separate, these will need to be fixed. */ case PTRACE_PEEKTEXT: /* read word at location addr. */ -diff -NurpP --minimal linux-3.0.18/arch/mips/kernel/scall32-o32.S linux-3.0.18-vs2.3.2.2/arch/mips/kernel/scall32-o32.S ---- linux-3.0.18/arch/mips/kernel/scall32-o32.S 2011-07-22 11:17:36.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/mips/kernel/scall32-o32.S 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/mips/kernel/scall32-o32.S linux-3.0.20-vs2.3.2.2/arch/mips/kernel/scall32-o32.S +--- linux-3.0.20/arch/mips/kernel/scall32-o32.S 2011-07-22 11:17:36.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/mips/kernel/scall32-o32.S 2011-06-10 22:11:24.000000000 +0200 @@ -523,7 +523,7 @@ einval: li v0, -ENOSYS sys sys_mq_timedreceive 5 sys sys_mq_notify 2 /* 4275 */ @@ -507,9 +507,9 @@ sys sys_waitid 5 sys sys_ni_syscall 0 /* available, was setaltroot */ sys sys_add_key 5 /* 4280 */ -diff -NurpP --minimal linux-3.0.18/arch/mips/kernel/scall64-64.S linux-3.0.18-vs2.3.2.2/arch/mips/kernel/scall64-64.S ---- linux-3.0.18/arch/mips/kernel/scall64-64.S 2011-07-22 11:17:36.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/mips/kernel/scall64-64.S 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/mips/kernel/scall64-64.S linux-3.0.20-vs2.3.2.2/arch/mips/kernel/scall64-64.S +--- linux-3.0.20/arch/mips/kernel/scall64-64.S 2011-07-22 11:17:36.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/mips/kernel/scall64-64.S 2011-06-10 22:11:24.000000000 +0200 @@ -362,7 +362,7 @@ sys_call_table: PTR sys_mq_timedreceive PTR sys_mq_notify @@ -519,9 +519,9 @@ PTR sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-3.0.18/arch/mips/kernel/scall64-n32.S linux-3.0.18-vs2.3.2.2/arch/mips/kernel/scall64-n32.S ---- linux-3.0.18/arch/mips/kernel/scall64-n32.S 2011-07-22 11:17:36.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/mips/kernel/scall64-n32.S 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/mips/kernel/scall64-n32.S linux-3.0.20-vs2.3.2.2/arch/mips/kernel/scall64-n32.S +--- linux-3.0.20/arch/mips/kernel/scall64-n32.S 2011-07-22 11:17:36.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/mips/kernel/scall64-n32.S 2011-06-10 22:11:24.000000000 +0200 @@ -361,7 +361,7 @@ EXPORT(sysn32_call_table) PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify @@ -531,9 +531,9 @@ PTR compat_sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-3.0.18/arch/mips/kernel/scall64-o32.S linux-3.0.18-vs2.3.2.2/arch/mips/kernel/scall64-o32.S ---- linux-3.0.18/arch/mips/kernel/scall64-o32.S 2011-07-22 11:17:36.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/mips/kernel/scall64-o32.S 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/mips/kernel/scall64-o32.S linux-3.0.20-vs2.3.2.2/arch/mips/kernel/scall64-o32.S +--- linux-3.0.20/arch/mips/kernel/scall64-o32.S 2011-07-22 11:17:36.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/mips/kernel/scall64-o32.S 2011-06-10 22:11:24.000000000 +0200 @@ -480,7 +480,7 @@ sys_call_table: PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify /* 4275 */ @@ -543,9 +543,9 @@ PTR sys_32_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key /* 4280 */ -diff -NurpP --minimal linux-3.0.18/arch/mips/kernel/traps.c linux-3.0.18-vs2.3.2.2/arch/mips/kernel/traps.c ---- linux-3.0.18/arch/mips/kernel/traps.c 2011-05-22 16:17:00.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/mips/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/mips/kernel/traps.c linux-3.0.20-vs2.3.2.2/arch/mips/kernel/traps.c +--- linux-3.0.20/arch/mips/kernel/traps.c 2011-05-22 16:17:00.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/mips/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200 @@ -343,9 +343,10 @@ void show_registers(struct pt_regs *regs __show_regs(regs); @@ -560,9 +560,9 @@ if (cpu_has_userlocal) { unsigned long tls; -diff -NurpP --minimal linux-3.0.18/arch/parisc/Kconfig linux-3.0.18-vs2.3.2.2/arch/parisc/Kconfig ---- linux-3.0.18/arch/parisc/Kconfig 2011-07-22 11:17:36.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/parisc/Kconfig 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/parisc/Kconfig linux-3.0.20-vs2.3.2.2/arch/parisc/Kconfig +--- linux-3.0.20/arch/parisc/Kconfig 2011-07-22 11:17:36.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/parisc/Kconfig 2011-06-10 22:11:24.000000000 +0200 @@ -279,6 +279,8 @@ source "fs/Kconfig" source "arch/parisc/Kconfig.debug" @@ -572,9 +572,9 @@ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.0.18/arch/parisc/kernel/syscall_table.S linux-3.0.18-vs2.3.2.2/arch/parisc/kernel/syscall_table.S ---- linux-3.0.18/arch/parisc/kernel/syscall_table.S 2012-01-26 08:35:25.000000000 +0100 -+++ linux-3.0.18-vs2.3.2.2/arch/parisc/kernel/syscall_table.S 2011-08-29 03:45:07.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/parisc/kernel/syscall_table.S linux-3.0.20-vs2.3.2.2/arch/parisc/kernel/syscall_table.S +--- linux-3.0.20/arch/parisc/kernel/syscall_table.S 2012-02-07 01:50:09.000000000 +0100 ++++ linux-3.0.20-vs2.3.2.2/arch/parisc/kernel/syscall_table.S 2011-08-29 03:45:07.000000000 +0200 @@ -361,7 +361,7 @@ ENTRY_COMP(mbind) /* 260 */ ENTRY_COMP(get_mempolicy) @@ -584,9 +584,9 @@ ENTRY_SAME(add_key) ENTRY_SAME(request_key) /* 265 */ ENTRY_SAME(keyctl) -diff -NurpP --minimal linux-3.0.18/arch/parisc/kernel/traps.c linux-3.0.18-vs2.3.2.2/arch/parisc/kernel/traps.c ---- linux-3.0.18/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/parisc/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/parisc/kernel/traps.c linux-3.0.20-vs2.3.2.2/arch/parisc/kernel/traps.c +--- linux-3.0.20/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/parisc/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200 @@ -236,8 +236,9 @@ void die_if_kernel(char *str, struct pt_ if (err == 0) return; /* STFU */ @@ -610,9 +610,9 @@ /* Wot's wrong wif bein' racy? */ if (current->thread.flags & PARISC_KERNEL_DEATH) { -diff -NurpP --minimal linux-3.0.18/arch/parisc/mm/fault.c linux-3.0.18-vs2.3.2.2/arch/parisc/mm/fault.c ---- linux-3.0.18/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/parisc/mm/fault.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/parisc/mm/fault.c linux-3.0.20-vs2.3.2.2/arch/parisc/mm/fault.c +--- linux-3.0.20/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/parisc/mm/fault.c 2011-06-10 22:11:24.000000000 +0200 @@ -237,8 +237,9 @@ bad_area: #ifdef PRINT_USER_FAULTS @@ -625,9 +625,9 @@ if (vma) { printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n", vma->vm_start, vma->vm_end); -diff -NurpP --minimal linux-3.0.18/arch/powerpc/Kconfig linux-3.0.18-vs2.3.2.2/arch/powerpc/Kconfig ---- linux-3.0.18/arch/powerpc/Kconfig 2011-07-22 11:17:36.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/powerpc/Kconfig 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/powerpc/Kconfig linux-3.0.20-vs2.3.2.2/arch/powerpc/Kconfig +--- linux-3.0.20/arch/powerpc/Kconfig 2011-07-22 11:17:36.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/powerpc/Kconfig 2011-06-10 22:11:24.000000000 +0200 @@ -978,6 +978,8 @@ source "lib/Kconfig" source "arch/powerpc/Kconfig.debug" @@ -637,9 +637,9 @@ source "security/Kconfig" config KEYS_COMPAT -diff -NurpP --minimal linux-3.0.18/arch/powerpc/include/asm/unistd.h linux-3.0.18-vs2.3.2.2/arch/powerpc/include/asm/unistd.h ---- linux-3.0.18/arch/powerpc/include/asm/unistd.h 2011-07-22 11:17:40.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/powerpc/include/asm/unistd.h 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/powerpc/include/asm/unistd.h linux-3.0.20-vs2.3.2.2/arch/powerpc/include/asm/unistd.h +--- linux-3.0.20/arch/powerpc/include/asm/unistd.h 2011-07-22 11:17:40.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/powerpc/include/asm/unistd.h 2011-06-10 22:11:24.000000000 +0200 @@ -275,7 +275,7 @@ #endif #define __NR_rtas 255 @@ -649,9 +649,9 @@ #define __NR_migrate_pages 258 #define __NR_mbind 259 #define __NR_get_mempolicy 260 -diff -NurpP --minimal linux-3.0.18/arch/powerpc/kernel/process.c linux-3.0.18-vs2.3.2.2/arch/powerpc/kernel/process.c ---- linux-3.0.18/arch/powerpc/kernel/process.c 2011-07-22 11:17:40.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/powerpc/kernel/process.c 2011-06-10 22:11:24.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/powerpc/kernel/process.c linux-3.0.20-vs2.3.2.2/arch/powerpc/kernel/process.c +--- linux-3.0.20/arch/powerpc/kernel/process.c 2011-07-22 11:17:40.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/powerpc/kernel/process.c 2011-06-10 22:11:24.000000000 +0200 @@ -656,8 +656,9 @@ void show_regs(struct pt_regs * regs) #else printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr); @@ -664,9 +664,9 @@ #ifdef CONFIG_SMP printk(" CPU: %d", raw_smp_processor_id()); -diff -NurpP --minimal linux-3.0.18/arch/powerpc/kernel/traps.c linux-3.0.18-vs2.3.2.2/arch/powerpc/kernel/traps.c ---- linux-3.0.18/arch/powerpc/kernel/traps.c 2011-07-22 11:17:40.000000000 +0200 -+++ linux-3.0.18-vs2.3.2.2/arch/powerpc/kernel/traps.c 2011-07-19 00:44:39.000000000 +0200 +diff -NurpP --minimal linux-3.0.20/arch/powerpc/kernel/traps.c linux-3.0.20-vs2.3.2.2/arch/powerpc/kernel/traps.c +--- linux-3.0.20/arch/powerpc/kernel/traps.c 2011-07-22 11:17:40.000000000 +0200 ++++ linux-3.0.20-vs2.3.2.2/arch/powerpc/kernel/traps.c 2011-07-19 00:44:39.000000000 +0200 @@ -1075,8 +1075,9 @@ void nonrecoverable_exception(struct pt_ void trace_syscall(struct pt_regs *regs) @@ -679,9 +679,9 @@ regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted()); } -diff -NurpP --minimal linux-3.0.18/arch/powerpc/kernel/vdso.c linux-3.0.18-vs2.3.2.2/arch/powerpc/kernel/vdso.c ---- linux-3.0.18/arch/powerpc/kernel/vdso.c 2011-05-22 16:17:02.000000000 +0200 <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-unionfs.patch?r1=1.14.2.1&r2=1.14.2.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.83.2.9&r2=1.83.2.10&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.987.2.33&r2=1.987.2.34&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
