packages (LINUX_3_0): kernel/kernel-small_fixes.patch, kernel/kernel-vserve...
arekm
arekm at pld-linux.org
Thu Dec 22 16:04:01 CET 2011
Author: arekm Date: Thu Dec 22 15:04:00 2011 GMT
Module: packages Tag: LINUX_3_0
---- Log message:
- up to 3.0.14; REMEMBER, PAE support in CPU is NEEDED for i686 kernel NOW
---- Files affected:
packages/kernel:
kernel-small_fixes.patch (1.43.2.13 -> 1.43.2.14) , kernel-vserver-2.3.patch (1.83.2.4 -> 1.83.2.5) , kernel.spec (1.987.2.20 -> 1.987.2.21)
---- Diffs:
================================================================
Index: packages/kernel/kernel-small_fixes.patch
diff -u packages/kernel/kernel-small_fixes.patch:1.43.2.13 packages/kernel/kernel-small_fixes.patch:1.43.2.14
--- packages/kernel/kernel-small_fixes.patch:1.43.2.13 Wed Dec 21 14:38:20 2011
+++ packages/kernel/kernel-small_fixes.patch Thu Dec 22 16:03:54 2011
@@ -962,154 +962,6 @@
--
1.7.4.1
-
-Subject: [PATCH 1/2] xfs: fix nfs export of 64-bit inodes numbers on 32-bit
- kernels
-
-commit c29f7d457ac63311feb11928a866efd2fe153d74 upstream.
-
-The i_ino field in the VFS inode is of type unsigned long and thus can't
-hold the full 64-bit inode number on 32-bit kernels. We have the full
-inode number in the XFS inode, so use that one for nfs exports. Note
-that I've also switched the 32-bit file handles types to it, just to make
-the code more consistent and copy & paste errors less likely to happen.
-
-Reported-by: Guoquan Yang <ygq51 at hotmail.com>
-Reported-by: Hank Peng <pengxihan at gmail.com>
-Signed-off-by: Christoph Hellwig <hch at lst.de>
-Signed-off-by: Ben Myers <bpm at sgi.com>
-
-diff --git a/fs/xfs/linux-2.6/xfs_export.c b/fs/xfs/linux-2.6/xfs_export.c
-index f4f878f..fed3f3c 100644
---- a/fs/xfs/linux-2.6/xfs_export.c
-+++ b/fs/xfs/linux-2.6/xfs_export.c
-@@ -98,22 +98,22 @@ xfs_fs_encode_fh(
- switch (fileid_type) {
- case FILEID_INO32_GEN_PARENT:
- spin_lock(&dentry->d_lock);
-- fid->i32.parent_ino = dentry->d_parent->d_inode->i_ino;
-+ fid->i32.parent_ino = XFS_I(dentry->d_parent->d_inode)->i_ino;
- fid->i32.parent_gen = dentry->d_parent->d_inode->i_generation;
- spin_unlock(&dentry->d_lock);
- /*FALLTHRU*/
- case FILEID_INO32_GEN:
-- fid->i32.ino = inode->i_ino;
-+ fid->i32.ino = XFS_I(inode)->i_ino;
- fid->i32.gen = inode->i_generation;
- break;
- case FILEID_INO32_GEN_PARENT | XFS_FILEID_TYPE_64FLAG:
- spin_lock(&dentry->d_lock);
-- fid64->parent_ino = dentry->d_parent->d_inode->i_ino;
-+ fid64->parent_ino = XFS_I(dentry->d_parent->d_inode)->i_ino;
- fid64->parent_gen = dentry->d_parent->d_inode->i_generation;
- spin_unlock(&dentry->d_lock);
- /*FALLTHRU*/
- case FILEID_INO32_GEN | XFS_FILEID_TYPE_64FLAG:
-- fid64->ino = inode->i_ino;
-+ fid64->ino = XFS_I(inode)->i_ino;
- fid64->gen = inode->i_generation;
- break;
- }
-
-_______________________________________________
-xfs mailing list
-xfs at oss.sgi.com
-http://oss.sgi.com/mailman/listinfo/xfs
-Subject: [PATCH 2/2] xfs: avoid synchronous transactions when deleting attr
- blocks
-
-commit 859f57ca00805e6c482eef1a7ab073097d02c8ca upstream.
-
-[slightly different from the upstream version because of a previous cleanup]
-
-Currently xfs_attr_inactive causes a synchronous transactions if we are
-removing a file that has any extents allocated to the attribute fork, and
-thus makes XFS extremely slow at removing files with out of line extended
-attributes. The code looks a like a relict from the days before the busy
-extent list, but with the busy extent list we avoid reusing data and attr
-extents that have been freed but not commited yet, so this code is just
-as superflous as the synchronous transactions for data blocks.
-
-Signed-off-by: Christoph Hellwig <hch at lst.de>
-Reported-by: Bernd Schubert <bernd.schubert at itwm.fraunhofer.de>
-Reviewed-by: Dave Chinner <dchinner at redhat.com>
-Signed-off-by: Alex Elder <aelder at sgi.com>
-
-diff --git a/fs/xfs/xfs_attr.c b/fs/xfs/xfs_attr.c
-index 01d2072..99d4011 100644
---- a/fs/xfs/xfs_attr.c
-+++ b/fs/xfs/xfs_attr.c
-@@ -822,17 +822,9 @@ xfs_attr_inactive(xfs_inode_t *dp)
- error = xfs_attr_root_inactive(&trans, dp);
- if (error)
- goto out;
-- /*
-- * signal synchronous inactive transactions unless this
-- * is a synchronous mount filesystem in which case we
-- * know that we're here because we've been called out of
-- * xfs_inactive which means that the last reference is gone
-- * and the unlink transaction has already hit the disk so
-- * async inactive transactions are safe.
-- */
-- if ((error = xfs_itruncate_finish(&trans, dp, 0LL, XFS_ATTR_FORK,
-- (!(mp->m_flags & XFS_MOUNT_WSYNC)
-- ? 1 : 0))))
-+
-+ error = xfs_itruncate_finish(&trans, dp, 0LL, XFS_ATTR_FORK, 0);
-+ if (error)
- goto out;
-
- /*
-diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
-index e546a33..a175933 100644
---- a/fs/xfs/xfs_bmap.c
-+++ b/fs/xfs/xfs_bmap.c
-@@ -3785,19 +3785,11 @@ xfs_bmap_compute_maxlevels(
- * Routine to be called at transaction's end by xfs_bmapi, xfs_bunmapi
- * caller. Frees all the extents that need freeing, which must be done
- * last due to locking considerations. We never free any extents in
-- * the first transaction. This is to allow the caller to make the first
-- * transaction a synchronous one so that the pointers to the data being
-- * broken in this transaction will be permanent before the data is actually
-- * freed. This is necessary to prevent blocks from being reallocated
-- * and written to before the free and reallocation are actually permanent.
-- * We do not just make the first transaction synchronous here, because
-- * there are more efficient ways to gain the same protection in some cases
-- * (see the file truncation code).
-+ * the first transaction.
- *
- * Return 1 if the given transaction was committed and a new one
- * started, and 0 otherwise in the committed parameter.
- */
--/*ARGSUSED*/
- int /* error */
- xfs_bmap_finish(
- xfs_trans_t **tp, /* transaction pointer addr */
-diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
-index c6888a4..5715279 100644
---- a/fs/xfs/xfs_inode.c
-+++ b/fs/xfs/xfs_inode.c
-@@ -1528,15 +1528,7 @@ xfs_itruncate_finish(
- xfs_trans_log_inode(ntp, ip, XFS_ILOG_CORE);
- }
- }
-- } else if (sync) {
-- ASSERT(!(mp->m_flags & XFS_MOUNT_WSYNC));
-- if (ip->i_d.di_anextents > 0)
-- xfs_trans_set_sync(ntp);
- }
-- ASSERT(fork == XFS_DATA_FORK ||
-- (fork == XFS_ATTR_FORK &&
-- ((sync && !(mp->m_flags & XFS_MOUNT_WSYNC)) ||
-- (sync == 0 && (mp->m_flags & XFS_MOUNT_WSYNC)))));
-
- /*
- * Since it is possible for space to become allocated beyond
-
-_______________________________________________
-xfs mailing list
-xfs at oss.sgi.com
-http://oss.sgi.com/mailman/listinfo/xfs
commit 33b8f7c2479dfcbc5c27174e44b5f659d9f33c70
Author: Christoph Hellwig <hch at lst.de>
Date: Fri Jul 8 14:34:39 2011 +0200
================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.83.2.4 packages/kernel/kernel-vserver-2.3.patch:1.83.2.5
--- packages/kernel/kernel-vserver-2.3.patch:1.83.2.4 Tue Nov 22 11:24:04 2011
+++ packages/kernel/kernel-vserver-2.3.patch Thu Dec 22 16:03:54 2011
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-3.0.9/Documentation/vserver/debug.txt linux-3.0.9-vs2.3.2.1/Documentation/vserver/debug.txt
---- linux-3.0.9/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.9-vs2.3.2.1/Documentation/vserver/debug.txt 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/Documentation/vserver/debug.txt linux-3.0.13-vs2.3.2.1/Documentation/vserver/debug.txt
+--- linux-3.0.13/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.13-vs2.3.2.1/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.9/arch/alpha/Kconfig linux-3.0.9-vs2.3.2.1/arch/alpha/Kconfig
---- linux-3.0.9/arch/alpha/Kconfig 2011-07-22 11:17:32.000000000 +0200
-+++ linux-3.0.9-vs2.3.2.1/arch/alpha/Kconfig 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/alpha/Kconfig linux-3.0.13-vs2.3.2.1/arch/alpha/Kconfig
+--- linux-3.0.13/arch/alpha/Kconfig 2011-07-22 11:17:32.000000000 +0200
++++ linux-3.0.13-vs2.3.2.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
@@ -168,9 +168,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.9/arch/alpha/kernel/entry.S linux-3.0.9-vs2.3.2.1/arch/alpha/kernel/entry.S
---- linux-3.0.9/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200
-+++ linux-3.0.9-vs2.3.2.1/arch/alpha/kernel/entry.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/alpha/kernel/entry.S linux-3.0.13-vs2.3.2.1/arch/alpha/kernel/entry.S
+--- linux-3.0.13/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200
++++ linux-3.0.13-vs2.3.2.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
@@ -203,9 +203,9 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-3.0.9/arch/alpha/kernel/ptrace.c linux-3.0.9-vs2.3.2.1/arch/alpha/kernel/ptrace.c
---- linux-3.0.9/arch/alpha/kernel/ptrace.c 2011-01-05 21:48:40.000000000 +0100
-+++ linux-3.0.9-vs2.3.2.1/arch/alpha/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/alpha/kernel/ptrace.c linux-3.0.13-vs2.3.2.1/arch/alpha/kernel/ptrace.c
+--- linux-3.0.13/arch/alpha/kernel/ptrace.c 2011-01-05 21:48:40.000000000 +0100
++++ linux-3.0.13-vs2.3.2.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>
@@ -214,9 +214,9 @@
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-3.0.9/arch/alpha/kernel/systbls.S linux-3.0.9-vs2.3.2.1/arch/alpha/kernel/systbls.S
---- linux-3.0.9/arch/alpha/kernel/systbls.S 2011-07-22 11:17:32.000000000 +0200
-+++ linux-3.0.9-vs2.3.2.1/arch/alpha/kernel/systbls.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/alpha/kernel/systbls.S linux-3.0.13-vs2.3.2.1/arch/alpha/kernel/systbls.S
+--- linux-3.0.13/arch/alpha/kernel/systbls.S 2011-07-22 11:17:32.000000000 +0200
++++ linux-3.0.13-vs2.3.2.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
@@ -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.9/arch/alpha/kernel/traps.c linux-3.0.9-vs2.3.2.1/arch/alpha/kernel/traps.c
---- linux-3.0.9/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200
-+++ linux-3.0.9-vs2.3.2.1/arch/alpha/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/alpha/kernel/traps.c linux-3.0.13-vs2.3.2.1/arch/alpha/kernel/traps.c
+--- linux-3.0.13/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200
++++ linux-3.0.13-vs2.3.2.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());
@@ -239,10 +239,10 @@
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-3.0.9/arch/arm/Kconfig linux-3.0.9-vs2.3.2.1/arch/arm/Kconfig
---- linux-3.0.9/arch/arm/Kconfig 2011-11-15 16:40:41.000000000 +0100
-+++ linux-3.0.9-vs2.3.2.1/arch/arm/Kconfig 2011-10-18 13:51:13.000000000 +0200
-@@ -2049,6 +2049,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-3.0.13/arch/arm/Kconfig linux-3.0.13-vs2.3.2.1/arch/arm/Kconfig
+--- linux-3.0.13/arch/arm/Kconfig 2011-12-19 15:10:36.000000000 +0100
++++ linux-3.0.13-vs2.3.2.1/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.9/arch/arm/kernel/calls.S linux-3.0.9-vs2.3.2.1/arch/arm/kernel/calls.S
---- linux-3.0.9/arch/arm/kernel/calls.S 2011-07-22 11:17:32.000000000 +0200
-+++ linux-3.0.9-vs2.3.2.1/arch/arm/kernel/calls.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/arm/kernel/calls.S linux-3.0.13-vs2.3.2.1/arch/arm/kernel/calls.S
+--- linux-3.0.13/arch/arm/kernel/calls.S 2011-07-22 11:17:32.000000000 +0200
++++ linux-3.0.13-vs2.3.2.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)
@@ -263,10 +263,10 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-3.0.9/arch/arm/kernel/process.c linux-3.0.9-vs2.3.2.1/arch/arm/kernel/process.c
---- linux-3.0.9/arch/arm/kernel/process.c 2011-05-22 16:16:47.000000000 +0200
-+++ linux-3.0.9-vs2.3.2.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)
+diff -NurpP --minimal linux-3.0.13/arch/arm/kernel/process.c linux-3.0.13-vs2.3.2.1/arch/arm/kernel/process.c
+--- linux-3.0.13/arch/arm/kernel/process.c 2011-12-19 15:10:36.000000000 +0100
++++ linux-3.0.13-vs2.3.2.1/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)
{
printk("\n");
@@ -276,9 +276,9 @@
__show_regs(regs);
__backtrace();
}
-diff -NurpP --minimal linux-3.0.9/arch/arm/kernel/traps.c linux-3.0.9-vs2.3.2.1/arch/arm/kernel/traps.c
---- linux-3.0.9/arch/arm/kernel/traps.c 2011-07-22 11:17:32.000000000 +0200
-+++ linux-3.0.9-vs2.3.2.1/arch/arm/kernel/traps.c 2011-06-22 12:39:12.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/arm/kernel/traps.c linux-3.0.13-vs2.3.2.1/arch/arm/kernel/traps.c
+--- linux-3.0.13/arch/arm/kernel/traps.c 2011-07-22 11:17:32.000000000 +0200
++++ linux-3.0.13-vs2.3.2.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();
@@ -290,9 +290,9 @@
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-3.0.9/arch/cris/Kconfig linux-3.0.9-vs2.3.2.1/arch/cris/Kconfig
---- linux-3.0.9/arch/cris/Kconfig 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.9-vs2.3.2.1/arch/cris/Kconfig 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/cris/Kconfig linux-3.0.13-vs2.3.2.1/arch/cris/Kconfig
+--- linux-3.0.13/arch/cris/Kconfig 2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.13-vs2.3.2.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"
@@ -302,9 +302,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.9/arch/frv/kernel/kernel_thread.S linux-3.0.9-vs2.3.2.1/arch/frv/kernel/kernel_thread.S
---- linux-3.0.9/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0.9-vs2.3.2.1/arch/frv/kernel/kernel_thread.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/frv/kernel/kernel_thread.S linux-3.0.13-vs2.3.2.1/arch/frv/kernel/kernel_thread.S
+--- linux-3.0.13/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
++++ linux-3.0.13-vs2.3.2.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
@@ -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.9/arch/h8300/Kconfig linux-3.0.9-vs2.3.2.1/arch/h8300/Kconfig
---- linux-3.0.9/arch/h8300/Kconfig 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.9-vs2.3.2.1/arch/h8300/Kconfig 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/h8300/Kconfig linux-3.0.13-vs2.3.2.1/arch/h8300/Kconfig
+--- linux-3.0.13/arch/h8300/Kconfig 2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.13-vs2.3.2.1/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.9/arch/ia64/Kconfig linux-3.0.9-vs2.3.2.1/arch/ia64/Kconfig
---- linux-3.0.9/arch/ia64/Kconfig 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.9-vs2.3.2.1/arch/ia64/Kconfig 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/ia64/Kconfig linux-3.0.13-vs2.3.2.1/arch/ia64/Kconfig
+--- linux-3.0.13/arch/ia64/Kconfig 2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.13-vs2.3.2.1/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.9/arch/ia64/include/asm/tlb.h linux-3.0.9-vs2.3.2.1/arch/ia64/include/asm/tlb.h
---- linux-3.0.9/arch/ia64/include/asm/tlb.h 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.9-vs2.3.2.1/arch/ia64/include/asm/tlb.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/ia64/include/asm/tlb.h linux-3.0.13-vs2.3.2.1/arch/ia64/include/asm/tlb.h
+--- linux-3.0.13/arch/ia64/include/asm/tlb.h 2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.13-vs2.3.2.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>
@@ -349,9 +349,9 @@
#include <asm/pgalloc.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-3.0.9/arch/ia64/kernel/entry.S linux-3.0.9-vs2.3.2.1/arch/ia64/kernel/entry.S
---- linux-3.0.9/arch/ia64/kernel/entry.S 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.9-vs2.3.2.1/arch/ia64/kernel/entry.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/ia64/kernel/entry.S linux-3.0.13-vs2.3.2.1/arch/ia64/kernel/entry.S
+--- linux-3.0.13/arch/ia64/kernel/entry.S 2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.13-vs2.3.2.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
@@ -361,9 +361,9 @@
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-3.0.9/arch/ia64/kernel/perfmon.c linux-3.0.9-vs2.3.2.1/arch/ia64/kernel/perfmon.c
---- linux-3.0.9/arch/ia64/kernel/perfmon.c 2011-03-15 18:06:39.000000000 +0100
-+++ linux-3.0.9-vs2.3.2.1/arch/ia64/kernel/perfmon.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/ia64/kernel/perfmon.c linux-3.0.13-vs2.3.2.1/arch/ia64/kernel/perfmon.c
+--- linux-3.0.13/arch/ia64/kernel/perfmon.c 2011-03-15 18:06:39.000000000 +0100
++++ linux-3.0.13-vs2.3.2.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>
@@ -372,9 +372,9 @@
#include <asm/errno.h>
#include <asm/intrinsics.h>
-diff -NurpP --minimal linux-3.0.9/arch/ia64/kernel/process.c linux-3.0.9-vs2.3.2.1/arch/ia64/kernel/process.c
---- linux-3.0.9/arch/ia64/kernel/process.c 2011-03-15 18:06:39.000000000 +0100
-+++ linux-3.0.9-vs2.3.2.1/arch/ia64/kernel/process.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/ia64/kernel/process.c linux-3.0.13-vs2.3.2.1/arch/ia64/kernel/process.c
+--- linux-3.0.13/arch/ia64/kernel/process.c 2011-03-15 18:06:39.000000000 +0100
++++ linux-3.0.13-vs2.3.2.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;
@@ -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.9/arch/ia64/kernel/ptrace.c linux-3.0.9-vs2.3.2.1/arch/ia64/kernel/ptrace.c
---- linux-3.0.9/arch/ia64/kernel/ptrace.c 2011-01-05 21:48:59.000000000 +0100
-+++ linux-3.0.9-vs2.3.2.1/arch/ia64/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/ia64/kernel/ptrace.c linux-3.0.13-vs2.3.2.1/arch/ia64/kernel/ptrace.c
+--- linux-3.0.13/arch/ia64/kernel/ptrace.c 2011-01-05 21:48:59.000000000 +0100
++++ linux-3.0.13-vs2.3.2.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>
@@ -397,9 +397,9 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-3.0.9/arch/ia64/kernel/traps.c linux-3.0.9-vs2.3.2.1/arch/ia64/kernel/traps.c
---- linux-3.0.9/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200
-+++ linux-3.0.9-vs2.3.2.1/arch/ia64/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/ia64/kernel/traps.c linux-3.0.13-vs2.3.2.1/arch/ia64/kernel/traps.c
+--- linux-3.0.13/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200
++++ linux-3.0.13-vs2.3.2.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();
@@ -424,9 +424,9 @@
}
}
}
-diff -NurpP --minimal linux-3.0.9/arch/ia64/mm/fault.c linux-3.0.9-vs2.3.2.1/arch/ia64/mm/fault.c
---- linux-3.0.9/arch/ia64/mm/fault.c 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.9-vs2.3.2.1/arch/ia64/mm/fault.c 2011-06-10 22:28:23.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/ia64/mm/fault.c linux-3.0.13-vs2.3.2.1/arch/ia64/mm/fault.c
+--- linux-3.0.13/arch/ia64/mm/fault.c 2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.13-vs2.3.2.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>
@@ -435,9 +435,9 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-3.0.9/arch/m32r/kernel/traps.c linux-3.0.9-vs2.3.2.1/arch/m32r/kernel/traps.c
---- linux-3.0.9/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100
-+++ linux-3.0.9-vs2.3.2.1/arch/m32r/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/m32r/kernel/traps.c linux-3.0.13-vs2.3.2.1/arch/m32r/kernel/traps.c
+--- linux-3.0.13/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100
++++ linux-3.0.13-vs2.3.2.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);
@@ -450,9 +450,9 @@
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-3.0.9/arch/m68k/Kconfig linux-3.0.9-vs2.3.2.1/arch/m68k/Kconfig
---- linux-3.0.9/arch/m68k/Kconfig 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.9-vs2.3.2.1/arch/m68k/Kconfig 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/m68k/Kconfig linux-3.0.13-vs2.3.2.1/arch/m68k/Kconfig
+--- linux-3.0.13/arch/m68k/Kconfig 2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.13-vs2.3.2.1/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.9/arch/mips/Kconfig linux-3.0.9-vs2.3.2.1/arch/mips/Kconfig
---- linux-3.0.9/arch/mips/Kconfig 2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.9-vs2.3.2.1/arch/mips/Kconfig 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/mips/Kconfig linux-3.0.13-vs2.3.2.1/arch/mips/Kconfig
+--- linux-3.0.13/arch/mips/Kconfig 2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.13-vs2.3.2.1/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.9/arch/mips/kernel/ptrace.c linux-3.0.9-vs2.3.2.1/arch/mips/kernel/ptrace.c
---- linux-3.0.9/arch/mips/kernel/ptrace.c 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.9-vs2.3.2.1/arch/mips/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/mips/kernel/ptrace.c linux-3.0.13-vs2.3.2.1/arch/mips/kernel/ptrace.c
+--- linux-3.0.13/arch/mips/kernel/ptrace.c 2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.13-vs2.3.2.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>
@@ -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.9/arch/mips/kernel/scall32-o32.S linux-3.0.9-vs2.3.2.1/arch/mips/kernel/scall32-o32.S
---- linux-3.0.9/arch/mips/kernel/scall32-o32.S 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.9-vs2.3.2.1/arch/mips/kernel/scall32-o32.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/mips/kernel/scall32-o32.S linux-3.0.13-vs2.3.2.1/arch/mips/kernel/scall32-o32.S
+--- linux-3.0.13/arch/mips/kernel/scall32-o32.S 2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.13-vs2.3.2.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 */
@@ -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.9/arch/mips/kernel/scall64-64.S linux-3.0.9-vs2.3.2.1/arch/mips/kernel/scall64-64.S
---- linux-3.0.9/arch/mips/kernel/scall64-64.S 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.9-vs2.3.2.1/arch/mips/kernel/scall64-64.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/mips/kernel/scall64-64.S linux-3.0.13-vs2.3.2.1/arch/mips/kernel/scall64-64.S
+--- linux-3.0.13/arch/mips/kernel/scall64-64.S 2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.13-vs2.3.2.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
@@ -519,9 +519,9 @@
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.0.9/arch/mips/kernel/scall64-n32.S linux-3.0.9-vs2.3.2.1/arch/mips/kernel/scall64-n32.S
---- linux-3.0.9/arch/mips/kernel/scall64-n32.S 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.9-vs2.3.2.1/arch/mips/kernel/scall64-n32.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/mips/kernel/scall64-n32.S linux-3.0.13-vs2.3.2.1/arch/mips/kernel/scall64-n32.S
+--- linux-3.0.13/arch/mips/kernel/scall64-n32.S 2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.13-vs2.3.2.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
@@ -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.9/arch/mips/kernel/scall64-o32.S linux-3.0.9-vs2.3.2.1/arch/mips/kernel/scall64-o32.S
---- linux-3.0.9/arch/mips/kernel/scall64-o32.S 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.9-vs2.3.2.1/arch/mips/kernel/scall64-o32.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/mips/kernel/scall64-o32.S linux-3.0.13-vs2.3.2.1/arch/mips/kernel/scall64-o32.S
+--- linux-3.0.13/arch/mips/kernel/scall64-o32.S 2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.13-vs2.3.2.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 */
@@ -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.9/arch/mips/kernel/traps.c linux-3.0.9-vs2.3.2.1/arch/mips/kernel/traps.c
---- linux-3.0.9/arch/mips/kernel/traps.c 2011-05-22 16:17:00.000000000 +0200
-+++ linux-3.0.9-vs2.3.2.1/arch/mips/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/mips/kernel/traps.c linux-3.0.13-vs2.3.2.1/arch/mips/kernel/traps.c
+--- linux-3.0.13/arch/mips/kernel/traps.c 2011-05-22 16:17:00.000000000 +0200
++++ linux-3.0.13-vs2.3.2.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);
@@ -560,9 +560,9 @@
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-3.0.9/arch/parisc/Kconfig linux-3.0.9-vs2.3.2.1/arch/parisc/Kconfig
---- linux-3.0.9/arch/parisc/Kconfig 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.9-vs2.3.2.1/arch/parisc/Kconfig 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/parisc/Kconfig linux-3.0.13-vs2.3.2.1/arch/parisc/Kconfig
+--- linux-3.0.13/arch/parisc/Kconfig 2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.13-vs2.3.2.1/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.9/arch/parisc/kernel/syscall_table.S linux-3.0.9-vs2.3.2.1/arch/parisc/kernel/syscall_table.S
---- linux-3.0.9/arch/parisc/kernel/syscall_table.S 2011-11-15 16:40:42.000000000 +0100
-+++ linux-3.0.9-vs2.3.2.1/arch/parisc/kernel/syscall_table.S 2011-08-29 03:45:07.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/parisc/kernel/syscall_table.S linux-3.0.13-vs2.3.2.1/arch/parisc/kernel/syscall_table.S
+--- linux-3.0.13/arch/parisc/kernel/syscall_table.S 2011-12-19 15:10:37.000000000 +0100
++++ linux-3.0.13-vs2.3.2.1/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.9/arch/parisc/kernel/traps.c linux-3.0.9-vs2.3.2.1/arch/parisc/kernel/traps.c
---- linux-3.0.9/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200
-+++ linux-3.0.9-vs2.3.2.1/arch/parisc/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.13/arch/parisc/kernel/traps.c linux-3.0.13-vs2.3.2.1/arch/parisc/kernel/traps.c
+--- linux-3.0.13/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200
++++ linux-3.0.13-vs2.3.2.1/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 @@
<<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.43.2.13&r2=1.43.2.14&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.83.2.4&r2=1.83.2.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.987.2.20&r2=1.987.2.21&f=u
More information about the pld-cvs-commit
mailing list