packages (LINUX_2_6_34): kernel/kernel-small_fixes.patch, kernel/kernel-vse...
arekm
arekm at pld-linux.org
Fri Aug 27 21:49:02 CEST 2010
Author: arekm Date: Fri Aug 27 19:49:02 2010 GMT
Module: packages Tag: LINUX_2_6_34
---- Log message:
- up to 2.6.27.53; add xfs 32bit projid blockage (since on-disk format doesn't support these)
---- Files affected:
packages/kernel:
kernel-small_fixes.patch (1.1.2.15.2.9 -> 1.1.2.15.2.10) , kernel-vserver-2.3.patch (1.40.2.2 -> 1.40.2.3) , kernel-xfs-32bit-projid.patch (1.1.2.1 -> 1.1.2.2) , kernel.spec (1.441.2.2036.2.60 -> 1.441.2.2036.2.61) , linux-2.6-grsec_full.patch (1.1.2.51.2.9 -> 1.1.2.51.2.10) , linux-2.6-vs2.3.patch (1.2.4.11.2.47.2.15 -> 1.2.4.11.2.47.2.16)
---- Diffs:
================================================================
Index: packages/kernel/kernel-small_fixes.patch
diff -u packages/kernel/kernel-small_fixes.patch:1.1.2.15.2.9 packages/kernel/kernel-small_fixes.patch:1.1.2.15.2.10
--- packages/kernel/kernel-small_fixes.patch:1.1.2.15.2.9 Sat May 8 23:38:55 2010
+++ packages/kernel/kernel-small_fixes.patch Fri Aug 27 21:48:48 2010
@@ -414,3 +414,88 @@
void __init paging_init(void)
{
+From arekm at maven.pl Thu Aug 26 12:19:43 2010
+Return-path: <arekm at maven.pl>
+Envelope-to: arm at mbox3.agnat.pl
+Delivery-date: Thu, 26 Aug 2010 12:20:13 +0200
+Received: from pop3.arm.beep.pl [193.239.44.217]
+ by localhost with IMAP (fetchmail-6.3.17)
+ for <arekm at localhost> (single-drop); Thu, 26 Aug 2010 12:21:02 +0200 (CEST)
+Received: from incoming1.smtp.agnat.pl ([193.239.44.90])
+ by mbox3.agnat.pl with esmtp (Exim 4.71)
+ (envelope-from <arekm at maven.pl>)
+ id 1OoZYs-0005d5-O0
+ for arm at mbox3.agnat.pl; Thu, 26 Aug 2010 12:19:58 +0200
+Received: from smtp-relay.maven.pl ([193.239.45.138]:29751)
+ by incoming1.smtp.agnat.pl with esmtp (Exim 4.72)
+ (envelope-from <arekm at maven.pl>)
+ id 1OoZYh-0008E1-4v
+ for arekm at maven.pl; Thu, 26 Aug 2010 12:19:47 +0200
+Received: from [83.238.65.58] (port=60085 helo=tarm.maven.pl ident=matrix157)
+ by smtp-relay.maven.pl with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256)
+ (Exim 4.72)
+ (envelope-from <arekm at maven.pl>)
+ id 1OoZYg-000102-Ay; Thu, 26 Aug 2010 12:19:46 +0200
+Received: from arekm by tarm.maven.pl with local (Exim 4.72)
+ (envelope-from <arekm at maven.pl>)
+ id 1OoZYe-0000rz-Nu; Thu, 26 Aug 2010 12:19:44 +0200
+From: =?UTF-8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm at maven.pl>
+To: xfs at oss.sgi.com
+Cc: =?UTF-8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm at maven.pl>
+Subject: [PATCH] Disallow 32bit project quota id.
+Date: Thu, 26 Aug 2010 12:19:43 +0200
+Message-Id: <1282817983-3301-1-git-send-email-arekm at maven.pl>
+X-Mailer: git-send-email 1.7.2.2
+In-Reply-To: <20100826081247.GD705 at dastard>
+References: <20100826081247.GD705 at dastard>
+MIME-Version: 1.0
+Content-Type: text/plain;
+ charset=UTF-8
+Content-Transfer-Encoding: 8bit
+X-Authenticated-Id:
+Status: RO
+X-Status: R
+X-KMail-EncryptionState: N
+X-KMail-SignatureState: N
+X-KMail-MDN-Sent:
+
+Currently on-disk structure is able to keep only 16bit project quota id,
+so disallow 32bit ones. This fixes a problem where parts of kernel
+structures holding project quota id are 32bit while parts (on-disk)
+are 16bit variables which causes project quota member files to be
+inaccessible for some operations (like mv/rm).
+
+Signed-off-by: Arkadiusz Miśkiewicz <arekm at maven.pl>
+---
+
+Issues solved:
+- FSX_PROJID in mask is checked
+- 80 column issue fixed
+- checkpath.pl checked
+
+
+ fs/xfs/linux-2.6/xfs_ioctl.c | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c
+index 237f5ff..4fec427 100644
+--- a/fs/xfs/linux-2.6/xfs_ioctl.c
++++ b/fs/xfs/linux-2.6/xfs_ioctl.c
+@@ -907,6 +907,13 @@ xfs_ioctl_setattr(
+ return XFS_ERROR(EIO);
+
+ /*
++ * Disallow 32bit project ids because on-disk structure
++ * is 16bit only.
++ */
++ if ((mask & FSX_PROJID) && (fa->fsx_projid > (__uint16_t)-1))
++ return XFS_ERROR(EINVAL);
++
++ /*
+ * If disk quotas is on, we make sure that the dquots do exist on disk,
+ * before we start any other transactions. Trying to do this later
+ * is messy. We don't care to take a readlock to look at the ids
+--
+1.7.2.2
+
+
================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.40.2.2 packages/kernel/kernel-vserver-2.3.patch:1.40.2.3
--- packages/kernel/kernel-vserver-2.3.patch:1.40.2.2 Fri Aug 27 10:07:43 2010
+++ packages/kernel/kernel-vserver-2.3.patch Fri Aug 27 21:48:48 2010
@@ -9790,7 +9790,7 @@
diff -NurpP --minimal linux-2.6.34.1/fs/xfs/xfs_inode.h linux-2.6.34.1-vs2.3.0.36.30.4.pre8/fs/xfs/xfs_inode.h
--- linux-2.6.34.1/fs/xfs/xfs_inode.h 2010-05-18 15:07:52.000000000 +0200
+++ linux-2.6.34.1-vs2.3.0.36.30.4.pre8/fs/xfs/xfs_inode.h 2010-05-18 18:11:22.000000000 +0200
-@@ -135,7 +135,9 @@ typedef struct xfs_icdinode {
+@@ -135,8 +135,10 @@ typedef struct xfs_icdinode {
__uint32_t di_gid; /* owner's group id */
__uint32_t di_nlink; /* number of links to file */
__uint16_t di_projid_lo; /* lower part of owner's project id */
================================================================
Index: packages/kernel/kernel-xfs-32bit-projid.patch
diff -u packages/kernel/kernel-xfs-32bit-projid.patch:1.1.2.1 packages/kernel/kernel-xfs-32bit-projid.patch:1.1.2.2
--- packages/kernel/kernel-xfs-32bit-projid.patch:1.1.2.1 Fri Aug 27 10:07:43 2010
+++ packages/kernel/kernel-xfs-32bit-projid.patch Fri Aug 27 21:48:48 2010
@@ -499,3 +499,19 @@
--
1.7.1.1
+--- linux-2.6.34/fs/xfs/xfs_itable.c.org 2010-08-27 10:53:33.930798009 +0200
++++ linux-2.6.34/fs/xfs/xfs_itable.c 2010-08-27 10:55:10.580789634 +0200
+@@ -154,10 +154,11 @@
+ */
+ if (dic->di_version == 1) {
+ buf->bs_nlink = be16_to_cpu(dic->di_onlink);
+- buf->bs_projid = 0;
++ buf->bs_projid_lo = buf->bs_projid_hi = 0;
+ } else {
+ buf->bs_nlink = be32_to_cpu(dic->di_nlink);
+- buf->bs_projid = be16_to_cpu(dic->di_projid);
++ buf->bs_projid_lo = be16_to_cpu(dic->di_projid_lo);
++ buf->bs_projid_hi = be16_to_cpu(dic->di_projid_hi);
+ }
+
+ buf->bs_ino = ino;
================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.441.2.2036.2.60 packages/kernel/kernel.spec:1.441.2.2036.2.61
--- packages/kernel/kernel.spec:1.441.2.2036.2.60 Wed Aug 25 12:03:22 2010
+++ packages/kernel/kernel.spec Fri Aug 27 21:48:48 2010
@@ -106,7 +106,7 @@
%endif
%define basever 2.6.27
-%define postver .51
+%define postver .53
%define rel 1
%define _enable_debug_packages 0
@@ -151,7 +151,7 @@
# Source0-md5: b3e78977aa79d3754cb7f8143d7ddabd
%if "%{postver}" != "%{nil}"
Source1: http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
-# Source1-md5: ae7139cd31cca8eb0b9d1348eccc0478
+# Source1-md5: 30795ca0b0e9d2725451c12d6fd0c689
%endif
Source3: kernel-autoconf.h
@@ -288,7 +288,7 @@
Patch95: kernel-touchpad.patch
-# http://vserver.13thfloor.at/Experimental/patch-2.6.27.39-vs2.3.0.36.8.diff
+# http://vserver.13thfloor.at/Experimental/patch-2.6.27.52-vs2.3.0.36.9.diff
Patch100: linux-2.6-vs2.3.patch
Patch101: kernel-vserver-fixes.patch
@@ -1688,6 +1688,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.441.2.2036.2.61 2010/08/27 19:48:48 arekm
+- up to 2.6.27.53; add xfs 32bit projid blockage (since on-disk format doesn't support these)
+
Revision 1.441.2.2036.2.60 2010/08/25 10:03:22 glen
- lvm 2.02.28, is too old or needs sysfs_scan = 0 to recognize devices
================================================================
Index: packages/kernel/linux-2.6-grsec_full.patch
diff -u packages/kernel/linux-2.6-grsec_full.patch:1.1.2.51.2.9 packages/kernel/linux-2.6-grsec_full.patch:1.1.2.51.2.10
--- packages/kernel/linux-2.6-grsec_full.patch:1.1.2.51.2.9 Mon Jan 25 23:05:54 2010
+++ packages/kernel/linux-2.6-grsec_full.patch Fri Aug 27 21:48:49 2010
@@ -9834,12 +9834,12 @@
#endif
@@ -586,13 +629,22 @@ void __kprobes do_page_fault(struct pt_r
- struct task_struct *tsk;
struct mm_struct *mm;
struct vm_area_struct *vma;
- unsigned long address;
int write, si_code;
int fault;
+ int should_exit_no_context = 0;
#ifdef CONFIG_X86_64
unsigned long flags;
#endif
@@ -17164,14 +17164,14 @@
{
struct mm_struct *mm = vma->vm_mm;
@@ -214,13 +231,22 @@ static void show_map_vma(struct seq_file
- }
+ start += PAGE_SIZE;
seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
+ PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start,
+ PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end,
+#else
- vma->vm_start,
+ start,
vma->vm_end,
+#endif
flags & VM_READ ? 'r' : '-',
@@ -34604,15 +34604,6 @@
if (locked > limit && !capable(CAP_IPC_LOCK))
return -ENOMEM;
}
-@@ -1569,7 +1779,7 @@ static int acct_stack_growth(struct vm_a
- * Overcommit.. This must be the final test, as it will
- * update security statistics.
- */
-- if (security_vm_enough_memory(grow))
-+ if (security_vm_enough_memory_mm(mm, grow))
- return -ENOMEM;
-
- /* Ok, everything looks good - let it rip */
@@ -1590,35 +1800,40 @@ static inline
#endif
int expand_upwards(struct vm_area_struct *vma, unsigned long address)
================================================================
Index: packages/kernel/linux-2.6-vs2.3.patch
diff -u packages/kernel/linux-2.6-vs2.3.patch:1.2.4.11.2.47.2.15 packages/kernel/linux-2.6-vs2.3.patch:1.2.4.11.2.47.2.16
--- packages/kernel/linux-2.6-vs2.3.patch:1.2.4.11.2.47.2.15 Wed Dec 9 09:04:40 2009
+++ packages/kernel/linux-2.6-vs2.3.patch Fri Aug 27 21:48:50 2010
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.27.39/arch/alpha/Kconfig linux-2.6.27.39-vs2.3.0.36.8/arch/alpha/Kconfig
---- linux-2.6.27.39/arch/alpha/Kconfig 2008-10-13 14:51:51.000000000 +0200
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/alpha/Kconfig 2008-10-13 14:54:20.000000000 +0200
+diff -NurpP --minimal linux-2.6.27.52/arch/alpha/Kconfig linux-2.6.27.52-vs2.3.0.36.9/arch/alpha/Kconfig
+--- linux-2.6.27.52/arch/alpha/Kconfig 2008-10-13 14:51:51.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/alpha/Kconfig 2008-10-13 14:54:20.000000000 +0200
@@ -667,6 +667,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -10,9 +10,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.27.39/arch/alpha/kernel/entry.S linux-2.6.27.39-vs2.3.0.36.8/arch/alpha/kernel/entry.S
---- linux-2.6.27.39/arch/alpha/kernel/entry.S 2009-11-11 03:12:51.000000000 +0100
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/alpha/kernel/entry.S 2009-02-03 17:59:04.000000000 +0100
+diff -NurpP --minimal linux-2.6.27.52/arch/alpha/kernel/entry.S linux-2.6.27.52-vs2.3.0.36.9/arch/alpha/kernel/entry.S
+--- linux-2.6.27.52/arch/alpha/kernel/entry.S 2010-08-24 21:57:55.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/alpha/kernel/entry.S 2009-02-03 17:59:04.000000000 +0100
@@ -872,24 +872,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
@@ -45,9 +45,9 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.27.39/arch/alpha/kernel/osf_sys.c linux-2.6.27.39-vs2.3.0.36.8/arch/alpha/kernel/osf_sys.c
---- linux-2.6.27.39/arch/alpha/kernel/osf_sys.c 2008-10-13 14:51:51.000000000 +0200
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/alpha/kernel/osf_sys.c 2008-10-13 14:54:20.000000000 +0200
+diff -NurpP --minimal linux-2.6.27.52/arch/alpha/kernel/osf_sys.c linux-2.6.27.52-vs2.3.0.36.9/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.27.52/arch/alpha/kernel/osf_sys.c 2008-10-13 14:51:51.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/alpha/kernel/osf_sys.c 2008-10-13 14:54:20.000000000 +0200
@@ -888,7 +888,7 @@ osf_gettimeofday(struct timeval32 __user
{
if (tv) {
@@ -57,9 +57,9 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.27.39/arch/alpha/kernel/ptrace.c linux-2.6.27.39-vs2.3.0.36.8/arch/alpha/kernel/ptrace.c
---- linux-2.6.27.39/arch/alpha/kernel/ptrace.c 2008-07-13 23:51:29.000000000 +0200
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/alpha/kernel/ptrace.c 2008-10-13 14:54:20.000000000 +0200
+diff -NurpP --minimal linux-2.6.27.52/arch/alpha/kernel/ptrace.c linux-2.6.27.52-vs2.3.0.36.9/arch/alpha/kernel/ptrace.c
+--- linux-2.6.27.52/arch/alpha/kernel/ptrace.c 2008-07-13 23:51:29.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/alpha/kernel/ptrace.c 2008-10-13 14:54:20.000000000 +0200
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/security.h>
@@ -68,9 +68,9 @@
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.27.39/arch/alpha/kernel/systbls.S linux-2.6.27.39-vs2.3.0.36.8/arch/alpha/kernel/systbls.S
---- linux-2.6.27.39/arch/alpha/kernel/systbls.S 2009-11-11 03:12:51.000000000 +0100
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/alpha/kernel/systbls.S 2009-02-03 17:59:04.000000000 +0100
+diff -NurpP --minimal linux-2.6.27.52/arch/alpha/kernel/systbls.S linux-2.6.27.52-vs2.3.0.36.9/arch/alpha/kernel/systbls.S
+--- linux-2.6.27.52/arch/alpha/kernel/systbls.S 2010-08-24 21:57:55.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/alpha/kernel/systbls.S 2009-02-03 17:59:04.000000000 +0100
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -80,9 +80,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-2.6.27.39/arch/alpha/kernel/traps.c linux-2.6.27.39-vs2.3.0.36.8/arch/alpha/kernel/traps.c
---- linux-2.6.27.39/arch/alpha/kernel/traps.c 2008-07-13 23:51:29.000000000 +0200
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/alpha/kernel/traps.c 2008-10-13 14:54:20.000000000 +0200
+diff -NurpP --minimal linux-2.6.27.52/arch/alpha/kernel/traps.c linux-2.6.27.52-vs2.3.0.36.9/arch/alpha/kernel/traps.c
+--- linux-2.6.27.52/arch/alpha/kernel/traps.c 2008-07-13 23:51:29.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/alpha/kernel/traps.c 2008-10-13 14:54:20.000000000 +0200
@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -93,9 +93,9 @@
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-2.6.27.39/arch/alpha/mm/fault.c linux-2.6.27.39-vs2.3.0.36.8/arch/alpha/mm/fault.c
---- linux-2.6.27.39/arch/alpha/mm/fault.c 2008-07-13 23:51:29.000000000 +0200
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/alpha/mm/fault.c 2008-10-13 14:54:20.000000000 +0200
+diff -NurpP --minimal linux-2.6.27.52/arch/alpha/mm/fault.c linux-2.6.27.52-vs2.3.0.36.9/arch/alpha/mm/fault.c
+--- linux-2.6.27.52/arch/alpha/mm/fault.c 2008-07-13 23:51:29.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/alpha/mm/fault.c 2008-10-13 14:54:20.000000000 +0200
@@ -193,8 +193,8 @@ do_page_fault(unsigned long address, uns
down_read(&mm->mmap_sem);
goto survive;
@@ -107,9 +107,9 @@
if (!user_mode(regs))
goto no_context;
do_group_exit(SIGKILL);
-diff -NurpP --minimal linux-2.6.27.39/arch/arm/Kconfig linux-2.6.27.39-vs2.3.0.36.8/arch/arm/Kconfig
---- linux-2.6.27.39/arch/arm/Kconfig 2008-10-13 14:51:51.000000000 +0200
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/arm/Kconfig 2008-10-13 14:54:20.000000000 +0200
+diff -NurpP --minimal linux-2.6.27.52/arch/arm/Kconfig linux-2.6.27.52-vs2.3.0.36.9/arch/arm/Kconfig
+--- linux-2.6.27.52/arch/arm/Kconfig 2008-10-13 14:51:51.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/arm/Kconfig 2008-10-13 14:54:20.000000000 +0200
@@ -1240,6 +1240,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -119,9 +119,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.27.39/arch/arm/kernel/calls.S linux-2.6.27.39-vs2.3.0.36.8/arch/arm/kernel/calls.S
---- linux-2.6.27.39/arch/arm/kernel/calls.S 2009-11-11 03:12:51.000000000 +0100
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/arm/kernel/calls.S 2009-02-03 17:59:04.000000000 +0100
+diff -NurpP --minimal linux-2.6.27.52/arch/arm/kernel/calls.S linux-2.6.27.52-vs2.3.0.36.9/arch/arm/kernel/calls.S
+--- linux-2.6.27.52/arch/arm/kernel/calls.S 2010-08-24 21:57:55.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/arm/kernel/calls.S 2009-02-03 17:59:04.000000000 +0100
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -131,9 +131,9 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.27.39/arch/arm/kernel/process.c linux-2.6.27.39-vs2.3.0.36.8/arch/arm/kernel/process.c
---- linux-2.6.27.39/arch/arm/kernel/process.c 2008-10-13 14:51:52.000000000 +0200
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/arm/kernel/process.c 2008-10-13 14:54:20.000000000 +0200
+diff -NurpP --minimal linux-2.6.27.52/arch/arm/kernel/process.c linux-2.6.27.52-vs2.3.0.36.9/arch/arm/kernel/process.c
+--- linux-2.6.27.52/arch/arm/kernel/process.c 2008-10-13 14:51:52.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/arm/kernel/process.c 2008-10-13 14:54:20.000000000 +0200
@@ -262,7 +262,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
@@ -144,9 +144,9 @@
__show_regs(regs);
__backtrace();
}
-diff -NurpP --minimal linux-2.6.27.39/arch/arm/kernel/traps.c linux-2.6.27.39-vs2.3.0.36.8/arch/arm/kernel/traps.c
---- linux-2.6.27.39/arch/arm/kernel/traps.c 2008-10-13 14:51:52.000000000 +0200
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/arm/kernel/traps.c 2008-10-13 14:54:20.000000000 +0200
+diff -NurpP --minimal linux-2.6.27.52/arch/arm/kernel/traps.c linux-2.6.27.52-vs2.3.0.36.9/arch/arm/kernel/traps.c
+--- linux-2.6.27.52/arch/arm/kernel/traps.c 2008-10-13 14:51:52.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/arm/kernel/traps.c 2008-10-13 14:54:20.000000000 +0200
@@ -214,8 +214,8 @@ static void __die(const char *str, int e
str, err, ++die_counter);
print_modules();
@@ -158,9 +158,9 @@
if (!user_mode(regs) || in_interrupt()) {
dump_mem("Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.27.39/arch/arm/mm/fault.c linux-2.6.27.39-vs2.3.0.36.8/arch/arm/mm/fault.c
---- linux-2.6.27.39/arch/arm/mm/fault.c 2008-07-13 23:51:29.000000000 +0200
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/arm/mm/fault.c 2008-10-13 14:54:20.000000000 +0200
+diff -NurpP --minimal linux-2.6.27.52/arch/arm/mm/fault.c linux-2.6.27.52-vs2.3.0.36.9/arch/arm/mm/fault.c
+--- linux-2.6.27.52/arch/arm/mm/fault.c 2008-07-13 23:51:29.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/arm/mm/fault.c 2008-10-13 14:54:20.000000000 +0200
@@ -292,7 +292,8 @@ do_page_fault(unsigned long addr, unsign
* happened to us that made us unable to handle
* the page fault gracefully.
@@ -171,9 +171,9 @@
do_group_exit(SIGKILL);
return 0;
}
-diff -NurpP --minimal linux-2.6.27.39/arch/cris/Kconfig linux-2.6.27.39-vs2.3.0.36.8/arch/cris/Kconfig
---- linux-2.6.27.39/arch/cris/Kconfig 2008-07-13 23:51:29.000000000 +0200
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/cris/Kconfig 2008-10-13 14:54:20.000000000 +0200
+diff -NurpP --minimal linux-2.6.27.52/arch/cris/Kconfig linux-2.6.27.52-vs2.3.0.36.9/arch/cris/Kconfig
+--- linux-2.6.27.52/arch/cris/Kconfig 2008-07-13 23:51:29.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/cris/Kconfig 2008-10-13 14:54:20.000000000 +0200
@@ -679,6 +679,8 @@ source "drivers/usb/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -183,9 +183,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.27.39/arch/frv/kernel/kernel_thread.S linux-2.6.27.39-vs2.3.0.36.8/arch/frv/kernel/kernel_thread.S
---- linux-2.6.27.39/arch/frv/kernel/kernel_thread.S 2008-07-13 23:51:29.000000000 +0200
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/frv/kernel/kernel_thread.S 2008-10-13 14:54:20.000000000 +0200
+diff -NurpP --minimal linux-2.6.27.52/arch/frv/kernel/kernel_thread.S linux-2.6.27.52-vs2.3.0.36.9/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.27.52/arch/frv/kernel/kernel_thread.S 2008-07-13 23:51:29.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/frv/kernel/kernel_thread.S 2008-10-13 14:54:20.000000000 +0200
@@ -37,7 +37,7 @@ kernel_thread:
# start by forking the current process, but with shared VM
@@ -195,9 +195,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-2.6.27.39/arch/h8300/Kconfig linux-2.6.27.39-vs2.3.0.36.8/arch/h8300/Kconfig
---- linux-2.6.27.39/arch/h8300/Kconfig 2008-10-13 14:51:55.000000000 +0200
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/h8300/Kconfig 2008-10-13 14:54:20.000000000 +0200
+diff -NurpP --minimal linux-2.6.27.52/arch/h8300/Kconfig linux-2.6.27.52-vs2.3.0.36.9/arch/h8300/Kconfig
+--- linux-2.6.27.52/arch/h8300/Kconfig 2008-10-13 14:51:55.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/h8300/Kconfig 2008-10-13 14:54:20.000000000 +0200
@@ -219,6 +219,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -207,9 +207,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.27.39/arch/ia64/ia32/ia32_entry.S linux-2.6.27.39-vs2.3.0.36.8/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.27.39/arch/ia64/ia32/ia32_entry.S 2009-11-11 03:12:51.000000000 +0100
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/ia64/ia32/ia32_entry.S 2009-02-03 17:59:04.000000000 +0100
+diff -NurpP --minimal linux-2.6.27.52/arch/ia64/ia32/ia32_entry.S linux-2.6.27.52-vs2.3.0.36.9/arch/ia64/ia32/ia32_entry.S
+--- linux-2.6.27.52/arch/ia64/ia32/ia32_entry.S 2010-08-24 21:57:55.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/ia64/ia32/ia32_entry.S 2009-02-03 17:59:04.000000000 +0100
@@ -446,7 +446,7 @@ ia32_syscall_table:
data8 sys_tgkill /* 270 */
data8 compat_sys_utimes
@@ -219,9 +219,9 @@
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.27.39/arch/ia64/ia32/sys_ia32.c linux-2.6.27.39-vs2.3.0.36.8/arch/ia64/ia32/sys_ia32.c
---- linux-2.6.27.39/arch/ia64/ia32/sys_ia32.c 2008-10-13 14:51:55.000000000 +0200
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/ia64/ia32/sys_ia32.c 2008-10-13 14:54:20.000000000 +0200
+diff -NurpP --minimal linux-2.6.27.52/arch/ia64/ia32/sys_ia32.c linux-2.6.27.52-vs2.3.0.36.9/arch/ia64/ia32/sys_ia32.c
+--- linux-2.6.27.52/arch/ia64/ia32/sys_ia32.c 2008-10-13 14:51:55.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/ia64/ia32/sys_ia32.c 2008-10-13 14:54:20.000000000 +0200
@@ -1178,7 +1178,7 @@ sys32_gettimeofday (struct compat_timeva
{
if (tv) {
@@ -231,9 +231,9 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.27.39/arch/ia64/Kconfig linux-2.6.27.39-vs2.3.0.36.8/arch/ia64/Kconfig
---- linux-2.6.27.39/arch/ia64/Kconfig 2009-11-11 03:12:51.000000000 +0100
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/ia64/Kconfig 2009-03-25 14:32:29.000000000 +0100
+diff -NurpP --minimal linux-2.6.27.52/arch/ia64/Kconfig linux-2.6.27.52-vs2.3.0.36.9/arch/ia64/Kconfig
+--- linux-2.6.27.52/arch/ia64/Kconfig 2010-08-24 21:57:55.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/ia64/Kconfig 2009-03-25 14:32:29.000000000 +0100
@@ -639,6 +639,8 @@ source "arch/ia64/hp/sim/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -243,9 +243,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.27.39/arch/ia64/kernel/entry.S linux-2.6.27.39-vs2.3.0.36.8/arch/ia64/kernel/entry.S
---- linux-2.6.27.39/arch/ia64/kernel/entry.S 2009-11-11 03:12:51.000000000 +0100
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/ia64/kernel/entry.S 2009-02-03 17:59:04.000000000 +0100
+diff -NurpP --minimal linux-2.6.27.52/arch/ia64/kernel/entry.S linux-2.6.27.52-vs2.3.0.36.9/arch/ia64/kernel/entry.S
+--- linux-2.6.27.52/arch/ia64/kernel/entry.S 2010-08-24 21:57:55.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/ia64/kernel/entry.S 2009-02-03 17:59:04.000000000 +0100
@@ -1647,7 +1647,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
@@ -255,9 +255,9 @@
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.27.39/arch/ia64/kernel/perfmon.c linux-2.6.27.39-vs2.3.0.36.8/arch/ia64/kernel/perfmon.c
---- linux-2.6.27.39/arch/ia64/kernel/perfmon.c 2008-10-13 14:51:55.000000000 +0200
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/ia64/kernel/perfmon.c 2008-10-13 14:54:20.000000000 +0200
+diff -NurpP --minimal linux-2.6.27.52/arch/ia64/kernel/perfmon.c linux-2.6.27.52-vs2.3.0.36.9/arch/ia64/kernel/perfmon.c
+--- linux-2.6.27.52/arch/ia64/kernel/perfmon.c 2008-10-13 14:51:55.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/ia64/kernel/perfmon.c 2008-10-13 14:54:20.000000000 +0200
@@ -40,6 +40,7 @@
#include <linux/capability.h>
#include <linux/rcupdate.h>
@@ -275,9 +275,9 @@
vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file,
vma_pages(vma));
up_write(&task->mm->mmap_sem);
-diff -NurpP --minimal linux-2.6.27.39/arch/ia64/kernel/process.c linux-2.6.27.39-vs2.3.0.36.8/arch/ia64/kernel/process.c
---- linux-2.6.27.39/arch/ia64/kernel/process.c 2008-10-13 14:51:55.000000000 +0200
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/ia64/kernel/process.c 2008-10-13 14:54:20.000000000 +0200
+diff -NurpP --minimal linux-2.6.27.52/arch/ia64/kernel/process.c linux-2.6.27.52-vs2.3.0.36.9/arch/ia64/kernel/process.c
+--- linux-2.6.27.52/arch/ia64/kernel/process.c 2008-10-13 14:51:55.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/ia64/kernel/process.c 2008-10-13 14:54:20.000000000 +0200
@@ -109,8 +109,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
@@ -289,9 +289,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-2.6.27.39/arch/ia64/kernel/ptrace.c linux-2.6.27.39-vs2.3.0.36.8/arch/ia64/kernel/ptrace.c
---- linux-2.6.27.39/arch/ia64/kernel/ptrace.c 2008-07-13 23:51:29.000000000 +0200
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/ia64/kernel/ptrace.c 2008-10-13 14:54:20.000000000 +0200
+diff -NurpP --minimal linux-2.6.27.52/arch/ia64/kernel/ptrace.c linux-2.6.27.52-vs2.3.0.36.9/arch/ia64/kernel/ptrace.c
+--- linux-2.6.27.52/arch/ia64/kernel/ptrace.c 2008-07-13 23:51:29.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/ia64/kernel/ptrace.c 2008-10-13 14:54:20.000000000 +0200
@@ -22,6 +22,7 @@
#include <linux/signal.h>
#include <linux/regset.h>
@@ -300,9 +300,9 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.27.39/arch/ia64/kernel/traps.c linux-2.6.27.39-vs2.3.0.36.8/arch/ia64/kernel/traps.c
---- linux-2.6.27.39/arch/ia64/kernel/traps.c 2008-07-13 23:51:29.000000000 +0200
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/ia64/kernel/traps.c 2008-10-13 14:54:20.000000000 +0200
+diff -NurpP --minimal linux-2.6.27.52/arch/ia64/kernel/traps.c linux-2.6.27.52-vs2.3.0.36.9/arch/ia64/kernel/traps.c
+--- linux-2.6.27.52/arch/ia64/kernel/traps.c 2008-07-13 23:51:29.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/ia64/kernel/traps.c 2008-10-13 14:54:20.000000000 +0200
@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
@@ -327,9 +327,9 @@
}
}
}
-diff -NurpP --minimal linux-2.6.27.39/arch/ia64/mm/fault.c linux-2.6.27.39-vs2.3.0.36.8/arch/ia64/mm/fault.c
---- linux-2.6.27.39/arch/ia64/mm/fault.c 2008-07-13 23:51:29.000000000 +0200
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/ia64/mm/fault.c 2008-10-13 14:54:20.000000000 +0200
+diff -NurpP --minimal linux-2.6.27.52/arch/ia64/mm/fault.c linux-2.6.27.52-vs2.3.0.36.9/arch/ia64/mm/fault.c
+--- linux-2.6.27.52/arch/ia64/mm/fault.c 2008-07-13 23:51:29.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/ia64/mm/fault.c 2008-10-13 14:54:20.000000000 +0200
@@ -10,6 +10,7 @@
#include <linux/interrupt.h>
#include <linux/kprobes.h>
@@ -338,9 +338,9 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.27.39/arch/m32r/kernel/traps.c linux-2.6.27.39-vs2.3.0.36.8/arch/m32r/kernel/traps.c
---- linux-2.6.27.39/arch/m32r/kernel/traps.c 2008-10-13 14:51:55.000000000 +0200
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/m32r/kernel/traps.c 2008-10-13 14:54:20.000000000 +0200
+diff -NurpP --minimal linux-2.6.27.52/arch/m32r/kernel/traps.c linux-2.6.27.52-vs2.3.0.36.9/arch/m32r/kernel/traps.c
+--- linux-2.6.27.52/arch/m32r/kernel/traps.c 2008-10-13 14:51:55.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/m32r/kernel/traps.c 2008-10-13 14:54:20.000000000 +0200
@@ -196,8 +196,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
@@ -353,9 +353,9 @@
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-2.6.27.39/arch/m68k/Kconfig linux-2.6.27.39-vs2.3.0.36.8/arch/m68k/Kconfig
---- linux-2.6.27.39/arch/m68k/Kconfig 2009-11-11 03:12:51.000000000 +0100
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/m68k/Kconfig 2009-11-11 03:17:47.000000000 +0100
+diff -NurpP --minimal linux-2.6.27.52/arch/m68k/Kconfig linux-2.6.27.52-vs2.3.0.36.9/arch/m68k/Kconfig
+--- linux-2.6.27.52/arch/m68k/Kconfig 2010-08-24 21:57:55.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/m68k/Kconfig 2009-11-11 03:17:47.000000000 +0100
@@ -633,6 +633,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -365,9 +365,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.27.39/arch/m68k/kernel/ptrace.c linux-2.6.27.39-vs2.3.0.36.8/arch/m68k/kernel/ptrace.c
---- linux-2.6.27.39/arch/m68k/kernel/ptrace.c 2008-07-13 23:51:29.000000000 +0200
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/m68k/kernel/ptrace.c 2008-10-13 14:54:20.000000000 +0200
+diff -NurpP --minimal linux-2.6.27.52/arch/m68k/kernel/ptrace.c linux-2.6.27.52-vs2.3.0.36.9/arch/m68k/kernel/ptrace.c
+--- linux-2.6.27.52/arch/m68k/kernel/ptrace.c 2008-07-13 23:51:29.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/m68k/kernel/ptrace.c 2008-10-13 14:54:20.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/ptrace.h>
#include <linux/user.h>
@@ -385,9 +385,9 @@
return ret;
out_eio:
-diff -NurpP --minimal linux-2.6.27.39/arch/m68k/kernel/traps.c linux-2.6.27.39-vs2.3.0.36.8/arch/m68k/kernel/traps.c
---- linux-2.6.27.39/arch/m68k/kernel/traps.c 2008-07-13 23:51:29.000000000 +0200
-+++ linux-2.6.27.39-vs2.3.0.36.8/arch/m68k/kernel/traps.c 2008-10-13 14:54:20.000000000 +0200
+diff -NurpP --minimal linux-2.6.27.52/arch/m68k/kernel/traps.c linux-2.6.27.52-vs2.3.0.36.9/arch/m68k/kernel/traps.c
+--- linux-2.6.27.52/arch/m68k/kernel/traps.c 2008-07-13 23:51:29.000000000 +0200
++++ linux-2.6.27.52-vs2.3.0.36.9/arch/m68k/kernel/traps.c 2008-10-13 14:54:20.000000000 +0200
@@ -909,8 +909,8 @@ void show_registers(struct pt_regs *regs
printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
regs->d4, regs->d5, regs->a0, regs->a1);
@@ -399,9 +399,9 @@
addr = (unsigned long)&fp->un;
printk("Frame format=%X ", regs->format);
switch (regs->format) {
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-small_fixes.patch?r1=1.1.2.15.2.9&r2=1.1.2.15.2.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.40.2.2&r2=1.40.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-xfs-32bit-projid.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.441.2.2036.2.60&r2=1.441.2.2036.2.61&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/linux-2.6-grsec_full.patch?r1=1.1.2.51.2.9&r2=1.1.2.51.2.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/linux-2.6-vs2.3.patch?r1=1.2.4.11.2.47.2.15&r2=1.2.4.11.2.47.2.16&f=u
More information about the pld-cvs-commit
mailing list