packages: kernel/kernel-grsec_full.patch, kernel/kernel-small_fixes.patch, ...

arekm arekm at pld-linux.org
Wed Oct 12 19:27:55 CEST 2011


Author: arekm                        Date: Wed Oct 12 17:27:55 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- real 3.0.6

---- Files affected:
packages/kernel:
   kernel-grsec_full.patch (1.82 -> 1.83) , kernel-small_fixes.patch (1.37 -> 1.38) , kernel-vserver-2.3.patch (1.82 -> 1.83) , kernel-vserver-fixes.patch (1.24 -> 1.25) , kernel.spec (1.982 -> 1.983) , patch-3.0.6 (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/kernel/kernel-grsec_full.patch
diff -u packages/kernel/kernel-grsec_full.patch:1.82 packages/kernel/kernel-grsec_full.patch:1.83
--- packages/kernel/kernel-grsec_full.patch:1.82	Wed Oct 12 17:45:19 2011
+++ packages/kernel/kernel-grsec_full.patch	Wed Oct 12 19:27:48 2011
@@ -3057,19 +3057,20 @@
 diff -urNp linux-3.0.4/arch/sparc/include/asm/elf_64.h linux-3.0.4/arch/sparc/include/asm/elf_64.h
 --- linux-3.0.4/arch/sparc/include/asm/elf_64.h	2011-09-02 18:11:21.000000000 -0400
 +++ linux-3.0.4/arch/sparc/include/asm/elf_64.h	2011-08-23 21:47:55.000000000 -0400
-@@ -162,6 +162,12 @@ typedef struct {
+@@ -180,6 +180,13 @@ typedef struct {
  #define ELF_ET_DYN_BASE		0x0000010000000000UL
  #define COMPAT_ELF_ET_DYN_BASE	0x0000000070000000UL
  
 +#ifdef CONFIG_PAX_ASLR
-+#define PAX_ELF_ET_DYN_BASE    (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
++#define PAX_ELF_ET_DYN_BASE	(test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
 +
-+#define PAX_DELTA_MMAP_LEN     (test_thread_flag(TIF_32BIT) ? 14 : 28)
-+#define PAX_DELTA_STACK_LEN    (test_thread_flag(TIF_32BIT) ? 15 : 29)
++#define PAX_DELTA_MMAP_LEN	(test_thread_flag(TIF_32BIT) ? 14 : 28)
++#define PAX_DELTA_STACK_LEN	(test_thread_flag(TIF_32BIT) ? 15 : 29)
 +#endif
++
+ extern unsigned long sparc64_elf_hwcap;
+ #define ELF_HWCAP	sparc64_elf_hwcap
  
- /* This yields a mask that user programs can use to figure out what
-    instruction set this cpu supports.  */
 diff -urNp linux-3.0.4/arch/sparc/include/asm/pgtable_32.h linux-3.0.4/arch/sparc/include/asm/pgtable_32.h
 --- linux-3.0.4/arch/sparc/include/asm/pgtable_32.h	2011-07-21 22:17:23.000000000 -0400
 +++ linux-3.0.4/arch/sparc/include/asm/pgtable_32.h	2011-08-23 21:47:55.000000000 -0400
@@ -21447,12 +21448,13 @@
 diff -urNp linux-3.0.4/arch/x86/oprofile/backtrace.c linux-3.0.4/arch/x86/oprofile/backtrace.c
 --- linux-3.0.4/arch/x86/oprofile/backtrace.c	2011-09-02 18:11:21.000000000 -0400
 +++ linux-3.0.4/arch/x86/oprofile/backtrace.c	2011-10-06 04:17:55.000000000 -0400
-@@ -46,10 +46,10 @@ dump_user_backtrace_32(struct stack_fram
- 	/* Also check accessibility of one struct frame_head beyond */
- 	if (!access_ok(VERIFY_READ, head, sizeof(bufhead)))
- 		return NULL;
--	if (__copy_from_user_inatomic(bufhead, head, sizeof(bufhead)))
-+	if (__copy_from_user_inatomic(bufhead, (const char __force_user *)head, sizeof(bufhead)))
+@@ -83,11 +83,11 @@ dump_user_backtrace_32(struct stack_fram
+ 	struct stack_frame_ia32 *fp;
+ 	unsigned long bytes;
+ 
+-	bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
++	bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
+ 	if (bytes != sizeof(bufhead))
  		return NULL;
  
 -	fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
@@ -21460,6 +21462,15 @@
  
  	oprofile_add_trace(bufhead[0].return_address);
  
+@@ -129,7 +129,7 @@ static struct stack_frame *dump_user_bac
+ 	struct stack_frame bufhead[2];
+ 	unsigned long bytes;
+ 
+-	bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
++	bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
+ 	if (bytes != sizeof(bufhead))
+ 		return NULL;
+ 
 @@ -148,7 +148,7 @@ x86_backtrace(struct pt_regs * const reg
  {
  	struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
@@ -39685,21 +39696,21 @@
 diff -urNp linux-3.0.4/fs/ecryptfs/read_write.c linux-3.0.4/fs/ecryptfs/read_write.c
 --- linux-3.0.4/fs/ecryptfs/read_write.c	2011-09-02 18:11:21.000000000 -0400
 +++ linux-3.0.4/fs/ecryptfs/read_write.c	2011-10-06 04:17:55.000000000 -0400
-@@ -47,7 +47,7 @@ int ecryptfs_write_lower(struct inode *e
- 	BUG_ON(!inode_info->lower_file);
+@@ -48,7 +48,7 @@ int ecryptfs_write_lower(struct inode *e
+ 		return -EIO;
  	fs_save = get_fs();
  	set_fs(get_ds());
--	rc = vfs_write(inode_info->lower_file, data, size, &offset);
-+	rc = vfs_write(inode_info->lower_file, (const char __force_user *)data, size, &offset);
+-	rc = vfs_write(lower_file, data, size, &offset);
++	rc = vfs_write(lower_file, (const char __force_user *)data, size, &offset);
  	set_fs(fs_save);
  	mark_inode_dirty_sync(ecryptfs_inode);
  	return rc;
-@@ -233,7 +233,7 @@ int ecryptfs_read_lower(char *data, loff
- 	BUG_ON(!inode_info->lower_file);
+@@ -235,7 +235,7 @@ int ecryptfs_read_lower(char *data, loff
+ 		return -EIO;
  	fs_save = get_fs();
  	set_fs(get_ds());
--	rc = vfs_read(inode_info->lower_file, data, size, &offset);
-+	rc = vfs_read(inode_info->lower_file, (char __force_user *)data, size, &offset);
+-	rc = vfs_read(lower_file, data, size, &offset);
++	rc = vfs_read(lower_file, (char __force_user *)data, size, &offset);
  	set_fs(fs_save);
  	return rc;
  }
@@ -60278,13 +60289,13 @@
 --- linux-3.0.4/ipc/mqueue.c	2011-07-21 22:17:23.000000000 -0400
 +++ linux-3.0.4/ipc/mqueue.c	2011-08-23 21:48:14.000000000 -0400
 @@ -154,6 +154,7 @@ static struct inode *mqueue_get_inode(st
- 			mq_bytes = (mq_msg_tblsz +
- 				(info->attr.mq_maxmsg * info->attr.mq_msgsize));
+ 		mq_bytes = (mq_msg_tblsz +
+ 			(info->attr.mq_maxmsg * info->attr.mq_msgsize));
  
-+			gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
- 			spin_lock(&mq_lock);
- 			if (u->mq_bytes + mq_bytes < u->mq_bytes ||
- 		 	    u->mq_bytes + mq_bytes >
++		gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
+ 		spin_lock(&mq_lock);
+ 		if (u->mq_bytes + mq_bytes < u->mq_bytes ||
+ 		    u->mq_bytes + mq_bytes >
 diff -urNp linux-3.0.4/ipc/msg.c linux-3.0.4/ipc/msg.c
 --- linux-3.0.4/ipc/msg.c	2011-07-21 22:17:23.000000000 -0400
 +++ linux-3.0.4/ipc/msg.c	2011-08-23 21:47:56.000000000 -0400
@@ -70705,7 +70716,6 @@
 --- linux-3.0.4/net/ipv4/inet_hashtables.c	2011-09-02 18:11:21.000000000 -0400
 +++ linux-3.0.4/net/ipv4/inet_hashtables.c	2011-08-23 21:55:24.000000000 -0400
 @@ -18,12 +18,15 @@
- #include <linux/random.h>
  #include <linux/sched.h>
  #include <linux/slab.h>
  #include <linux/wait.h>
@@ -70713,6 +70723,7 @@
  
  #include <net/inet_connection_sock.h>
  #include <net/inet_hashtables.h>
+ #include <net/secure_seq.h>
  #include <net/route.h>
  #include <net/ip.h>
  

================================================================
Index: packages/kernel/kernel-small_fixes.patch
diff -u packages/kernel/kernel-small_fixes.patch:1.37 packages/kernel/kernel-small_fixes.patch:1.38
--- packages/kernel/kernel-small_fixes.patch:1.37	Fri Sep 23 20:52:15 2011
+++ packages/kernel/kernel-small_fixes.patch	Wed Oct 12 19:27:48 2011
@@ -801,60 +801,4 @@
  
  	trace_xfs_file_read(ip, size, iocb->ki_pos, ioflags);
  
-commit 9e975cc291d80d5e4562d6bed15ec171e896d69b
-Author: Matt Carlson <mcarlson at broadcom.com>
-Date:   Wed Jul 20 10:20:50 2011 +0000
 
-    tg3: Fix io failures after chip reset
-    
-    Commit f2096f94b514d88593355995d5dd276961e88af1, entitled
-    "tg3: Add 5720 H2BMC support", needed to add code to preserve some bits
-    set by firmware.  Unfortunately the new code causes throughput to stop
-    after a chip reset because it enables state machines before they are
-    ready.  This patch undoes the problematic code.  The bits will be
-    restored later in the init sequence.
-    
-    Signed-off-by: Matt Carlson <mcarlson at broadcom.com>
-    Reviewed-by: Michael Chan <mchan at broadcom.com>
-    Signed-off-by: David S. Miller <davem at davemloft.net>
-
-diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
-index a5ff82d..5bf7671 100644
---- a/drivers/net/tg3.c
-+++ b/drivers/net/tg3.c
-@@ -7412,16 +7412,11 @@ static int tg3_chip_reset(struct tg3 *tp)
- 		tw32(TG3PCI_CLOCK_CTRL, tp->pci_clock_ctrl);
- 	}
- 
--	if (tg3_flag(tp, ENABLE_APE))
--		tp->mac_mode = MAC_MODE_APE_TX_EN |
--			       MAC_MODE_APE_RX_EN |
--			       MAC_MODE_TDE_ENABLE;
--
- 	if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES) {
--		tp->mac_mode |= MAC_MODE_PORT_MODE_TBI;
-+		tp->mac_mode = MAC_MODE_PORT_MODE_TBI;
- 		val = tp->mac_mode;
- 	} else if (tp->phy_flags & TG3_PHYFLG_MII_SERDES) {
--		tp->mac_mode |= MAC_MODE_PORT_MODE_GMII;
-+		tp->mac_mode = MAC_MODE_PORT_MODE_GMII;
- 		val = tp->mac_mode;
- 	} else
- 		val = 0;
-@@ -8559,12 +8554,11 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
- 		udelay(10);
- 	}
- 
--	if (tg3_flag(tp, ENABLE_APE))
--		tp->mac_mode = MAC_MODE_APE_TX_EN | MAC_MODE_APE_RX_EN;
--	else
--		tp->mac_mode = 0;
- 	tp->mac_mode |= MAC_MODE_TXSTAT_ENABLE | MAC_MODE_RXSTAT_ENABLE |
--		MAC_MODE_TDE_ENABLE | MAC_MODE_RDE_ENABLE | MAC_MODE_FHDE_ENABLE;
-+			MAC_MODE_TDE_ENABLE | MAC_MODE_RDE_ENABLE |
-+			MAC_MODE_FHDE_ENABLE;
-+	if (tg3_flag(tp, ENABLE_APE))
-+		tp->mac_mode |= MAC_MODE_APE_TX_EN | MAC_MODE_APE_RX_EN;
- 	if (!tg3_flag(tp, 5705_PLUS) &&
- 	    !(tp->phy_flags & TG3_PHYFLG_PHY_SERDES) &&
- 	    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5700)

================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.82 packages/kernel/kernel-vserver-2.3.patch:1.83
--- packages/kernel/kernel-vserver-2.3.patch:1.82	Wed Oct 12 17:45:19 2011
+++ packages/kernel/kernel-vserver-2.3.patch	Wed Oct 12 19:27:48 2011
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-3.0.4/.config.inet linux-3.0.4-vs2.3.1-pre10.1/.config.inet
+diff -NurpP --minimal linux-3.0.4/.config.inet linux-3.0.4-vs2.3.1/.config.inet
 --- linux-3.0.4/.config.inet	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.4-vs2.3.1-pre10.1/.config.inet	2011-06-13 14:55:18.000000000 +0200
++++ linux-3.0.4-vs2.3.1/.config.inet	2011-06-13 14:55:18.000000000 +0200
 @@ -0,0 +1,1620 @@
 +#
 +# Automatically generated make config: don't edit
@@ -1622,9 +1622,9 @@
 +CONFIG_CPU_RMAP=y
 +CONFIG_NLATTR=y
 +# CONFIG_AVERAGE is not set
-diff -NurpP --minimal linux-3.0.4/Documentation/vserver/debug.txt linux-3.0.4-vs2.3.1-pre10.1/Documentation/vserver/debug.txt
+diff -NurpP --minimal linux-3.0.4/Documentation/vserver/debug.txt linux-3.0.4-vs2.3.1/Documentation/vserver/debug.txt
 --- linux-3.0.4/Documentation/vserver/debug.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.4-vs2.3.1-pre10.1/Documentation/vserver/debug.txt	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/Documentation/vserver/debug.txt	2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,154 @@
 +
 +debug_cvirt:
@@ -1780,9 +1780,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.4/arch/alpha/Kconfig linux-3.0.4-vs2.3.1-pre10.1/arch/alpha/Kconfig
+diff -NurpP --minimal linux-3.0.4/arch/alpha/Kconfig linux-3.0.4-vs2.3.1/arch/alpha/Kconfig
 --- linux-3.0.4/arch/alpha/Kconfig	2011-07-22 11:17:32.000000000 +0200
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/alpha/Kconfig	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/arch/alpha/Kconfig	2011-06-10 22:11:24.000000000 +0200
 @@ -668,6 +668,8 @@ config DUMMY_CONSOLE
  	depends on VGA_HOSE
  	default y
@@ -1792,9 +1792,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.4/arch/alpha/kernel/entry.S linux-3.0.4-vs2.3.1-pre10.1/arch/alpha/kernel/entry.S
+diff -NurpP --minimal linux-3.0.4/arch/alpha/kernel/entry.S linux-3.0.4-vs2.3.1/arch/alpha/kernel/entry.S
 --- linux-3.0.4/arch/alpha/kernel/entry.S	2010-10-21 13:06:45.000000000 +0200
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/alpha/kernel/entry.S	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/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
@@ -1827,9 +1827,9 @@
  	ret
  .end sys_getxpid
  
-diff -NurpP --minimal linux-3.0.4/arch/alpha/kernel/ptrace.c linux-3.0.4-vs2.3.1-pre10.1/arch/alpha/kernel/ptrace.c
+diff -NurpP --minimal linux-3.0.4/arch/alpha/kernel/ptrace.c linux-3.0.4-vs2.3.1/arch/alpha/kernel/ptrace.c
 --- linux-3.0.4/arch/alpha/kernel/ptrace.c	2011-01-05 21:48:40.000000000 +0100
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/alpha/kernel/ptrace.c	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/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>
@@ -1838,9 +1838,9 @@
  
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
-diff -NurpP --minimal linux-3.0.4/arch/alpha/kernel/systbls.S linux-3.0.4-vs2.3.1-pre10.1/arch/alpha/kernel/systbls.S
+diff -NurpP --minimal linux-3.0.4/arch/alpha/kernel/systbls.S linux-3.0.4-vs2.3.1/arch/alpha/kernel/systbls.S
 --- linux-3.0.4/arch/alpha/kernel/systbls.S	2011-07-22 11:17:32.000000000 +0200
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/alpha/kernel/systbls.S	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/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
@@ -1850,9 +1850,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.4/arch/alpha/kernel/traps.c linux-3.0.4-vs2.3.1-pre10.1/arch/alpha/kernel/traps.c
+diff -NurpP --minimal linux-3.0.4/arch/alpha/kernel/traps.c linux-3.0.4-vs2.3.1/arch/alpha/kernel/traps.c
 --- linux-3.0.4/arch/alpha/kernel/traps.c	2010-10-21 13:06:46.000000000 +0200
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/alpha/kernel/traps.c	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/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());
@@ -1863,9 +1863,9 @@
  	dik_show_regs(regs, r9_15);
  	add_taint(TAINT_DIE);
  	dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-3.0.4/arch/arm/Kconfig linux-3.0.4-vs2.3.1-pre10.1/arch/arm/Kconfig
+diff -NurpP --minimal linux-3.0.4/arch/arm/Kconfig linux-3.0.4-vs2.3.1/arch/arm/Kconfig
 --- linux-3.0.4/arch/arm/Kconfig	2011-07-22 11:17:32.000000000 +0200
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/arm/Kconfig	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/arch/arm/Kconfig	2011-06-10 22:11:24.000000000 +0200
 @@ -2035,6 +2035,8 @@ source "fs/Kconfig"
  
  source "arch/arm/Kconfig.debug"
@@ -1875,9 +1875,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.4/arch/arm/kernel/calls.S linux-3.0.4-vs2.3.1-pre10.1/arch/arm/kernel/calls.S
+diff -NurpP --minimal linux-3.0.4/arch/arm/kernel/calls.S linux-3.0.4-vs2.3.1/arch/arm/kernel/calls.S
 --- linux-3.0.4/arch/arm/kernel/calls.S	2011-07-22 11:17:32.000000000 +0200
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/arm/kernel/calls.S	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/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)
@@ -1887,9 +1887,9 @@
  		CALL(sys_ioprio_set)
  /* 315 */	CALL(sys_ioprio_get)
  		CALL(sys_inotify_init)
-diff -NurpP --minimal linux-3.0.4/arch/arm/kernel/process.c linux-3.0.4-vs2.3.1-pre10.1/arch/arm/kernel/process.c
+diff -NurpP --minimal linux-3.0.4/arch/arm/kernel/process.c linux-3.0.4-vs2.3.1/arch/arm/kernel/process.c
 --- linux-3.0.4/arch/arm/kernel/process.c	2011-05-22 16:16:47.000000000 +0200
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/arm/kernel/process.c	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/arch/arm/kernel/process.c	2011-06-10 22:11:24.000000000 +0200
 @@ -315,7 +315,8 @@ void __show_regs(struct pt_regs *regs)
  void show_regs(struct pt_regs * regs)
  {
@@ -1900,9 +1900,9 @@
  	__show_regs(regs);
  	__backtrace();
  }
-diff -NurpP --minimal linux-3.0.4/arch/arm/kernel/traps.c linux-3.0.4-vs2.3.1-pre10.1/arch/arm/kernel/traps.c
+diff -NurpP --minimal linux-3.0.4/arch/arm/kernel/traps.c linux-3.0.4-vs2.3.1/arch/arm/kernel/traps.c
 --- linux-3.0.4/arch/arm/kernel/traps.c	2011-07-22 11:17:32.000000000 +0200
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/arm/kernel/traps.c	2011-06-22 12:39:12.000000000 +0200
++++ linux-3.0.4-vs2.3.1/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();
@@ -1914,9 +1914,9 @@
  
  	if (!user_mode(regs) || in_interrupt()) {
  		dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-3.0.4/arch/cris/Kconfig linux-3.0.4-vs2.3.1-pre10.1/arch/cris/Kconfig
+diff -NurpP --minimal linux-3.0.4/arch/cris/Kconfig linux-3.0.4-vs2.3.1/arch/cris/Kconfig
 --- linux-3.0.4/arch/cris/Kconfig	2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/cris/Kconfig	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/arch/cris/Kconfig	2011-06-10 22:11:24.000000000 +0200
 @@ -678,6 +678,8 @@ source "drivers/staging/Kconfig"
  
  source "arch/cris/Kconfig.debug"
@@ -1926,9 +1926,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.4/arch/frv/kernel/kernel_thread.S linux-3.0.4-vs2.3.1-pre10.1/arch/frv/kernel/kernel_thread.S
+diff -NurpP --minimal linux-3.0.4/arch/frv/kernel/kernel_thread.S linux-3.0.4-vs2.3.1/arch/frv/kernel/kernel_thread.S
 --- linux-3.0.4/arch/frv/kernel/kernel_thread.S	2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/frv/kernel/kernel_thread.S	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/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
@@ -1938,9 +1938,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.4/arch/h8300/Kconfig linux-3.0.4-vs2.3.1-pre10.1/arch/h8300/Kconfig
+diff -NurpP --minimal linux-3.0.4/arch/h8300/Kconfig linux-3.0.4-vs2.3.1/arch/h8300/Kconfig
 --- linux-3.0.4/arch/h8300/Kconfig	2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/h8300/Kconfig	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/arch/h8300/Kconfig	2011-06-10 22:11:24.000000000 +0200
 @@ -213,6 +213,8 @@ source "fs/Kconfig"
  
  source "arch/h8300/Kconfig.debug"
@@ -1950,9 +1950,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.4/arch/ia64/Kconfig linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/Kconfig
+diff -NurpP --minimal linux-3.0.4/arch/ia64/Kconfig linux-3.0.4-vs2.3.1/arch/ia64/Kconfig
 --- linux-3.0.4/arch/ia64/Kconfig	2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/Kconfig	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/arch/ia64/Kconfig	2011-06-10 22:11:24.000000000 +0200
 @@ -671,6 +671,8 @@ source "fs/Kconfig"
  
  source "arch/ia64/Kconfig.debug"
@@ -1962,9 +1962,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.4/arch/ia64/include/asm/tlb.h linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/include/asm/tlb.h
+diff -NurpP --minimal linux-3.0.4/arch/ia64/include/asm/tlb.h linux-3.0.4-vs2.3.1/arch/ia64/include/asm/tlb.h
 --- linux-3.0.4/arch/ia64/include/asm/tlb.h	2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/include/asm/tlb.h	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/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>
@@ -1973,9 +1973,9 @@
  
  #include <asm/pgalloc.h>
  #include <asm/processor.h>
-diff -NurpP --minimal linux-3.0.4/arch/ia64/kernel/entry.S linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/kernel/entry.S
+diff -NurpP --minimal linux-3.0.4/arch/ia64/kernel/entry.S linux-3.0.4-vs2.3.1/arch/ia64/kernel/entry.S
 --- linux-3.0.4/arch/ia64/kernel/entry.S	2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/kernel/entry.S	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/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
@@ -1985,9 +1985,9 @@
  	data8 sys_waitid			// 1270
  	data8 sys_add_key
  	data8 sys_request_key
-diff -NurpP --minimal linux-3.0.4/arch/ia64/kernel/perfmon.c linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/kernel/perfmon.c
+diff -NurpP --minimal linux-3.0.4/arch/ia64/kernel/perfmon.c linux-3.0.4-vs2.3.1/arch/ia64/kernel/perfmon.c
 --- linux-3.0.4/arch/ia64/kernel/perfmon.c	2011-03-15 18:06:39.000000000 +0100
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/kernel/perfmon.c	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/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>
@@ -1996,9 +1996,9 @@
  
  #include <asm/errno.h>
  #include <asm/intrinsics.h>
-diff -NurpP --minimal linux-3.0.4/arch/ia64/kernel/process.c linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/kernel/process.c
+diff -NurpP --minimal linux-3.0.4/arch/ia64/kernel/process.c linux-3.0.4-vs2.3.1/arch/ia64/kernel/process.c
 --- linux-3.0.4/arch/ia64/kernel/process.c	2011-03-15 18:06:39.000000000 +0100
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/kernel/process.c	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/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;
  
@@ -2010,9 +2010,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.4/arch/ia64/kernel/ptrace.c linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/kernel/ptrace.c
+diff -NurpP --minimal linux-3.0.4/arch/ia64/kernel/ptrace.c linux-3.0.4-vs2.3.1/arch/ia64/kernel/ptrace.c
 --- linux-3.0.4/arch/ia64/kernel/ptrace.c	2011-01-05 21:48:59.000000000 +0100
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/kernel/ptrace.c	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/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>
@@ -2021,9 +2021,9 @@
  
  #include <asm/pgtable.h>
  #include <asm/processor.h>
-diff -NurpP --minimal linux-3.0.4/arch/ia64/kernel/traps.c linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/kernel/traps.c
+diff -NurpP --minimal linux-3.0.4/arch/ia64/kernel/traps.c linux-3.0.4-vs2.3.1/arch/ia64/kernel/traps.c
 --- linux-3.0.4/arch/ia64/kernel/traps.c	2010-07-07 18:31:01.000000000 +0200
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/kernel/traps.c	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/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();
  
@@ -2048,9 +2048,9 @@
  			}
  		}
  	}
-diff -NurpP --minimal linux-3.0.4/arch/ia64/mm/fault.c linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/mm/fault.c
+diff -NurpP --minimal linux-3.0.4/arch/ia64/mm/fault.c linux-3.0.4-vs2.3.1/arch/ia64/mm/fault.c
 --- linux-3.0.4/arch/ia64/mm/fault.c	2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/ia64/mm/fault.c	2011-06-10 22:28:23.000000000 +0200
++++ linux-3.0.4-vs2.3.1/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>
@@ -2059,9 +2059,9 @@
  
  #include <asm/pgtable.h>
  #include <asm/processor.h>
-diff -NurpP --minimal linux-3.0.4/arch/m32r/kernel/traps.c linux-3.0.4-vs2.3.1-pre10.1/arch/m32r/kernel/traps.c
+diff -NurpP --minimal linux-3.0.4/arch/m32r/kernel/traps.c linux-3.0.4-vs2.3.1/arch/m32r/kernel/traps.c
 --- linux-3.0.4/arch/m32r/kernel/traps.c	2009-12-03 20:01:57.000000000 +0100
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/m32r/kernel/traps.c	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/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);
@@ -2074,9 +2074,9 @@
  
  	/*
  	 * When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-3.0.4/arch/m68k/Kconfig linux-3.0.4-vs2.3.1-pre10.1/arch/m68k/Kconfig
+diff -NurpP --minimal linux-3.0.4/arch/m68k/Kconfig linux-3.0.4-vs2.3.1/arch/m68k/Kconfig
 --- linux-3.0.4/arch/m68k/Kconfig	2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/m68k/Kconfig	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/arch/m68k/Kconfig	2011-06-10 22:11:24.000000000 +0200
 @@ -241,6 +241,8 @@ source "fs/Kconfig"
  
  source "arch/m68k/Kconfig.debug"
@@ -2086,9 +2086,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.4/arch/mips/Kconfig linux-3.0.4-vs2.3.1-pre10.1/arch/mips/Kconfig
+diff -NurpP --minimal linux-3.0.4/arch/mips/Kconfig linux-3.0.4-vs2.3.1/arch/mips/Kconfig
 --- linux-3.0.4/arch/mips/Kconfig	2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/mips/Kconfig	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/arch/mips/Kconfig	2011-06-10 22:11:24.000000000 +0200
 @@ -2485,6 +2485,8 @@ source "fs/Kconfig"
  
  source "arch/mips/Kconfig.debug"
@@ -2098,9 +2098,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.4/arch/mips/kernel/ptrace.c linux-3.0.4-vs2.3.1-pre10.1/arch/mips/kernel/ptrace.c
+diff -NurpP --minimal linux-3.0.4/arch/mips/kernel/ptrace.c linux-3.0.4-vs2.3.1/arch/mips/kernel/ptrace.c
 --- linux-3.0.4/arch/mips/kernel/ptrace.c	2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/mips/kernel/ptrace.c	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/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>
@@ -2119,9 +2119,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.4/arch/mips/kernel/scall32-o32.S linux-3.0.4-vs2.3.1-pre10.1/arch/mips/kernel/scall32-o32.S
+diff -NurpP --minimal linux-3.0.4/arch/mips/kernel/scall32-o32.S linux-3.0.4-vs2.3.1/arch/mips/kernel/scall32-o32.S
 --- linux-3.0.4/arch/mips/kernel/scall32-o32.S	2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/mips/kernel/scall32-o32.S	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/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 */
@@ -2131,9 +2131,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.4/arch/mips/kernel/scall64-64.S linux-3.0.4-vs2.3.1-pre10.1/arch/mips/kernel/scall64-64.S
+diff -NurpP --minimal linux-3.0.4/arch/mips/kernel/scall64-64.S linux-3.0.4-vs2.3.1/arch/mips/kernel/scall64-64.S
 --- linux-3.0.4/arch/mips/kernel/scall64-64.S	2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/mips/kernel/scall64-64.S	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/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
@@ -2143,9 +2143,9 @@
  	PTR	sys_waitid
  	PTR	sys_ni_syscall			/* available, was setaltroot */
  	PTR	sys_add_key
-diff -NurpP --minimal linux-3.0.4/arch/mips/kernel/scall64-n32.S linux-3.0.4-vs2.3.1-pre10.1/arch/mips/kernel/scall64-n32.S
+diff -NurpP --minimal linux-3.0.4/arch/mips/kernel/scall64-n32.S linux-3.0.4-vs2.3.1/arch/mips/kernel/scall64-n32.S
 --- linux-3.0.4/arch/mips/kernel/scall64-n32.S	2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/mips/kernel/scall64-n32.S	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/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
@@ -2155,9 +2155,9 @@
  	PTR	compat_sys_waitid
  	PTR	sys_ni_syscall			/* available, was setaltroot */
  	PTR	sys_add_key
-diff -NurpP --minimal linux-3.0.4/arch/mips/kernel/scall64-o32.S linux-3.0.4-vs2.3.1-pre10.1/arch/mips/kernel/scall64-o32.S
+diff -NurpP --minimal linux-3.0.4/arch/mips/kernel/scall64-o32.S linux-3.0.4-vs2.3.1/arch/mips/kernel/scall64-o32.S
 --- linux-3.0.4/arch/mips/kernel/scall64-o32.S	2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/mips/kernel/scall64-o32.S	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/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 */
@@ -2167,9 +2167,9 @@
  	PTR	sys_32_waitid
  	PTR	sys_ni_syscall			/* available, was setaltroot */
  	PTR	sys_add_key			/* 4280 */
-diff -NurpP --minimal linux-3.0.4/arch/mips/kernel/traps.c linux-3.0.4-vs2.3.1-pre10.1/arch/mips/kernel/traps.c
+diff -NurpP --minimal linux-3.0.4/arch/mips/kernel/traps.c linux-3.0.4-vs2.3.1/arch/mips/kernel/traps.c
 --- linux-3.0.4/arch/mips/kernel/traps.c	2011-05-22 16:17:00.000000000 +0200
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/mips/kernel/traps.c	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/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);
@@ -2184,9 +2184,9 @@
  	if (cpu_has_userlocal) {
  		unsigned long tls;
  
-diff -NurpP --minimal linux-3.0.4/arch/parisc/Kconfig linux-3.0.4-vs2.3.1-pre10.1/arch/parisc/Kconfig
+diff -NurpP --minimal linux-3.0.4/arch/parisc/Kconfig linux-3.0.4-vs2.3.1/arch/parisc/Kconfig
 --- linux-3.0.4/arch/parisc/Kconfig	2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/parisc/Kconfig	2011-06-10 22:11:24.000000000 +0200
++++ linux-3.0.4-vs2.3.1/arch/parisc/Kconfig	2011-06-10 22:11:24.000000000 +0200
 @@ -279,6 +279,8 @@ source "fs/Kconfig"
  
  source "arch/parisc/Kconfig.debug"
@@ -2196,9 +2196,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.4/arch/parisc/kernel/syscall_table.S linux-3.0.4-vs2.3.1-pre10.1/arch/parisc/kernel/syscall_table.S
+diff -NurpP --minimal linux-3.0.4/arch/parisc/kernel/syscall_table.S linux-3.0.4-vs2.3.1/arch/parisc/kernel/syscall_table.S
 --- linux-3.0.4/arch/parisc/kernel/syscall_table.S	2011-08-31 18:56:40.000000000 +0200
-+++ linux-3.0.4-vs2.3.1-pre10.1/arch/parisc/kernel/syscall_table.S	2011-08-29 03:45:07.000000000 +0200
++++ linux-3.0.4-vs2.3.1/arch/parisc/kernel/syscall_table.S	2011-08-29 03:45:07.000000000 +0200
 @@ -361,7 +361,7 @@
  	ENTRY_COMP(mbind)		/* 260 */
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec_full.patch?r1=1.82&r2=1.83&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-small_fixes.patch?r1=1.37&r2=1.38&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.82&r2=1.83&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-fixes.patch?r1=1.24&r2=1.25&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.982&r2=1.983&f=u



More information about the pld-cvs-commit mailing list