SOURCES (LINUX_2_6_22): linux-2.6-vs2.3.patch - updated (based on ...
arekm
arekm at pld-linux.org
Fri Jan 18 13:26:29 CET 2008
Author: arekm Date: Fri Jan 18 12:26:29 2008 GMT
Module: SOURCES Tag: LINUX_2_6_22
---- Log message:
- updated (based on patch-2.6.22.16-vs2.3.0.29.2.diff)
---- Files affected:
SOURCES:
linux-2.6-vs2.3.patch (1.2.4.11.2.11.2.11 -> 1.2.4.11.2.11.2.12)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.11.2.11 SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.11.2.12
--- SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.11.2.11 Tue Jan 15 09:44:17 2008
+++ SOURCES/linux-2.6-vs2.3.patch Fri Jan 18 13:26:22 2008
@@ -1,176 +1,6 @@
-diff -NurpP --minimal linux-2.6.22.10/Documentation/vserver/debug.txt linux-2.6.22.10-vs2.3.0.29/Documentation/vserver/debug.txt
---- linux-2.6.22.10/Documentation/vserver/debug.txt 1970-01-01 01:00:00 +0100
-+++ linux-2.6.22.10-vs2.3.0.29/Documentation/vserver/debug.txt 2007-08-05 20:53:12 +0200
-@@ -0,0 +1,154 @@
-+
-+debug_cvirt:
-+
-+ 2 4 "vx_map_tgid: %p/%llx: %d -> %d"
-+ "vx_rmap_tgid: %p/%llx: %d -> %d"
-+
-+debug_dlim:
-+
-+ 0 1 "ALLOC (%p,#%d)%c inode (%d)"
-+ "FREE (%p,#%d)%c inode"
-+ 1 2 "ALLOC (%p,#%d)%c %lld bytes (%d)"
-+ "FREE (%p,#%d)%c %lld bytes"
-+ 2 4 "ADJUST: %lld,%lld on %ld,%ld [mult=%d]"
-+ 3 8 "ext3_has_free_blocks(%p): %lu<%lu+1, %c, %u!=%u r=%d"
-+ "ext3_has_free_blocks(%p): free=%lu, root=%lu"
-+ "rcu_free_dl_info(%p)"
-+ 4 10 "alloc_dl_info(%p,%d) = %p"
-+ "dealloc_dl_info(%p)"
-+ "get_dl_info(%p[#%d.%d])"
-+ "put_dl_info(%p[#%d.%d])"
-+ 5 20 "alloc_dl_info(%p,%d)*"
-+ 6 40 "__hash_dl_info: %p[#%d]"
-+ "__unhash_dl_info: %p[#%d]"
-+ 7 80 "locate_dl_info(%p,#%d) = %p"
-+
-+debug_misc:
-+
-+ 0 1 "destroy_dqhash: %p [#0x%08x] c=%d"
-+ "new_dqhash: %p [#0x%08x]"
-+ "vroot[%d]_clr_dev: dev=%p[%lu,%d:%d]"
-+ "vroot[%d]_get_real_bdev: dev=%p[%lu,%d:%d]"
-+ "vroot[%d]_set_dev: dev=%p[%lu,%d:%d]"
-+ "vroot_get_real_bdev not set"
-+ 1 2 "cow_break_link(ť%sŤ)"
-+ "temp copy ť%sŤ"
-+ 2 4 "dentry_open(new): %p"
-+ "dentry_open(old): %p"
-+ "lookup_create(new): %p"
-+ "old path ť%sŤ"
-+ "path_lookup(old): %d"
-+ "vfs_create(new): %d"
-+ "vfs_rename: %d"
-+ "vfs_sendfile: %d"
-+ 3 8 "fput(new_file=%p[#%d])"
-+ "fput(old_file=%p[#%d])"
-+ 4 10 "vx_info_kill(%p[#%d],%d,%d) = %d"
-+ "vx_info_kill(%p[#%d],%d,%d)*"
-+ 5 20 "vs_reboot(%p[#%d],%d)"
-+ 6 40 "dropping task %p[#%u,%u] for %p[#%u,%u]"
-+
-+debug_net:
-+
-+ 2 4 "nx_addr_conflict(%p,%p) %d.%d,%d.%d"
-+ 3 8 "inet_bind(%p) %d.%d.%d.%d, %d.%d.%d.%d, %d.%d.%d.%d"
-+ "inet_bind(%p)* %p,%p;%lx %d.%d.%d.%d"
-+ 4 10 "ip_route_connect(%p) %p,%p;%lx"
-+ 5 20 "__addr_in_socket(%p,%d.%d.%d.%d) %p:%d.%d.%d.%d %p;%lx"
-+ 6 40 "sk,egf: %p [#%d] (from %d)"
-+ "sk,egn: %p [#%d] (from %d)"
-+ "sk,req: %p [#%d] (from %d)"
-+ "sk: %p [#%d] (from %d)"
-+ "tw: %p [#%d] (from %d)"
-+ 7 80 "__sock_recvmsg: %p[%p,%p,%p;%d]:%d/%d"
-+ "__sock_sendmsg: %p[%p,%p,%p;%d]:%d/%d"
-+
-+debug_nid:
-+
-+ 0 1 "__lookup_nx_info(#%u): %p[#%u]"
-+ "alloc_nx_info(%d) = %p"
-+ "create_nx_info(%d) (dynamic rejected)"
-+ "create_nx_info(%d) = %p (already there)"
-+ "create_nx_info(%d) = %p (new)"
-+ "dealloc_nx_info(%p)"
-+ 1 2 "alloc_nx_info(%d)*"
-+ "create_nx_info(%d)*"
-+ 2 4 "get_nx_info(%p[#%d.%d])"
-+ "put_nx_info(%p[#%d.%d])"
-+ 3 8 "claim_nx_info(%p[#%d.%d.%d]) %p"
-+ "clr_nx_info(%p[#%d.%d])"
-+ "init_nx_info(%p[#%d.%d])"
-+ "release_nx_info(%p[#%d.%d.%d]) %p"
-+ "set_nx_info(%p[#%d.%d])"
-+ 4 10 "__hash_nx_info: %p[#%d]"
-+ "__nx_dynamic_id: [#%d]"
-+ "__unhash_nx_info: %p[#%d.%d.%d]"
-+ 5 20 "moved task %p into nxi:%p[#%d]"
-+ "nx_migrate_task(%p,%p[#%d.%d.%d])"
-+ "task_get_nx_info(%p)"
-+ 6 40 "nx_clear_persistent(%p[#%d])"
-+
-+debug_quota:
-+
-+ 0 1 "quota_sync_dqh(%p,%d) discard inode %p"
-+ 1 2 "quota_sync_dqh(%p,%d)"
-+ "sync_dquots(%p,%d)"
-+ "sync_dquots_dqh(%p,%d)"
-+ 3 8 "do_quotactl(%p,%d,cmd=%d,id=%d,%p)"
-+
-+debug_switch:
-+
-+ 0 1 "vc: VCMD_%02d_%d[%d], %d,%p [%d,%d,%x,%x]"
-+ 1 2 "vc: VCMD_%02d_%d[%d] = %08lx(%ld) [%d,%d]"
-+ 4 10 "%s: (%s %s) returned %s with %d"
-+
-+debug_tag:
-+
-+ 7 80 "dx_parse_tag(ť%sŤ): %d:#%d"
-+ "dx_propagate_tag(%p[#%lu.%d]): %d,%d"
-+
-+debug_xid:
-+
-+ 0 1 "__lookup_vx_info(#%u): %p[#%u]"
-+ "alloc_vx_info(%d) = %p"
-+ "alloc_vx_info(%d)*"
-+ "create_vx_info(%d) (dynamic rejected)"
-+ "create_vx_info(%d) = %p (already there)"
-+ "create_vx_info(%d) = %p (new)"
-+ "dealloc_vx_info(%p)"
-+ "loc_vx_info(%d) = %p (found)"
-+ "loc_vx_info(%d) = %p (new)"
-+ "loc_vx_info(%d) = %p (not available)"
-+ 1 2 "create_vx_info(%d)*"
-+ "loc_vx_info(%d)*"
-+ 2 4 "get_vx_info(%p[#%d.%d])"
-+ "put_vx_info(%p[#%d.%d])"
-+ 3 8 "claim_vx_info(%p[#%d.%d.%d]) %p"
-+ "clr_vx_info(%p[#%d.%d])"
-+ "init_vx_info(%p[#%d.%d])"
-+ "release_vx_info(%p[#%d.%d.%d]) %p"
-+ "set_vx_info(%p[#%d.%d])"
-+ 4 10 "__hash_vx_info: %p[#%d]"
-+ "__unhash_vx_info: %p[#%d.%d.%d]"
-+ "__vx_dynamic_id: [#%d]"
-+ 5 20 "enter_vx_info(%p[#%d],%p) %p[#%d,%p]"
-+ "leave_vx_info(%p[#%d,%p]) %p[#%d,%p]"
-+ "moved task %p into vxi:%p[#%d]"
-+ "task_get_vx_info(%p)"
-+ "vx_migrate_task(%p,%p[#%d.%d])"
-+ 6 40 "vx_clear_persistent(%p[#%d])"
-+ "vx_exit_init(%p[#%d],%p[#%d,%d,%d])"
-+ "vx_set_init(%p[#%d],%p[#%d,%d,%d])"
-+ "vx_set_persistent(%p[#%d])"
-+ "vx_set_reaper(%p[#%d],%p[#%d,%d])"
-+ 7 80 "vx_child_reaper(%p[#%u,%u]) = %p[#%u,%u]"
-+
-+
-+debug_limit:
-+
-+ n 2^n "vx_acc_cres[%5d,%s,%2d]: %5d%s"
-+ "vx_cres_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
-+
-+ 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-2.6.22.10/Makefile linux-2.6.22.10-vs2.3.0.29/Makefile
---- linux-2.6.22.10/Makefile 2007-10-30 01:57:11 +0100
-+++ linux-2.6.22.10-vs2.3.0.29/Makefile 2007-10-30 02:41:27 +0100
-@@ -1,7 +1,7 @@
- VERSION = 2
- PATCHLEVEL = 6
- SUBLEVEL = 22
--EXTRAVERSION = .16
-+EXTRAVERSION = .16-vs2.3.0.29
- NAME = Holy Dancing Manatees, Batman!
-
- # *DOCUMENTATION*
-diff -NurpP --minimal linux-2.6.22.10/arch/alpha/Kconfig linux-2.6.22.10-vs2.3.0.29/arch/alpha/Kconfig
---- linux-2.6.22.10/arch/alpha/Kconfig 2007-07-09 13:17:31 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/alpha/Kconfig 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/alpha/Kconfig linux-2.6.22.15-vs2.3.0.29.1/arch/alpha/Kconfig
+--- linux-2.6.22.15/arch/alpha/Kconfig 2007-07-21 17:59:44.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/alpha/Kconfig 2007-12-09 06:44:17.000000000 -0500
@@ -662,6 +662,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -180,9 +10,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.10/arch/alpha/kernel/asm-offsets.c linux-2.6.22.10-vs2.3.0.29/arch/alpha/kernel/asm-offsets.c
---- linux-2.6.22.10/arch/alpha/kernel/asm-offsets.c 2006-02-15 13:54:10 +0100
-+++ linux-2.6.22.10-vs2.3.0.29/arch/alpha/kernel/asm-offsets.c 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/alpha/kernel/asm-offsets.c linux-2.6.22.15-vs2.3.0.29.1/arch/alpha/kernel/asm-offsets.c
+--- linux-2.6.22.15/arch/alpha/kernel/asm-offsets.c 2006-06-17 21:49:35.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/alpha/kernel/asm-offsets.c 2007-12-09 06:44:17.000000000 -0500
@@ -36,6 +36,7 @@ void foo(void)
DEFINE(PT_PTRACED, PT_PTRACED);
DEFINE(CLONE_VM, CLONE_VM);
@@ -191,9 +21,9 @@
DEFINE(SIGCHLD, SIGCHLD);
BLANK();
-diff -NurpP --minimal linux-2.6.22.10/arch/alpha/kernel/entry.S linux-2.6.22.10-vs2.3.0.29/arch/alpha/kernel/entry.S
---- linux-2.6.22.10/arch/alpha/kernel/entry.S 2007-07-09 13:17:31 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/alpha/kernel/entry.S 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/alpha/kernel/entry.S linux-2.6.22.15-vs2.3.0.29.1/arch/alpha/kernel/entry.S
+--- linux-2.6.22.15/arch/alpha/kernel/entry.S 2007-07-21 17:59:44.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/alpha/kernel/entry.S 2007-12-09 06:44:17.000000000 -0500
@@ -643,7 +643,7 @@ kernel_thread:
stq $2, 152($sp) /* HAE */
@@ -235,9 +65,9 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.22.10/arch/alpha/kernel/osf_sys.c linux-2.6.22.10-vs2.3.0.29/arch/alpha/kernel/osf_sys.c
---- linux-2.6.22.10/arch/alpha/kernel/osf_sys.c 2007-07-09 13:17:31 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/alpha/kernel/osf_sys.c 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/alpha/kernel/osf_sys.c linux-2.6.22.15-vs2.3.0.29.1/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.22.15/arch/alpha/kernel/osf_sys.c 2007-07-21 17:59:44.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/alpha/kernel/osf_sys.c 2007-12-09 06:44:17.000000000 -0500
@@ -883,7 +883,7 @@ osf_gettimeofday(struct timeval32 __user
{
if (tv) {
@@ -247,9 +77,9 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.22.10/arch/alpha/kernel/ptrace.c linux-2.6.22.10-vs2.3.0.29/arch/alpha/kernel/ptrace.c
---- linux-2.6.22.10/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/alpha/kernel/ptrace.c 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/alpha/kernel/ptrace.c linux-2.6.22.15-vs2.3.0.29.1/arch/alpha/kernel/ptrace.c
+--- linux-2.6.22.15/arch/alpha/kernel/ptrace.c 2006-06-17 21:49:35.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/alpha/kernel/ptrace.c 2007-12-09 06:44:17.000000000 -0500
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/security.h>
@@ -270,9 +100,9 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
goto out;
-diff -NurpP --minimal linux-2.6.22.10/arch/alpha/kernel/semaphore.c linux-2.6.22.10-vs2.3.0.29/arch/alpha/kernel/semaphore.c
---- linux-2.6.22.10/arch/alpha/kernel/semaphore.c 2004-08-14 12:55:32 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/alpha/kernel/semaphore.c 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/alpha/kernel/semaphore.c linux-2.6.22.15-vs2.3.0.29.1/arch/alpha/kernel/semaphore.c
+--- linux-2.6.22.15/arch/alpha/kernel/semaphore.c 2006-06-17 21:49:35.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/alpha/kernel/semaphore.c 2007-12-09 06:44:17.000000000 -0500
@@ -68,8 +68,8 @@ __down_failed(struct semaphore *sem)
DECLARE_WAITQUEUE(wait, tsk);
@@ -306,9 +136,9 @@
#endif
tsk->state = TASK_INTERRUPTIBLE;
-diff -NurpP --minimal linux-2.6.22.10/arch/alpha/kernel/systbls.S linux-2.6.22.10-vs2.3.0.29/arch/alpha/kernel/systbls.S
---- linux-2.6.22.10/arch/alpha/kernel/systbls.S 2007-07-09 13:17:31 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/alpha/kernel/systbls.S 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/alpha/kernel/systbls.S linux-2.6.22.15-vs2.3.0.29.1/arch/alpha/kernel/systbls.S
+--- linux-2.6.22.15/arch/alpha/kernel/systbls.S 2007-07-21 17:59:44.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/alpha/kernel/systbls.S 2007-12-09 06:44:17.000000000 -0500
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -318,9 +148,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.22.10/arch/alpha/kernel/traps.c linux-2.6.22.10-vs2.3.0.29/arch/alpha/kernel/traps.c
---- linux-2.6.22.10/arch/alpha/kernel/traps.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/alpha/kernel/traps.c 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/alpha/kernel/traps.c linux-2.6.22.15-vs2.3.0.29.1/arch/alpha/kernel/traps.c
+--- linux-2.6.22.15/arch/alpha/kernel/traps.c 2007-05-04 09:55:03.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/alpha/kernel/traps.c 2007-12-09 06:44:17.000000000 -0500
@@ -182,7 +182,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -331,9 +161,9 @@
dik_show_regs(regs, r9_15);
dik_show_trace((unsigned long *)(regs+1));
dik_show_code((unsigned int *)regs->pc);
-diff -NurpP --minimal linux-2.6.22.10/arch/alpha/mm/fault.c linux-2.6.22.10-vs2.3.0.29/arch/alpha/mm/fault.c
---- linux-2.6.22.10/arch/alpha/mm/fault.c 2007-07-09 13:17:32 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/alpha/mm/fault.c 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/alpha/mm/fault.c linux-2.6.22.15-vs2.3.0.29.1/arch/alpha/mm/fault.c
+--- linux-2.6.22.15/arch/alpha/mm/fault.c 2007-07-21 17:59:44.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/alpha/mm/fault.c 2007-12-09 06:44:17.000000000 -0500
@@ -197,8 +197,8 @@ do_page_fault(unsigned long address, uns
down_read(&mm->mmap_sem);
goto survive;
@@ -345,9 +175,9 @@
if (!user_mode(regs))
goto no_context;
do_exit(SIGKILL);
-diff -NurpP --minimal linux-2.6.22.10/arch/arm/Kconfig linux-2.6.22.10-vs2.3.0.29/arch/arm/Kconfig
---- linux-2.6.22.10/arch/arm/Kconfig 2007-07-09 13:17:32 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/arm/Kconfig 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/arm/Kconfig linux-2.6.22.15-vs2.3.0.29.1/arch/arm/Kconfig
+--- linux-2.6.22.15/arch/arm/Kconfig 2007-07-21 17:59:44.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/arm/Kconfig 2007-12-09 06:44:17.000000000 -0500
@@ -1042,6 +1042,8 @@ source "arch/arm/oprofile/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -357,9 +187,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.10/arch/arm/kernel/calls.S linux-2.6.22.10-vs2.3.0.29/arch/arm/kernel/calls.S
---- linux-2.6.22.10/arch/arm/kernel/calls.S 2007-07-09 13:17:32 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/arm/kernel/calls.S 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/arm/kernel/calls.S linux-2.6.22.15-vs2.3.0.29.1/arch/arm/kernel/calls.S
+--- linux-2.6.22.15/arch/arm/kernel/calls.S 2007-07-21 17:59:44.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/arm/kernel/calls.S 2007-12-09 06:44:17.000000000 -0500
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -369,9 +199,9 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.22.10/arch/arm/kernel/process.c linux-2.6.22.10-vs2.3.0.29/arch/arm/kernel/process.c
---- linux-2.6.22.10/arch/arm/kernel/process.c 2007-07-09 13:17:32 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/arm/kernel/process.c 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/arm/kernel/process.c linux-2.6.22.15-vs2.3.0.29.1/arch/arm/kernel/process.c
+--- linux-2.6.22.15/arch/arm/kernel/process.c 2007-07-21 17:59:44.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/arm/kernel/process.c 2007-12-09 06:44:17.000000000 -0500
@@ -261,7 +261,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
@@ -392,9 +222,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.22.10/arch/arm/kernel/traps.c linux-2.6.22.10-vs2.3.0.29/arch/arm/kernel/traps.c
---- linux-2.6.22.10/arch/arm/kernel/traps.c 2007-07-09 13:17:32 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/arm/kernel/traps.c 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/arm/kernel/traps.c linux-2.6.22.15-vs2.3.0.29.1/arch/arm/kernel/traps.c
+--- linux-2.6.22.15/arch/arm/kernel/traps.c 2007-07-21 17:59:44.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/arm/kernel/traps.c 2007-12-09 06:44:17.000000000 -0500
@@ -222,8 +222,8 @@ static void __die(const char *str, int e
str, err, ++die_counter);
print_modules();
@@ -406,9 +236,9 @@
if (!user_mode(regs) || in_interrupt()) {
dump_mem("Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.22.10/arch/arm/mm/fault.c linux-2.6.22.10-vs2.3.0.29/arch/arm/mm/fault.c
---- linux-2.6.22.10/arch/arm/mm/fault.c 2007-07-09 13:17:39 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/arm/mm/fault.c 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/arm/mm/fault.c linux-2.6.22.15-vs2.3.0.29.1/arch/arm/mm/fault.c
+--- linux-2.6.22.15/arch/arm/mm/fault.c 2007-07-21 17:59:44.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/arm/mm/fault.c 2007-12-09 06:44:17.000000000 -0500
@@ -266,7 +266,8 @@ do_page_fault(unsigned long addr, unsign
* happened to us that made us unable to handle
* the page fault gracefully.
@@ -419,9 +249,9 @@
do_exit(SIGKILL);
return 0;
-diff -NurpP --minimal linux-2.6.22.10/arch/arm26/Kconfig linux-2.6.22.10-vs2.3.0.29/arch/arm26/Kconfig
---- linux-2.6.22.10/arch/arm26/Kconfig 2007-07-09 13:17:40 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/arm26/Kconfig 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/arm26/Kconfig linux-2.6.22.15-vs2.3.0.29.1/arch/arm26/Kconfig
+--- linux-2.6.22.15/arch/arm26/Kconfig 2007-07-21 17:59:44.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/arm26/Kconfig 2007-12-09 06:44:17.000000000 -0500
@@ -243,6 +243,8 @@ source "drivers/usb/Kconfig"
source "arch/arm26/Kconfig.debug"
@@ -431,9 +261,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.10/arch/arm26/kernel/calls.S linux-2.6.22.10-vs2.3.0.29/arch/arm26/kernel/calls.S
---- linux-2.6.22.10/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
-+++ linux-2.6.22.10-vs2.3.0.29/arch/arm26/kernel/calls.S 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/arm26/kernel/calls.S linux-2.6.22.15-vs2.3.0.29.1/arch/arm26/kernel/calls.S
+--- linux-2.6.22.15/arch/arm26/kernel/calls.S 2006-06-17 21:49:35.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/arm26/kernel/calls.S 2007-12-09 06:44:17.000000000 -0500
@@ -257,6 +257,11 @@ __syscall_start:
.long sys_lremovexattr
.long sys_fremovexattr
@@ -446,9 +276,9 @@
__syscall_end:
.rept NR_syscalls - (__syscall_end - __syscall_start) / 4
-diff -NurpP --minimal linux-2.6.22.10/arch/arm26/kernel/process.c linux-2.6.22.10-vs2.3.0.29/arch/arm26/kernel/process.c
---- linux-2.6.22.10/arch/arm26/kernel/process.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/arm26/kernel/process.c 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/arm26/kernel/process.c linux-2.6.22.15-vs2.3.0.29.1/arch/arm26/kernel/process.c
+--- linux-2.6.22.15/arch/arm26/kernel/process.c 2007-05-04 09:55:07.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/arm26/kernel/process.c 2007-12-09 06:44:17.000000000 -0500
@@ -365,7 +365,8 @@ pid_t kernel_thread(int (*fn)(void *), v
regs.ARM_r3 = (unsigned long)do_exit;
regs.ARM_pc = (unsigned long)kernel_thread_helper | MODE_SVC26;
@@ -459,9 +289,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.22.10/arch/arm26/kernel/traps.c linux-2.6.22.10-vs2.3.0.29/arch/arm26/kernel/traps.c
---- linux-2.6.22.10/arch/arm26/kernel/traps.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/arm26/kernel/traps.c 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/arm26/kernel/traps.c linux-2.6.22.15-vs2.3.0.29.1/arch/arm26/kernel/traps.c
+--- linux-2.6.22.15/arch/arm26/kernel/traps.c 2007-05-04 09:55:07.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/arm26/kernel/traps.c 2007-12-09 06:44:17.000000000 -0500
@@ -185,8 +185,9 @@ NORET_TYPE void die(const char *str, str
printk("Internal error: %s: %x\n", str, err);
printk("CPU: %d\n", smp_processor_id());
@@ -474,21 +304,9 @@
if (!user_mode(regs) || in_interrupt()) {
__dump_stack(tsk, (unsigned long)(regs + 1));
-diff -NurpP --minimal linux-2.6.22.10/arch/cris/Kconfig linux-2.6.22.10-vs2.3.0.29/arch/cris/Kconfig
---- linux-2.6.22.10/arch/cris/Kconfig 2007-05-02 19:24:19 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/cris/Kconfig 2007-08-05 20:53:12 +0200
-@@ -200,6 +200,8 @@ source "drivers/usb/Kconfig"
-
- source "arch/cris/Kconfig.debug"
-
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
-
- source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.10/arch/cris/arch-v10/kernel/process.c linux-2.6.22.10-vs2.3.0.29/arch/cris/arch-v10/kernel/process.c
---- linux-2.6.22.10/arch/cris/arch-v10/kernel/process.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/cris/arch-v10/kernel/process.c 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/cris/arch-v10/kernel/process.c linux-2.6.22.15-vs2.3.0.29.1/arch/cris/arch-v10/kernel/process.c
+--- linux-2.6.22.15/arch/cris/arch-v10/kernel/process.c 2007-05-04 09:55:07.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/cris/arch-v10/kernel/process.c 2007-12-09 06:44:17.000000000 -0500
@@ -103,7 +103,8 @@ int kernel_thread(int (*fn)(void *), voi
regs.dccr = 1 << I_DCCR_BITNR;
@@ -499,9 +317,9 @@
}
/* setup the child's kernel stack with a pt_regs and switch_stack on it.
-diff -NurpP --minimal linux-2.6.22.10/arch/cris/arch-v32/kernel/process.c linux-2.6.22.10-vs2.3.0.29/arch/cris/arch-v32/kernel/process.c
---- linux-2.6.22.10/arch/cris/arch-v32/kernel/process.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/cris/arch-v32/kernel/process.c 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/cris/arch-v32/kernel/process.c linux-2.6.22.15-vs2.3.0.29.1/arch/cris/arch-v32/kernel/process.c
+--- linux-2.6.22.15/arch/cris/arch-v32/kernel/process.c 2007-05-04 09:55:07.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/cris/arch-v32/kernel/process.c 2007-12-09 06:44:17.000000000 -0500
@@ -120,7 +120,8 @@ kernel_thread(int (*fn)(void *), void *
regs.ccs = 1 << (I_CCS_BITNR + CCS_SHIFT);
@@ -512,9 +330,21 @@
}
/*
-diff -NurpP --minimal linux-2.6.22.10/arch/frv/kernel/kernel_thread.S linux-2.6.22.10-vs2.3.0.29/arch/frv/kernel/kernel_thread.S
---- linux-2.6.22.10/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20 +0100
-+++ linux-2.6.22.10-vs2.3.0.29/arch/frv/kernel/kernel_thread.S 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/cris/Kconfig linux-2.6.22.15-vs2.3.0.29.1/arch/cris/Kconfig
+--- linux-2.6.22.15/arch/cris/Kconfig 2007-07-21 17:58:14.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/cris/Kconfig 2007-12-09 06:44:17.000000000 -0500
+@@ -200,6 +200,8 @@ source "drivers/usb/Kconfig"
+
+ source "arch/cris/Kconfig.debug"
+
++source "kernel/vserver/Kconfig"
++
+ source "security/Kconfig"
+
+ source "crypto/Kconfig"
+diff -Nurp linux-2.6.22.15/arch/frv/kernel/kernel_thread.S linux-2.6.22.15-vs2.3.0.29.1/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.22.15/arch/frv/kernel/kernel_thread.S 2006-06-17 21:49:35.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/frv/kernel/kernel_thread.S 2007-12-09 06:44:17.000000000 -0500
@@ -13,6 +13,8 @@
#include <asm/unistd.h>
@@ -533,9 +363,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.22.10/arch/h8300/Kconfig linux-2.6.22.10-vs2.3.0.29/arch/h8300/Kconfig
---- linux-2.6.22.10/arch/h8300/Kconfig 2007-07-09 13:17:41 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/h8300/Kconfig 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/h8300/Kconfig linux-2.6.22.15-vs2.3.0.29.1/arch/h8300/Kconfig
+--- linux-2.6.22.15/arch/h8300/Kconfig 2007-07-21 17:59:44.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/h8300/Kconfig 2007-12-09 06:44:17.000000000 -0500
@@ -222,6 +222,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -545,9 +375,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.10/arch/h8300/kernel/process.c linux-2.6.22.10-vs2.3.0.29/arch/h8300/kernel/process.c
---- linux-2.6.22.10/arch/h8300/kernel/process.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/h8300/kernel/process.c 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/h8300/kernel/process.c linux-2.6.22.15-vs2.3.0.29.1/arch/h8300/kernel/process.c
+--- linux-2.6.22.15/arch/h8300/kernel/process.c 2007-05-04 09:55:07.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/h8300/kernel/process.c 2007-12-09 06:44:17.000000000 -0500
@@ -134,7 +134,7 @@ int kernel_thread(int (*fn)(void *), voi
fs = get_fs();
@@ -557,9 +387,9 @@
__asm__("mov.l sp,er3\n\t"
"sub.l er2,er2\n\t"
"mov.l %2,er1\n\t"
-diff -NurpP --minimal linux-2.6.22.10/arch/i386/Kconfig linux-2.6.22.10-vs2.3.0.29/arch/i386/Kconfig
---- linux-2.6.22.10/arch/i386/Kconfig 2007-07-09 13:17:41 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/i386/Kconfig 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/i386/Kconfig linux-2.6.22.15-vs2.3.0.29.1/arch/i386/Kconfig
+--- linux-2.6.22.15/arch/i386/Kconfig 2007-07-21 17:59:44.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/i386/Kconfig 2007-12-09 06:44:17.000000000 -0500
@@ -1230,6 +1230,8 @@ endmenu
source "arch/i386/Kconfig.debug"
@@ -569,9 +399,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.10/arch/i386/kernel/process.c linux-2.6.22.10-vs2.3.0.29/arch/i386/kernel/process.c
---- linux-2.6.22.10/arch/i386/kernel/process.c 2007-07-09 13:17:42 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/i386/kernel/process.c 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/i386/kernel/process.c linux-2.6.22.15-vs2.3.0.29.1/arch/i386/kernel/process.c
+--- linux-2.6.22.15/arch/i386/kernel/process.c 2007-07-21 17:59:45.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/i386/kernel/process.c 2007-12-09 06:44:17.000000000 -0500
@@ -302,8 +302,10 @@ void show_regs(struct pt_regs * regs)
unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L;
@@ -595,9 +425,9 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.22.10/arch/i386/kernel/syscall_table.S linux-2.6.22.10-vs2.3.0.29/arch/i386/kernel/syscall_table.S
---- linux-2.6.22.10/arch/i386/kernel/syscall_table.S 2007-07-09 13:17:42 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/i386/kernel/syscall_table.S 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/i386/kernel/syscall_table.S linux-2.6.22.15-vs2.3.0.29.1/arch/i386/kernel/syscall_table.S
+--- linux-2.6.22.15/arch/i386/kernel/syscall_table.S 2007-07-21 17:59:45.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/i386/kernel/syscall_table.S 2007-12-09 06:44:17.000000000 -0500
@@ -272,7 +272,7 @@ ENTRY(sys_call_table)
.long sys_tgkill /* 270 */
.long sys_utimes
@@ -607,9 +437,9 @@
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.22.10/arch/i386/kernel/sysenter.c linux-2.6.22.10-vs2.3.0.29/arch/i386/kernel/sysenter.c
---- linux-2.6.22.10/arch/i386/kernel/sysenter.c 2007-10-30 01:57:12 +0100
-+++ linux-2.6.22.10-vs2.3.0.29/arch/i386/kernel/sysenter.c 2007-09-05 03:06:10 +0200
+diff -Nurp linux-2.6.22.15/arch/i386/kernel/sysenter.c linux-2.6.22.15-vs2.3.0.29.1/arch/i386/kernel/sysenter.c
+--- linux-2.6.22.15/arch/i386/kernel/sysenter.c 2007-08-25 21:38:36.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/i386/kernel/sysenter.c 2007-12-09 06:44:17.000000000 -0500
@@ -17,6 +17,7 @@
#include <linux/elf.h>
#include <linux/mm.h>
@@ -618,9 +448,9 @@
#include <asm/cpufeature.h>
#include <asm/msr.h>
-diff -NurpP --minimal linux-2.6.22.10/arch/i386/kernel/traps.c linux-2.6.22.10-vs2.3.0.29/arch/i386/kernel/traps.c
---- linux-2.6.22.10/arch/i386/kernel/traps.c 2007-07-09 13:17:42 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/i386/kernel/traps.c 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/i386/kernel/traps.c linux-2.6.22.15-vs2.3.0.29.1/arch/i386/kernel/traps.c
+--- linux-2.6.22.15/arch/i386/kernel/traps.c 2007-07-21 17:59:45.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/i386/kernel/traps.c 2007-12-09 06:44:17.000000000 -0500
@@ -56,6 +56,8 @@
#include <asm/stacktrace.h>
@@ -662,9 +492,9 @@
/* Executive summary in case the oops scrolled away */
esp = (unsigned long) (®s->esp);
savesegment(ss, ss);
-diff -NurpP --minimal linux-2.6.22.10/arch/i386/mm/fault.c linux-2.6.22.10-vs2.3.0.29/arch/i386/mm/fault.c
---- linux-2.6.22.10/arch/i386/mm/fault.c 2007-10-30 01:57:12 +0100
-+++ linux-2.6.22.10-vs2.3.0.29/arch/i386/mm/fault.c 2007-09-05 03:06:10 +0200
+diff -Nurp linux-2.6.22.15/arch/i386/mm/fault.c linux-2.6.22.15-vs2.3.0.29.1/arch/i386/mm/fault.c
+--- linux-2.6.22.15/arch/i386/mm/fault.c 2007-09-05 01:07:59.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/i386/mm/fault.c 2007-12-09 06:44:17.000000000 -0500
@@ -587,7 +587,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
@@ -675,21 +505,9 @@
if (error_code & 4)
do_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.22.10/arch/ia64/Kconfig linux-2.6.22.10-vs2.3.0.29/arch/ia64/Kconfig
---- linux-2.6.22.10/arch/ia64/Kconfig 2007-07-09 13:17:43 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/ia64/Kconfig 2007-08-05 20:53:12 +0200
-@@ -592,6 +592,8 @@ endmenu
-
- source "arch/ia64/Kconfig.debug"
-
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
-
- source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.10/arch/ia64/ia32/binfmt_elf32.c linux-2.6.22.10-vs2.3.0.29/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.22.10/arch/ia64/ia32/binfmt_elf32.c 2007-05-02 19:24:20 +0200
-+++ linux-2.6.22.10-vs2.3.0.29/arch/ia64/ia32/binfmt_elf32.c 2007-08-05 20:53:12 +0200
+diff -Nurp linux-2.6.22.15/arch/ia64/ia32/binfmt_elf32.c linux-2.6.22.15-vs2.3.0.29.1/arch/ia64/ia32/binfmt_elf32.c
+--- linux-2.6.22.15/arch/ia64/ia32/binfmt_elf32.c 2007-07-21 17:58:15.000000000 -0400
++++ linux-2.6.22.15-vs2.3.0.29.1/arch/ia64/ia32/binfmt_elf32.c 2007-12-09 06:44:17.000000000 -0500
@@ -233,7 +233,8 @@ ia32_setup_arg_pages (struct linux_binpr
kmem_cache_free(vm_area_cachep, mpnt);
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6-vs2.3.patch?r1=1.2.4.11.2.11.2.11&r2=1.2.4.11.2.11.2.12&f=u
More information about the pld-cvs-commit
mailing list