SOURCES (hawk-LINUX_2_6): linux-2.6-vs2.3.patch - updated for kern...

hawk hawk at pld-linux.org
Thu May 31 16:36:17 CEST 2007


Author: hawk                         Date: Thu May 31 14:36:17 2007 GMT
Module: SOURCES                       Tag: hawk-LINUX_2_6
---- Log message:
- updated for kernel 2.6.21.3

---- Files affected:
SOURCES:
   linux-2.6-vs2.3.patch (1.1.2.8 -> 1.1.2.9) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.1.2.8 SOURCES/linux-2.6-vs2.3.patch:1.1.2.9
--- SOURCES/linux-2.6-vs2.3.patch:1.1.2.8	Thu May 31 12:59:15 2007
+++ SOURCES/linux-2.6-vs2.3.patch	Thu May 31 16:36:11 2007
@@ -1,165 +1,7 @@
-diff -NurpP --minimal linux-2.6.20.11/Documentation/vserver/debug.txt linux-2.6.20.11-vs2.3.0.12/Documentation/vserver/debug.txt
---- linux-2.6.20.11/Documentation/vserver/debug.txt	1970-01-01 01:00:00 +0100
-+++ linux-2.6.20.11-vs2.3.0.12/Documentation/vserver/debug.txt	2007-02-06 03:05:21 +0100
-@@ -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.20.11/arch/alpha/Kconfig linux-2.6.20.11-vs2.3.0.12/arch/alpha/Kconfig
---- linux-2.6.20.11/arch/alpha/Kconfig	2007-02-06 02:59:58 +0100
-+++ linux-2.6.20.11-vs2.3.0.12/arch/alpha/Kconfig	2007-02-06 03:05:21 +0100
-@@ -640,6 +640,8 @@ source "arch/alpha/oprofile/Kconfig"
+diff -urNp linux-2.6.21.orig/arch/alpha/Kconfig linux-2.6.21/arch/alpha/Kconfig
+--- linux-2.6.21.orig/arch/alpha/Kconfig	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/alpha/Kconfig	2007-05-31 16:07:14.000000000 +0200
+@@ -644,6 +644,8 @@ source "arch/alpha/oprofile/Kconfig"
  
  source "arch/alpha/Kconfig.debug"
  
@@ -168,9 +10,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.20.11/arch/alpha/kernel/asm-offsets.c linux-2.6.20.11-vs2.3.0.12/arch/alpha/kernel/asm-offsets.c
---- linux-2.6.20.11/arch/alpha/kernel/asm-offsets.c	2006-02-15 13:54:10 +0100
-+++ linux-2.6.20.11-vs2.3.0.12/arch/alpha/kernel/asm-offsets.c	2007-02-06 03:05:21 +0100
+diff -urNp linux-2.6.21.orig/arch/alpha/kernel/asm-offsets.c linux-2.6.21/arch/alpha/kernel/asm-offsets.c
+--- linux-2.6.21.orig/arch/alpha/kernel/asm-offsets.c	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/alpha/kernel/asm-offsets.c	2007-05-31 16:07:14.000000000 +0200
 @@ -36,6 +36,7 @@ void foo(void)
  	DEFINE(PT_PTRACED, PT_PTRACED);
  	DEFINE(CLONE_VM, CLONE_VM);
@@ -179,9 +21,9 @@
  	DEFINE(SIGCHLD, SIGCHLD);
  	BLANK();
  
-diff -NurpP --minimal linux-2.6.20.11/arch/alpha/kernel/entry.S linux-2.6.20.11-vs2.3.0.12/arch/alpha/kernel/entry.S
---- linux-2.6.20.11/arch/alpha/kernel/entry.S	2006-11-30 21:18:23 +0100
-+++ linux-2.6.20.11-vs2.3.0.12/arch/alpha/kernel/entry.S	2007-02-06 03:05:21 +0100
+diff -urNp linux-2.6.21.orig/arch/alpha/kernel/entry.S linux-2.6.21/arch/alpha/kernel/entry.S
+--- linux-2.6.21.orig/arch/alpha/kernel/entry.S	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/alpha/kernel/entry.S	2007-05-31 16:07:14.000000000 +0200
 @@ -644,7 +644,7 @@ kernel_thread:
  	stq	$2, 152($sp)		/* HAE */
  
@@ -223,9 +65,9 @@
  	ret
  .end sys_getxpid
  
-diff -NurpP --minimal linux-2.6.20.11/arch/alpha/kernel/osf_sys.c linux-2.6.20.11-vs2.3.0.12/arch/alpha/kernel/osf_sys.c
---- linux-2.6.20.11/arch/alpha/kernel/osf_sys.c	2007-02-06 02:59:58 +0100
-+++ linux-2.6.20.11-vs2.3.0.12/arch/alpha/kernel/osf_sys.c	2007-02-06 03:05:21 +0100
+diff -urNp linux-2.6.21.orig/arch/alpha/kernel/osf_sys.c linux-2.6.21/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.21.orig/arch/alpha/kernel/osf_sys.c	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/alpha/kernel/osf_sys.c	2007-05-31 16:07:14.000000000 +0200
 @@ -885,7 +885,7 @@ osf_gettimeofday(struct timeval32 __user
  {
  	if (tv) {
@@ -235,9 +77,9 @@
  		if (put_tv32(tv, &ktv))
  			return -EFAULT;
  	}
-diff -NurpP --minimal linux-2.6.20.11/arch/alpha/kernel/ptrace.c linux-2.6.20.11-vs2.3.0.12/arch/alpha/kernel/ptrace.c
---- linux-2.6.20.11/arch/alpha/kernel/ptrace.c	2006-04-09 13:49:39 +0200
-+++ linux-2.6.20.11-vs2.3.0.12/arch/alpha/kernel/ptrace.c	2007-02-06 03:05:21 +0100
+diff -urNp linux-2.6.21.orig/arch/alpha/kernel/ptrace.c linux-2.6.21/arch/alpha/kernel/ptrace.c
+--- linux-2.6.21.orig/arch/alpha/kernel/ptrace.c	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/alpha/kernel/ptrace.c	2007-05-31 16:07:14.000000000 +0200
 @@ -15,6 +15,7 @@
  #include <linux/slab.h>
  #include <linux/security.h>
@@ -258,9 +100,9 @@
  	if (request == PTRACE_ATTACH) {
  		ret = ptrace_attach(child);
  		goto out;
-diff -NurpP --minimal linux-2.6.20.11/arch/alpha/kernel/semaphore.c linux-2.6.20.11-vs2.3.0.12/arch/alpha/kernel/semaphore.c
---- linux-2.6.20.11/arch/alpha/kernel/semaphore.c	2004-08-14 12:55:32 +0200
-+++ linux-2.6.20.11-vs2.3.0.12/arch/alpha/kernel/semaphore.c	2007-02-06 03:05:21 +0100
+diff -urNp linux-2.6.21.orig/arch/alpha/kernel/semaphore.c linux-2.6.21/arch/alpha/kernel/semaphore.c
+--- linux-2.6.21.orig/arch/alpha/kernel/semaphore.c	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/alpha/kernel/semaphore.c	2007-05-31 16:07:14.000000000 +0200
 @@ -68,8 +68,8 @@ __down_failed(struct semaphore *sem)
  	DECLARE_WAITQUEUE(wait, tsk);
  
@@ -294,9 +136,9 @@
  #endif
  
  	tsk->state = TASK_INTERRUPTIBLE;
-diff -NurpP --minimal linux-2.6.20.11/arch/alpha/kernel/systbls.S linux-2.6.20.11-vs2.3.0.12/arch/alpha/kernel/systbls.S
---- linux-2.6.20.11/arch/alpha/kernel/systbls.S	2006-11-30 21:18:23 +0100
-+++ linux-2.6.20.11-vs2.3.0.12/arch/alpha/kernel/systbls.S	2007-02-06 03:05:21 +0100
+diff -urNp linux-2.6.21.orig/arch/alpha/kernel/systbls.S linux-2.6.21/arch/alpha/kernel/systbls.S
+--- linux-2.6.21.orig/arch/alpha/kernel/systbls.S	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/alpha/kernel/systbls.S	2007-05-31 16:07:14.000000000 +0200
 @@ -446,7 +446,7 @@ sys_call_table:
  	.quad sys_stat64			/* 425 */
  	.quad sys_lstat64
@@ -306,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.20.11/arch/alpha/kernel/traps.c linux-2.6.20.11-vs2.3.0.12/arch/alpha/kernel/traps.c
---- linux-2.6.20.11/arch/alpha/kernel/traps.c	2006-09-20 16:57:57 +0200
-+++ linux-2.6.20.11-vs2.3.0.12/arch/alpha/kernel/traps.c	2007-02-06 03:05:21 +0100
+diff -urNp linux-2.6.21.orig/arch/alpha/kernel/traps.c linux-2.6.21/arch/alpha/kernel/traps.c
+--- linux-2.6.21.orig/arch/alpha/kernel/traps.c	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/alpha/kernel/traps.c	2007-05-31 16:07:14.000000000 +0200
 @@ -182,7 +182,8 @@ die_if_kernel(char * str, struct pt_regs
  #ifdef CONFIG_SMP
  	printk("CPU %d ", hard_smp_processor_id());
@@ -319,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.20.11/arch/alpha/mm/fault.c linux-2.6.20.11-vs2.3.0.12/arch/alpha/mm/fault.c
---- linux-2.6.20.11/arch/alpha/mm/fault.c	2007-02-06 02:59:58 +0100
-+++ linux-2.6.20.11-vs2.3.0.12/arch/alpha/mm/fault.c	2007-03-29 19:33:59 +0200
+diff -urNp linux-2.6.21.orig/arch/alpha/mm/fault.c linux-2.6.21/arch/alpha/mm/fault.c
+--- linux-2.6.21.orig/arch/alpha/mm/fault.c	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/alpha/mm/fault.c	2007-05-31 16:07:14.000000000 +0200
 @@ -198,8 +198,8 @@ do_page_fault(unsigned long address, uns
  		down_read(&mm->mmap_sem);
  		goto survive;
@@ -333,10 +175,10 @@
  	if (!user_mode(regs))
  		goto no_context;
  	do_exit(SIGKILL);
-diff -NurpP --minimal linux-2.6.20.11/arch/arm/Kconfig linux-2.6.20.11-vs2.3.0.12/arch/arm/Kconfig
---- linux-2.6.20.11/arch/arm/Kconfig	2007-02-06 02:59:58 +0100
-+++ linux-2.6.20.11-vs2.3.0.12/arch/arm/Kconfig	2007-02-06 03:05:21 +0100
-@@ -970,6 +970,8 @@ source "arch/arm/oprofile/Kconfig"
+diff -urNp linux-2.6.21.orig/arch/arm/Kconfig linux-2.6.21/arch/arm/Kconfig
+--- linux-2.6.21.orig/arch/arm/Kconfig	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/arm/Kconfig	2007-05-31 16:07:14.000000000 +0200
+@@ -1005,6 +1005,8 @@ source "arch/arm/oprofile/Kconfig"
  
  source "arch/arm/Kconfig.debug"
  
@@ -345,9 +187,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.20.11/arch/arm/kernel/calls.S linux-2.6.20.11-vs2.3.0.12/arch/arm/kernel/calls.S
---- linux-2.6.20.11/arch/arm/kernel/calls.S	2007-02-06 02:59:59 +0100
-+++ linux-2.6.20.11-vs2.3.0.12/arch/arm/kernel/calls.S	2007-02-06 03:05:21 +0100
+diff -urNp linux-2.6.21.orig/arch/arm/kernel/calls.S linux-2.6.21/arch/arm/kernel/calls.S
+--- linux-2.6.21.orig/arch/arm/kernel/calls.S	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/arm/kernel/calls.S	2007-05-31 16:07:14.000000000 +0200
 @@ -322,7 +322,7 @@
  /* 310 */	CALL(sys_request_key)
  		CALL(sys_keyctl)
@@ -357,10 +199,10 @@
  		CALL(sys_ioprio_set)
  /* 315 */	CALL(sys_ioprio_get)
  		CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.20.11/arch/arm/kernel/process.c linux-2.6.20.11-vs2.3.0.12/arch/arm/kernel/process.c
---- linux-2.6.20.11/arch/arm/kernel/process.c	2007-02-06 02:59:59 +0100
-+++ linux-2.6.20.11-vs2.3.0.12/arch/arm/kernel/process.c	2007-02-06 03:05:21 +0100
-@@ -246,7 +246,8 @@ void __show_regs(struct pt_regs *regs)
+diff -urNp linux-2.6.21.orig/arch/arm/kernel/process.c linux-2.6.21/arch/arm/kernel/process.c
+--- linux-2.6.21.orig/arch/arm/kernel/process.c	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/arm/kernel/process.c	2007-05-31 16:07:14.000000000 +0200
+@@ -252,7 +252,8 @@ void __show_regs(struct pt_regs *regs)
  void show_regs(struct pt_regs * regs)
  {
  	printk("\n");
@@ -370,7 +212,7 @@
  	__show_regs(regs);
  	__backtrace();
  }
-@@ -408,7 +409,8 @@ pid_t kernel_thread(int (*fn)(void *), v
+@@ -414,7 +415,8 @@ pid_t kernel_thread(int (*fn)(void *), v
  	regs.ARM_pc = (unsigned long)kernel_thread_helper;
  	regs.ARM_cpsr = SVC_MODE;
  
@@ -380,10 +222,10 @@
  }
  EXPORT_SYMBOL(kernel_thread);
  
-diff -NurpP --minimal linux-2.6.20.11/arch/arm/kernel/traps.c linux-2.6.20.11-vs2.3.0.12/arch/arm/kernel/traps.c
---- linux-2.6.20.11/arch/arm/kernel/traps.c	2007-02-06 02:59:59 +0100
-+++ linux-2.6.20.11-vs2.3.0.12/arch/arm/kernel/traps.c	2007-02-06 03:05:21 +0100
-@@ -206,8 +206,8 @@ static void __die(const char *str, int e
+diff -urNp linux-2.6.21.orig/arch/arm/kernel/traps.c linux-2.6.21/arch/arm/kernel/traps.c
+--- linux-2.6.21.orig/arch/arm/kernel/traps.c	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/arm/kernel/traps.c	2007-05-31 16:07:14.000000000 +0200
+@@ -199,8 +199,8 @@ static void __die(const char *str, int e
  	printk("Internal error: %s: %x [#%d]\n", str, err, ++die_counter);
  	print_modules();
  	__show_regs(regs);
@@ -394,9 +236,9 @@
  
  	if (!user_mode(regs) || in_interrupt()) {
  		dump_mem("Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.20.11/arch/arm/mm/fault.c linux-2.6.20.11-vs2.3.0.12/arch/arm/mm/fault.c
---- linux-2.6.20.11/arch/arm/mm/fault.c	2007-02-06 03:00:01 +0100
-+++ linux-2.6.20.11-vs2.3.0.12/arch/arm/mm/fault.c	2007-03-29 19:33:59 +0200
+diff -urNp linux-2.6.21.orig/arch/arm/mm/fault.c linux-2.6.21/arch/arm/mm/fault.c
+--- linux-2.6.21.orig/arch/arm/mm/fault.c	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/arm/mm/fault.c	2007-05-31 16:07:14.000000000 +0200
 @@ -267,7 +267,8 @@ do_page_fault(unsigned long addr, unsign
  		 * happened to us that made us unable to handle
  		 * the page fault gracefully.
@@ -407,10 +249,10 @@
  		do_exit(SIGKILL);
  		return 0;
  
-diff -NurpP --minimal linux-2.6.20.11/arch/arm26/Kconfig linux-2.6.20.11-vs2.3.0.12/arch/arm26/Kconfig
---- linux-2.6.20.11/arch/arm26/Kconfig	2007-02-06 03:00:02 +0100
-+++ linux-2.6.20.11-vs2.3.0.12/arch/arm26/Kconfig	2007-02-06 03:05:21 +0100
-@@ -242,6 +242,8 @@ source "drivers/usb/Kconfig"
+diff -urNp linux-2.6.21.orig/arch/arm26/Kconfig linux-2.6.21/arch/arm26/Kconfig
+--- linux-2.6.21.orig/arch/arm26/Kconfig	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/arm26/Kconfig	2007-05-31 16:07:14.000000000 +0200
+@@ -246,6 +246,8 @@ source "drivers/usb/Kconfig"
  
  source "arch/arm26/Kconfig.debug"
  
@@ -419,9 +261,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.20.11/arch/arm26/kernel/calls.S linux-2.6.20.11-vs2.3.0.12/arch/arm26/kernel/calls.S
---- linux-2.6.20.11/arch/arm26/kernel/calls.S	2005-03-02 12:38:19 +0100
-+++ linux-2.6.20.11-vs2.3.0.12/arch/arm26/kernel/calls.S	2007-02-06 03:05:21 +0100
+diff -urNp linux-2.6.21.orig/arch/arm26/kernel/calls.S linux-2.6.21/arch/arm26/kernel/calls.S
+--- linux-2.6.21.orig/arch/arm26/kernel/calls.S	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/arm26/kernel/calls.S	2007-05-31 16:07:14.000000000 +0200
 @@ -257,6 +257,11 @@ __syscall_start:
  		.long	sys_lremovexattr
  		.long	sys_fremovexattr
@@ -434,9 +276,9 @@
  __syscall_end:
  
  		.rept	NR_syscalls - (__syscall_end - __syscall_start) / 4
-diff -NurpP --minimal linux-2.6.20.11/arch/arm26/kernel/process.c linux-2.6.20.11-vs2.3.0.12/arch/arm26/kernel/process.c
---- linux-2.6.20.11/arch/arm26/kernel/process.c	2006-09-20 16:57:57 +0200
-+++ linux-2.6.20.11-vs2.3.0.12/arch/arm26/kernel/process.c	2007-02-06 03:05:21 +0100
+diff -urNp linux-2.6.21.orig/arch/arm26/kernel/process.c linux-2.6.21/arch/arm26/kernel/process.c
+--- linux-2.6.21.orig/arch/arm26/kernel/process.c	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/arm26/kernel/process.c	2007-05-31 16:07:14.000000000 +0200
 @@ -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;
@@ -447,9 +289,9 @@
  }
  EXPORT_SYMBOL(kernel_thread);
  
-diff -NurpP --minimal linux-2.6.20.11/arch/arm26/kernel/traps.c linux-2.6.20.11-vs2.3.0.12/arch/arm26/kernel/traps.c
---- linux-2.6.20.11/arch/arm26/kernel/traps.c	2006-09-20 16:57:57 +0200
-+++ linux-2.6.20.11-vs2.3.0.12/arch/arm26/kernel/traps.c	2007-02-06 03:05:21 +0100
+diff -urNp linux-2.6.21.orig/arch/arm26/kernel/traps.c linux-2.6.21/arch/arm26/kernel/traps.c
+--- linux-2.6.21.orig/arch/arm26/kernel/traps.c	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/arm26/kernel/traps.c	2007-05-31 16:07:14.000000000 +0200
 @@ -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());
@@ -462,21 +304,9 @@
  
  	if (!user_mode(regs) || in_interrupt()) {
  		__dump_stack(tsk, (unsigned long)(regs + 1));
-diff -NurpP --minimal linux-2.6.20.11/arch/cris/Kconfig linux-2.6.20.11-vs2.3.0.12/arch/cris/Kconfig
---- linux-2.6.20.11/arch/cris/Kconfig	2007-02-06 03:00:02 +0100
-+++ linux-2.6.20.11-vs2.3.0.12/arch/cris/Kconfig	2007-02-06 03:05:21 +0100
-@@ -193,6 +193,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.20.11/arch/cris/arch-v10/kernel/process.c linux-2.6.20.11-vs2.3.0.12/arch/cris/arch-v10/kernel/process.c
---- linux-2.6.20.11/arch/cris/arch-v10/kernel/process.c	2006-09-20 16:57:57 +0200
-+++ linux-2.6.20.11-vs2.3.0.12/arch/cris/arch-v10/kernel/process.c	2007-02-06 03:05:21 +0100
+diff -urNp linux-2.6.21.orig/arch/cris/arch-v10/kernel/process.c linux-2.6.21/arch/cris/arch-v10/kernel/process.c
+--- linux-2.6.21.orig/arch/cris/arch-v10/kernel/process.c	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/cris/arch-v10/kernel/process.c	2007-05-31 16:07:14.000000000 +0200
 @@ -103,7 +103,8 @@ int kernel_thread(int (*fn)(void *), voi
  	regs.dccr = 1 << I_DCCR_BITNR;
  
@@ -487,9 +317,9 @@
  }
  
  /* setup the child's kernel stack with a pt_regs and switch_stack on it.
-diff -NurpP --minimal linux-2.6.20.11/arch/cris/arch-v32/kernel/process.c linux-2.6.20.11-vs2.3.0.12/arch/cris/arch-v32/kernel/process.c
---- linux-2.6.20.11/arch/cris/arch-v32/kernel/process.c	2006-09-20 16:57:57 +0200
-+++ linux-2.6.20.11-vs2.3.0.12/arch/cris/arch-v32/kernel/process.c	2007-02-06 03:05:21 +0100
+diff -urNp linux-2.6.21.orig/arch/cris/arch-v32/kernel/process.c linux-2.6.21/arch/cris/arch-v32/kernel/process.c
+--- linux-2.6.21.orig/arch/cris/arch-v32/kernel/process.c	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/cris/arch-v32/kernel/process.c	2007-05-31 16:07:14.000000000 +0200
 @@ -120,7 +120,8 @@ kernel_thread(int (*fn)(void *), void * 
  	regs.ccs = 1 << (I_CCS_BITNR + CCS_SHIFT);
  
@@ -500,9 +330,21 @@
  }
  
  /*
-diff -NurpP --minimal linux-2.6.20.11/arch/frv/kernel/kernel_thread.S linux-2.6.20.11-vs2.3.0.12/arch/frv/kernel/kernel_thread.S
---- linux-2.6.20.11/arch/frv/kernel/kernel_thread.S	2005-03-02 12:38:20 +0100
-+++ linux-2.6.20.11-vs2.3.0.12/arch/frv/kernel/kernel_thread.S	2007-02-06 03:05:21 +0100
+diff -urNp linux-2.6.21.orig/arch/cris/Kconfig linux-2.6.21/arch/cris/Kconfig
+--- linux-2.6.21.orig/arch/cris/Kconfig	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/cris/Kconfig	2007-05-31 16:07:14.000000000 +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 -urNp linux-2.6.21.orig/arch/frv/kernel/kernel_thread.S linux-2.6.21/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.21.orig/arch/frv/kernel/kernel_thread.S	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/frv/kernel/kernel_thread.S	2007-05-31 16:07:14.000000000 +0200
 @@ -13,6 +13,8 @@
  #include <asm/unistd.h>
  
@@ -521,10 +363,10 @@
  	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.20.11/arch/h8300/Kconfig linux-2.6.20.11-vs2.3.0.12/arch/h8300/Kconfig
---- linux-2.6.20.11/arch/h8300/Kconfig	2007-02-06 03:00:03 +0100
-+++ linux-2.6.20.11-vs2.3.0.12/arch/h8300/Kconfig	2007-02-06 03:05:21 +0100
-@@ -207,6 +207,8 @@ source "fs/Kconfig"
+diff -urNp linux-2.6.21.orig/arch/h8300/Kconfig linux-2.6.21/arch/h8300/Kconfig
+--- linux-2.6.21.orig/arch/h8300/Kconfig	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/h8300/Kconfig	2007-05-31 16:07:14.000000000 +0200
+@@ -214,6 +214,8 @@ source "fs/Kconfig"
  
  source "arch/h8300/Kconfig.debug"
  
@@ -533,9 +375,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.20.11/arch/h8300/kernel/process.c linux-2.6.20.11-vs2.3.0.12/arch/h8300/kernel/process.c
---- linux-2.6.20.11/arch/h8300/kernel/process.c	2006-09-20 16:57:58 +0200
-+++ linux-2.6.20.11-vs2.3.0.12/arch/h8300/kernel/process.c	2007-02-06 03:05:21 +0100
+diff -urNp linux-2.6.21.orig/arch/h8300/kernel/process.c linux-2.6.21/arch/h8300/kernel/process.c
+--- linux-2.6.21.orig/arch/h8300/kernel/process.c	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/h8300/kernel/process.c	2007-05-31 16:07:14.000000000 +0200
 @@ -134,7 +134,7 @@ int kernel_thread(int (*fn)(void *), voi
  
  	fs = get_fs();
@@ -545,10 +387,10 @@
  	__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.20.11/arch/i386/Kconfig linux-2.6.20.11-vs2.3.0.12/arch/i386/Kconfig
---- linux-2.6.20.11/arch/i386/Kconfig	2007-02-06 03:00:03 +0100
-+++ linux-2.6.20.11-vs2.3.0.12/arch/i386/Kconfig	2007-02-06 03:05:21 +0100
-@@ -1214,6 +1214,8 @@ endmenu
+diff -urNp linux-2.6.21.orig/arch/i386/Kconfig linux-2.6.21/arch/i386/Kconfig
+--- linux-2.6.21.orig/arch/i386/Kconfig	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/i386/Kconfig	2007-05-31 16:07:14.000000000 +0200
+@@ -1241,6 +1241,8 @@ endmenu
  
  source "arch/i386/Kconfig.debug"
  
@@ -557,10 +399,10 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.20.11/arch/i386/kernel/process.c linux-2.6.20.11-vs2.3.0.12/arch/i386/kernel/process.c
---- linux-2.6.20.11/arch/i386/kernel/process.c	2007-02-06 03:00:06 +0100
-+++ linux-2.6.20.11-vs2.3.0.12/arch/i386/kernel/process.c	2007-02-06 03:05:21 +0100
-@@ -294,8 +294,10 @@ void show_regs(struct pt_regs * regs)
+diff -urNp linux-2.6.21.orig/arch/i386/kernel/process.c linux-2.6.21/arch/i386/kernel/process.c
+--- linux-2.6.21.orig/arch/i386/kernel/process.c	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/i386/kernel/process.c	2007-05-31 16:07:14.000000000 +0200
+@@ -297,8 +297,10 @@ void show_regs(struct pt_regs * regs)
  	unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L;
  
  	printk("\n");
@@ -573,7 +415,7 @@
  	print_symbol("EIP is at %s\n", regs->eip);
  
  	if (user_mode_vm(regs))
-@@ -347,7 +349,8 @@ int kernel_thread(int (*fn)(void *), voi
+@@ -350,7 +352,8 @@ int kernel_thread(int (*fn)(void *), voi
  	regs.eflags = X86_EFLAGS_IF | X86_EFLAGS_SF | X86_EFLAGS_PF | 0x2;
  
  	/* Ok, create the new process.. */
@@ -583,9 +425,9 @@
  }
  EXPORT_SYMBOL(kernel_thread);
  
-diff -NurpP --minimal linux-2.6.20.11/arch/i386/kernel/syscall_table.S linux-2.6.20.11-vs2.3.0.12/arch/i386/kernel/syscall_table.S
---- linux-2.6.20.11/arch/i386/kernel/syscall_table.S	2006-11-30 21:18:26 +0100
-+++ linux-2.6.20.11-vs2.3.0.12/arch/i386/kernel/syscall_table.S	2007-02-06 03:05:21 +0100
+diff -urNp linux-2.6.21.orig/arch/i386/kernel/syscall_table.S linux-2.6.21/arch/i386/kernel/syscall_table.S
+--- linux-2.6.21.orig/arch/i386/kernel/syscall_table.S	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/i386/kernel/syscall_table.S	2007-05-31 16:07:14.000000000 +0200
 @@ -272,7 +272,7 @@ ENTRY(sys_call_table)
  	.long sys_tgkill	/* 270 */
  	.long sys_utimes
@@ -595,9 +437,9 @@
  	.long sys_mbind
  	.long sys_get_mempolicy
  	.long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.20.11/arch/i386/kernel/sysenter.c linux-2.6.20.11-vs2.3.0.12/arch/i386/kernel/sysenter.c
---- linux-2.6.20.11/arch/i386/kernel/sysenter.c	2007-05-02 19:17:14 +0200
-+++ linux-2.6.20.11-vs2.3.0.12/arch/i386/kernel/sysenter.c	2007-03-29 22:07:16 +0200
+diff -urNp linux-2.6.21.orig/arch/i386/kernel/sysenter.c linux-2.6.21/arch/i386/kernel/sysenter.c
+--- linux-2.6.21.orig/arch/i386/kernel/sysenter.c	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/i386/kernel/sysenter.c	2007-05-31 16:07:14.000000000 +0200
 @@ -17,6 +17,7 @@
  #include <linux/elf.h>
  #include <linux/mm.h>
@@ -606,18 +448,9 @@
  
  #include <asm/cpufeature.h>
  #include <asm/msr.h>
-@@ -163,7 +164,7 @@ int arch_setup_additional_pages(struct l
- 	current->mm->context.vdso = (void *)addr;
- 	current_thread_info()->sysenter_return =
- 				    (void *)VDSO_SYM(&SYSENTER_RETURN);
--	mm->total_vm++;
-+	vx_vmpages_inc(mm);
- up_fail:
- 	up_write(&mm->mmap_sem);
- 	return ret;
-diff -NurpP --minimal linux-2.6.20.11/arch/i386/kernel/traps.c linux-2.6.20.11-vs2.3.0.12/arch/i386/kernel/traps.c
---- linux-2.6.20.11/arch/i386/kernel/traps.c	2007-02-06 03:00:07 +0100
-+++ linux-2.6.20.11-vs2.3.0.12/arch/i386/kernel/traps.c	2007-02-06 03:05:21 +0100
+diff -urNp linux-2.6.21.orig/arch/i386/kernel/traps.c linux-2.6.21/arch/i386/kernel/traps.c
+--- linux-2.6.21.orig/arch/i386/kernel/traps.c	2007-05-31 12:46:43.000000000 +0200
++++ linux-2.6.21/arch/i386/kernel/traps.c	2007-05-31 16:07:14.000000000 +0200
 @@ -56,6 +56,8 @@
  #include <asm/stacktrace.h>
  
@@ -627,10 +460,10 @@
  
  #include "mach_traps.h"
  
-@@ -315,8 +317,8 @@ void show_registers(struct pt_regs *regs
+@@ -317,8 +319,8 @@ void show_registers(struct pt_regs *regs
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-vs2.3.patch?r1=1.1.2.8&r2=1.1.2.9&f=u



More information about the pld-cvs-commit mailing list