SOURCES (LINUX_2_6): linux-2.6-vs2.1.patch - vs 2.1.1 final

baggins baggins at pld-linux.org
Mon Nov 20 14:27:30 CET 2006


Author: baggins                      Date: Mon Nov 20 13:27:30 2006 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- vs 2.1.1 final

---- Files affected:
SOURCES:
   linux-2.6-vs2.1.patch (1.1.2.42 -> 1.1.2.43) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-vs2.1.patch
diff -u SOURCES/linux-2.6-vs2.1.patch:1.1.2.42 SOURCES/linux-2.6-vs2.1.patch:1.1.2.43
--- SOURCES/linux-2.6-vs2.1.patch:1.1.2.42	Wed Oct 25 09:46:17 2006
+++ SOURCES/linux-2.6-vs2.1.patch	Mon Nov 20 14:27:22 2006
@@ -1,7 +1,7 @@
-diff -NurpP --minimal linux-2.6.18.1/Documentation/vserver/debug.txt linux-2.6.18.1-vs2.1.1-rc43/Documentation/vserver/debug.txt
---- linux-2.6.18.1/Documentation/vserver/debug.txt	1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.1.1-rc43/Documentation/vserver/debug.txt	2006-09-25 15:40:02 +0200
-@@ -0,0 +1,108 @@
+diff -NurpP --minimal linux-2.6.18.2/Documentation/vserver/debug.txt linux-2.6.18.2-vs2.1.1/Documentation/vserver/debug.txt
+--- linux-2.6.18.2/Documentation/vserver/debug.txt	1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.1.1/Documentation/vserver/debug.txt	2006-11-03 17:26:38 +0100
+@@ -0,0 +1,154 @@
 +
 +debug_cvirt:
 +
@@ -14,9 +14,9 @@
 +	"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 %d,%d [mult=%d]"
-+ 3   8	"ext3_has_free_blocks(%p): %u<%u+1, %c, %u!=%u r=%d"
-+	"ext3_has_free_blocks(%p): free=%u, root=%u"
++ 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)"
@@ -27,6 +27,31 @@
 +	"__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"
@@ -65,13 +90,27 @@
 + 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"
-+ 1   2	"vc: VCMD_%02d_%d[%d] = %08lx(%ld)"
++ 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]"
@@ -81,7 +120,11 @@
 +	"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"
@@ -89,17 +132,20 @@
 +	"init_vx_info(%p[#%d.%d])"
 +	"release_vx_info(%p[#%d.%d.%d]) %p"
 +	"set_vx_info(%p[#%d.%d])"
++	"vx_child_reaper(%p[#%u,%u]) = %p[#%u,%u]"
 + 4  10	"__hash_vx_info: %p[#%d]"
 +	"__unhash_vx_info: %p[#%d]"
 +	"__vx_dynamic_id: [#%d]"
-+ 5  20	"moved task %p into vxi:%p[#%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_set_init(%p[#%d],%p[#%d,%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_parse_xid(ť%sŤ): %d:#%d"
-+	"vx_propagate_xid(%p[#%lu.%d]): %d,%d"
 +
 +
 +debug_limit:
@@ -110,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-2.6.18.1/arch/alpha/Kconfig linux-2.6.18.1-vs2.1.1-rc43/arch/alpha/Kconfig
---- linux-2.6.18.1/arch/alpha/Kconfig	2006-06-18 04:51:38 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/alpha/Kconfig	2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/alpha/Kconfig linux-2.6.18.2-vs2.1.1/arch/alpha/Kconfig
+--- linux-2.6.18.2/arch/alpha/Kconfig	2006-06-18 04:51:38 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/alpha/Kconfig	2006-09-20 17:01:44 +0200
 @@ -632,6 +632,8 @@ source "arch/alpha/oprofile/Kconfig"
  
  source "arch/alpha/Kconfig.debug"
@@ -122,9 +168,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/asm-offsets.c linux-2.6.18.1-vs2.1.1-rc43/arch/alpha/kernel/asm-offsets.c
---- linux-2.6.18.1/arch/alpha/kernel/asm-offsets.c	2006-02-15 13:54:10 +0100
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/alpha/kernel/asm-offsets.c	2006-09-25 15:40:02 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/alpha/kernel/asm-offsets.c linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/asm-offsets.c
+--- linux-2.6.18.2/arch/alpha/kernel/asm-offsets.c	2006-02-15 13:54:10 +0100
++++ linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/asm-offsets.c	2006-09-25 15:40:02 +0200
 @@ -36,6 +36,7 @@ void foo(void)
  	DEFINE(PT_PTRACED, PT_PTRACED);
  	DEFINE(CLONE_VM, CLONE_VM);
@@ -133,9 +179,9 @@
  	DEFINE(SIGCHLD, SIGCHLD);
  	BLANK();
  
-diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/entry.S linux-2.6.18.1-vs2.1.1-rc43/arch/alpha/kernel/entry.S
---- linux-2.6.18.1/arch/alpha/kernel/entry.S	2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/alpha/kernel/entry.S	2006-09-25 15:40:02 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/alpha/kernel/entry.S linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/entry.S
+--- linux-2.6.18.2/arch/alpha/kernel/entry.S	2006-09-20 16:57:57 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/entry.S	2006-09-25 15:40:02 +0200
 @@ -644,7 +644,7 @@ kernel_thread:
  	stq	$2, 152($sp)		/* HAE */
  
@@ -177,9 +223,9 @@
  	ret
  .end sys_getxpid
  
-diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/irq.c linux-2.6.18.1-vs2.1.1-rc43/arch/alpha/kernel/irq.c
---- linux-2.6.18.1/arch/alpha/kernel/irq.c	2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/alpha/kernel/irq.c	2006-10-23 04:25:59 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/alpha/kernel/irq.c linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/irq.c
+--- linux-2.6.18.2/arch/alpha/kernel/irq.c	2006-09-20 16:57:57 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/irq.c	2006-10-25 03:39:09 +0200
 @@ -26,6 +26,7 @@
  #include <linux/seq_file.h>
  #include <linux/profile.h>
@@ -205,9 +251,9 @@
 +	__leave_vx_admin(&vxis);
  	irq_exit();
  }
-diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/osf_sys.c linux-2.6.18.1-vs2.1.1-rc43/arch/alpha/kernel/osf_sys.c
---- linux-2.6.18.1/arch/alpha/kernel/osf_sys.c	2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/alpha/kernel/osf_sys.c	2006-09-25 15:40:02 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/alpha/kernel/osf_sys.c linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.18.2/arch/alpha/kernel/osf_sys.c	2006-09-20 16:57:57 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/osf_sys.c	2006-09-25 15:40:02 +0200
 @@ -38,6 +38,7 @@
  #include <linux/uio.h>
  #include <linux/vfs.h>
@@ -316,9 +362,9 @@
  		if (put_tv32(tv, &ktv))
  			return -EFAULT;
  	}
-diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/ptrace.c linux-2.6.18.1-vs2.1.1-rc43/arch/alpha/kernel/ptrace.c
---- linux-2.6.18.1/arch/alpha/kernel/ptrace.c	2006-04-09 13:49:39 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/alpha/kernel/ptrace.c	2006-10-06 23:10:42 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/alpha/kernel/ptrace.c linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/ptrace.c
+--- linux-2.6.18.2/arch/alpha/kernel/ptrace.c	2006-04-09 13:49:39 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/ptrace.c	2006-10-06 23:10:42 +0200
 @@ -283,6 +283,11 @@ do_sys_ptrace(long request, long pid, lo
  		goto out_notsk;
  	}
@@ -331,9 +377,45 @@
  	if (request == PTRACE_ATTACH) {
  		ret = ptrace_attach(child);
  		goto out;
-diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/systbls.S linux-2.6.18.1-vs2.1.1-rc43/arch/alpha/kernel/systbls.S
---- linux-2.6.18.1/arch/alpha/kernel/systbls.S	2005-08-29 22:24:49 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/alpha/kernel/systbls.S	2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/alpha/kernel/semaphore.c linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/semaphore.c
+--- linux-2.6.18.2/arch/alpha/kernel/semaphore.c	2004-08-14 12:55:32 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/semaphore.c	2006-10-28 19:27:34 +0200
+@@ -68,8 +68,8 @@ __down_failed(struct semaphore *sem)
+ 	DECLARE_WAITQUEUE(wait, tsk);
+ 
+ #ifdef CONFIG_DEBUG_SEMAPHORE
+-	printk("%s(%d): down failed(%p)\n",
+-	       tsk->comm, tsk->pid, sem);
++	printk("%s(%d:#%u): down failed(%p)\n",
++	       tsk->comm, tsk->pid, tsk->xid, sem);
+ #endif
+ 
+ 	tsk->state = TASK_UNINTERRUPTIBLE;
+@@ -97,8 +97,8 @@ __down_failed(struct semaphore *sem)
+ 	wake_up(&sem->wait);
+ 
+ #ifdef CONFIG_DEBUG_SEMAPHORE
+-	printk("%s(%d): down acquired(%p)\n",
+-	       tsk->comm, tsk->pid, sem);
++	printk("%s(%d:#%u): down acquired(%p)\n",
++	       tsk->comm, tsk->pid, tsk->xid, sem);
+ #endif
+ }
+ 
+@@ -110,8 +110,8 @@ __down_failed_interruptible(struct semap
+ 	long ret = 0;
+ 
+ #ifdef CONFIG_DEBUG_SEMAPHORE
+-	printk("%s(%d): down failed(%p)\n",
+-	       tsk->comm, tsk->pid, sem);
++	printk("%s(%d:#%u): down failed(%p)\n",
++	       tsk->comm, tsk->pid, tsk->xid, sem);
+ #endif
+ 
+ 	tsk->state = TASK_INTERRUPTIBLE;
+diff -NurpP --minimal linux-2.6.18.2/arch/alpha/kernel/systbls.S linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/systbls.S
+--- linux-2.6.18.2/arch/alpha/kernel/systbls.S	2005-08-29 22:24:49 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/systbls.S	2006-09-20 17:01:44 +0200
 @@ -447,7 +447,7 @@ sys_call_table:
  	.quad sys_stat64			/* 425 */
  	.quad sys_lstat64
@@ -343,9 +425,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.18.1/arch/alpha/kernel/traps.c linux-2.6.18.1-vs2.1.1-rc43/arch/alpha/kernel/traps.c
---- linux-2.6.18.1/arch/alpha/kernel/traps.c	2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/alpha/kernel/traps.c	2006-09-25 15:40:02 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/alpha/kernel/traps.c linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/traps.c
+--- linux-2.6.18.2/arch/alpha/kernel/traps.c	2006-09-20 16:57:57 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/alpha/kernel/traps.c	2006-09-25 15:40:02 +0200
 @@ -182,7 +182,8 @@ die_if_kernel(char * str, struct pt_regs
  #ifdef CONFIG_SMP
  	printk("CPU %d ", hard_smp_processor_id());
@@ -356,9 +438,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.18.1/arch/alpha/mm/init.c linux-2.6.18.1-vs2.1.1-rc43/arch/alpha/mm/init.c
---- linux-2.6.18.1/arch/alpha/mm/init.c	2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/alpha/mm/init.c	2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/alpha/mm/init.c linux-2.6.18.2-vs2.1.1/arch/alpha/mm/init.c
+--- linux-2.6.18.2/arch/alpha/mm/init.c	2006-09-20 16:57:57 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/alpha/mm/init.c	2006-09-20 17:01:44 +0200
 @@ -20,6 +20,7 @@
  #include <linux/init.h>
  #include <linux/bootmem.h> /* max_low_pfn */
@@ -367,9 +449,9 @@
  
  #include <asm/system.h>
  #include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.18.1/arch/arm/Kconfig linux-2.6.18.1-vs2.1.1-rc43/arch/arm/Kconfig
---- linux-2.6.18.1/arch/arm/Kconfig	2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/arm/Kconfig	2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/arm/Kconfig linux-2.6.18.2-vs2.1.1/arch/arm/Kconfig
+--- linux-2.6.18.2/arch/arm/Kconfig	2006-09-20 16:57:57 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/arm/Kconfig	2006-09-20 17:01:44 +0200
 @@ -907,6 +907,8 @@ source "arch/arm/oprofile/Kconfig"
  
  source "arch/arm/Kconfig.debug"
@@ -379,9 +461,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.1/arch/arm/kernel/calls.S linux-2.6.18.1-vs2.1.1-rc43/arch/arm/kernel/calls.S
---- linux-2.6.18.1/arch/arm/kernel/calls.S	2006-02-18 14:39:40 +0100
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/arm/kernel/calls.S	2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/arm/kernel/calls.S linux-2.6.18.2-vs2.1.1/arch/arm/kernel/calls.S
+--- linux-2.6.18.2/arch/arm/kernel/calls.S	2006-02-18 14:39:40 +0100
++++ linux-2.6.18.2-vs2.1.1/arch/arm/kernel/calls.S	2006-09-20 17:01:44 +0200
 @@ -322,7 +322,7 @@
  /* 310 */	CALL(sys_request_key)
  		CALL(sys_keyctl)
@@ -391,9 +473,9 @@
  		CALL(sys_ioprio_set)
  /* 315 */	CALL(sys_ioprio_get)
  		CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.18.1/arch/arm/kernel/process.c linux-2.6.18.1-vs2.1.1-rc43/arch/arm/kernel/process.c
---- linux-2.6.18.1/arch/arm/kernel/process.c	2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/arm/kernel/process.c	2006-09-25 15:40:02 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/arm/kernel/process.c linux-2.6.18.2-vs2.1.1/arch/arm/kernel/process.c
+--- linux-2.6.18.2/arch/arm/kernel/process.c	2006-09-20 16:57:57 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/arm/kernel/process.c	2006-09-25 15:40:02 +0200
 @@ -236,7 +236,8 @@ void __show_regs(struct pt_regs *regs)
  void show_regs(struct pt_regs * regs)
  {
@@ -414,9 +496,23 @@
  }
  EXPORT_SYMBOL(kernel_thread);
  
-diff -NurpP --minimal linux-2.6.18.1/arch/arm26/Kconfig linux-2.6.18.1-vs2.1.1-rc43/arch/arm26/Kconfig
---- linux-2.6.18.1/arch/arm26/Kconfig	2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/arm26/Kconfig	2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/arm/kernel/traps.c linux-2.6.18.2-vs2.1.1/arch/arm/kernel/traps.c
+--- linux-2.6.18.2/arch/arm/kernel/traps.c	2006-09-20 16:57:57 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/arm/kernel/traps.c	2006-10-28 19:27:58 +0200
+@@ -205,8 +205,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);
+-	printk("Process %s (pid: %d, stack limit = 0x%p)\n",
+-		tsk->comm, tsk->pid, thread + 1);
++	printk("Process %s (pid: %d:#%u, stack limit = 0x%p)\n",
++		tsk->comm, tsk->pid, tsk->xid, thread + 1);
+ 
+ 	if (!user_mode(regs) || in_interrupt()) {
+ 		dump_mem("Stack: ", regs->ARM_sp,
+diff -NurpP --minimal linux-2.6.18.2/arch/arm26/Kconfig linux-2.6.18.2-vs2.1.1/arch/arm26/Kconfig
+--- linux-2.6.18.2/arch/arm26/Kconfig	2006-09-20 16:57:57 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/arm26/Kconfig	2006-09-20 17:01:44 +0200
 @@ -234,6 +234,8 @@ source "drivers/usb/Kconfig"
  
  source "arch/arm26/Kconfig.debug"
@@ -426,9 +522,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.1/arch/arm26/kernel/calls.S linux-2.6.18.1-vs2.1.1-rc43/arch/arm26/kernel/calls.S
---- linux-2.6.18.1/arch/arm26/kernel/calls.S	2005-03-02 12:38:19 +0100
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/arm26/kernel/calls.S	2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/arm26/kernel/calls.S linux-2.6.18.2-vs2.1.1/arch/arm26/kernel/calls.S
+--- linux-2.6.18.2/arch/arm26/kernel/calls.S	2005-03-02 12:38:19 +0100
++++ linux-2.6.18.2-vs2.1.1/arch/arm26/kernel/calls.S	2006-09-20 17:01:44 +0200
 @@ -257,6 +257,11 @@ __syscall_start:
  		.long	sys_lremovexattr
  		.long	sys_fremovexattr
@@ -441,9 +537,9 @@
  __syscall_end:
  
  		.rept	NR_syscalls - (__syscall_end - __syscall_start) / 4
-diff -NurpP --minimal linux-2.6.18.1/arch/arm26/kernel/process.c linux-2.6.18.1-vs2.1.1-rc43/arch/arm26/kernel/process.c
---- linux-2.6.18.1/arch/arm26/kernel/process.c	2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/arm26/kernel/process.c	2006-09-25 15:40:02 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/arm26/kernel/process.c linux-2.6.18.2-vs2.1.1/arch/arm26/kernel/process.c
+--- linux-2.6.18.2/arch/arm26/kernel/process.c	2006-09-20 16:57:57 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/arm26/kernel/process.c	2006-09-25 15:40:02 +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;
@@ -454,9 +550,9 @@
  }
  EXPORT_SYMBOL(kernel_thread);
  
-diff -NurpP --minimal linux-2.6.18.1/arch/arm26/kernel/traps.c linux-2.6.18.1-vs2.1.1-rc43/arch/arm26/kernel/traps.c
---- linux-2.6.18.1/arch/arm26/kernel/traps.c	2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/arm26/kernel/traps.c	2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/arm26/kernel/traps.c linux-2.6.18.2-vs2.1.1/arch/arm26/kernel/traps.c
+--- linux-2.6.18.2/arch/arm26/kernel/traps.c	2006-09-20 16:57:57 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/arm26/kernel/traps.c	2006-09-20 17:01:44 +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());
@@ -469,9 +565,9 @@
  
  	if (!user_mode(regs) || in_interrupt()) {
  		__dump_stack(tsk, (unsigned long)(regs + 1));
-diff -NurpP --minimal linux-2.6.18.1/arch/cris/Kconfig linux-2.6.18.1-vs2.1.1-rc43/arch/cris/Kconfig
---- linux-2.6.18.1/arch/cris/Kconfig	2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/cris/Kconfig	2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/cris/Kconfig linux-2.6.18.2-vs2.1.1/arch/cris/Kconfig
+--- linux-2.6.18.2/arch/cris/Kconfig	2006-09-20 16:57:57 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/cris/Kconfig	2006-09-20 17:01:44 +0200
 @@ -185,6 +185,8 @@ source "drivers/usb/Kconfig"
  
  source "arch/cris/Kconfig.debug"
@@ -481,9 +577,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.1/arch/cris/arch-v10/kernel/process.c linux-2.6.18.1-vs2.1.1-rc43/arch/cris/arch-v10/kernel/process.c
---- linux-2.6.18.1/arch/cris/arch-v10/kernel/process.c	2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/cris/arch-v10/kernel/process.c	2006-09-25 15:40:02 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/cris/arch-v10/kernel/process.c linux-2.6.18.2-vs2.1.1/arch/cris/arch-v10/kernel/process.c
+--- linux-2.6.18.2/arch/cris/arch-v10/kernel/process.c	2006-09-20 16:57:57 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/cris/arch-v10/kernel/process.c	2006-09-25 15:40:02 +0200
 @@ -103,7 +103,8 @@ int kernel_thread(int (*fn)(void *), voi
  	regs.dccr = 1 << I_DCCR_BITNR;
  
@@ -494,9 +590,9 @@
  }
  
  /* setup the child's kernel stack with a pt_regs and switch_stack on it.
-diff -NurpP --minimal linux-2.6.18.1/arch/cris/arch-v32/kernel/process.c linux-2.6.18.1-vs2.1.1-rc43/arch/cris/arch-v32/kernel/process.c
---- linux-2.6.18.1/arch/cris/arch-v32/kernel/process.c	2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/cris/arch-v32/kernel/process.c	2006-09-25 15:40:02 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/cris/arch-v32/kernel/process.c linux-2.6.18.2-vs2.1.1/arch/cris/arch-v32/kernel/process.c
+--- linux-2.6.18.2/arch/cris/arch-v32/kernel/process.c	2006-09-20 16:57:57 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/cris/arch-v32/kernel/process.c	2006-09-25 15:40:02 +0200
 @@ -120,7 +120,8 @@ kernel_thread(int (*fn)(void *), void * 
  	regs.ccs = 1 << (I_CCS_BITNR + CCS_SHIFT);
  
@@ -507,9 +603,9 @@
  }
  
  /*
-diff -NurpP --minimal linux-2.6.18.1/arch/cris/kernel/irq.c linux-2.6.18.1-vs2.1.1-rc43/arch/cris/kernel/irq.c
---- linux-2.6.18.1/arch/cris/kernel/irq.c	2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/cris/kernel/irq.c	2006-10-13 20:52:32 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/cris/kernel/irq.c linux-2.6.18.2-vs2.1.1/arch/cris/kernel/irq.c
+--- linux-2.6.18.2/arch/cris/kernel/irq.c	2006-09-20 16:57:57 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/cris/kernel/irq.c	2006-10-13 20:52:32 +0200
 @@ -35,6 +35,7 @@
  #include <linux/seq_file.h>
  #include <linux/errno.h>
@@ -536,9 +632,9 @@
          irq_exit();
  }
  
-diff -NurpP --minimal linux-2.6.18.1/arch/frv/kernel/irq.c linux-2.6.18.1-vs2.1.1-rc43/arch/frv/kernel/irq.c
---- linux-2.6.18.1/arch/frv/kernel/irq.c	2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/frv/kernel/irq.c	2006-10-13 20:52:40 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/frv/kernel/irq.c linux-2.6.18.2-vs2.1.1/arch/frv/kernel/irq.c
+--- linux-2.6.18.2/arch/frv/kernel/irq.c	2006-09-20 16:57:57 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/frv/kernel/irq.c	2006-10-13 20:52:40 +0200
 @@ -32,6 +32,7 @@
  #include <linux/proc_fs.h>
  #include <linux/seq_file.h>
@@ -566,9 +662,9 @@
  
  	__clr_MASK(level);
  
-diff -NurpP --minimal linux-2.6.18.1/arch/frv/kernel/kernel_thread.S linux-2.6.18.1-vs2.1.1-rc43/arch/frv/kernel/kernel_thread.S
---- linux-2.6.18.1/arch/frv/kernel/kernel_thread.S	2005-03-02 12:38:20 +0100
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/frv/kernel/kernel_thread.S	2006-09-25 15:40:02 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/frv/kernel/kernel_thread.S linux-2.6.18.2-vs2.1.1/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.18.2/arch/frv/kernel/kernel_thread.S	2005-03-02 12:38:20 +0100
++++ linux-2.6.18.2-vs2.1.1/arch/frv/kernel/kernel_thread.S	2006-09-25 15:40:02 +0200
 @@ -13,6 +13,8 @@
  #include <asm/unistd.h>
  
@@ -587,9 +683,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.18.1/arch/h8300/Kconfig linux-2.6.18.1-vs2.1.1-rc43/arch/h8300/Kconfig
---- linux-2.6.18.1/arch/h8300/Kconfig	2006-06-18 04:51:49 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/h8300/Kconfig	2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/h8300/Kconfig linux-2.6.18.2-vs2.1.1/arch/h8300/Kconfig
+--- linux-2.6.18.2/arch/h8300/Kconfig	2006-06-18 04:51:49 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/h8300/Kconfig	2006-09-20 17:01:44 +0200
 @@ -199,6 +199,8 @@ source "fs/Kconfig"
  
  source "arch/h8300/Kconfig.debug"
@@ -599,9 +695,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.1/arch/h8300/kernel/process.c linux-2.6.18.1-vs2.1.1-rc43/arch/h8300/kernel/process.c
---- linux-2.6.18.1/arch/h8300/kernel/process.c	2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/h8300/kernel/process.c	2006-09-25 15:40:02 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/h8300/kernel/process.c linux-2.6.18.2-vs2.1.1/arch/h8300/kernel/process.c
+--- linux-2.6.18.2/arch/h8300/kernel/process.c	2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/h8300/kernel/process.c	2006-09-25 15:40:02 +0200
 @@ -134,7 +134,7 @@ int kernel_thread(int (*fn)(void *), voi
  
  	fs = get_fs();
@@ -611,9 +707,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.18.1/arch/i386/Kconfig linux-2.6.18.1-vs2.1.1-rc43/arch/i386/Kconfig
---- linux-2.6.18.1/arch/i386/Kconfig	2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/i386/Kconfig	2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/i386/Kconfig linux-2.6.18.2-vs2.1.1/arch/i386/Kconfig
+--- linux-2.6.18.2/arch/i386/Kconfig	2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/i386/Kconfig	2006-09-20 17:01:44 +0200
 @@ -1142,6 +1142,8 @@ endmenu
  
  source "arch/i386/Kconfig.debug"
@@ -623,9 +719,9 @@
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/irq.c linux-2.6.18.1-vs2.1.1-rc43/arch/i386/kernel/irq.c
---- linux-2.6.18.1/arch/i386/kernel/irq.c	2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/i386/kernel/irq.c	2006-10-13 20:52:50 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/i386/kernel/irq.c linux-2.6.18.2-vs2.1.1/arch/i386/kernel/irq.c
+--- linux-2.6.18.2/arch/i386/kernel/irq.c	2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/i386/kernel/irq.c	2006-10-13 20:52:50 +0200
 @@ -18,6 +18,7 @@
  #include <linux/notifier.h>
  #include <linux/cpu.h>
@@ -659,9 +755,9 @@
  
  	irq_exit();
  
-diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/process.c linux-2.6.18.1-vs2.1.1-rc43/arch/i386/kernel/process.c
---- linux-2.6.18.1/arch/i386/kernel/process.c	2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/i386/kernel/process.c	2006-09-25 15:40:02 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/i386/kernel/process.c linux-2.6.18.2-vs2.1.1/arch/i386/kernel/process.c
+--- linux-2.6.18.2/arch/i386/kernel/process.c	2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/i386/kernel/process.c	2006-09-25 15:40:02 +0200
 @@ -289,8 +289,10 @@ void show_regs(struct pt_regs * regs)
  	unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L;
  
@@ -685,9 +781,9 @@
  }
  EXPORT_SYMBOL(kernel_thread);
  
-diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/sys_i386.c linux-2.6.18.1-vs2.1.1-rc43/arch/i386/kernel/sys_i386.c
---- linux-2.6.18.1/arch/i386/kernel/sys_i386.c	2006-06-18 04:51:53 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/i386/kernel/sys_i386.c	2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/i386/kernel/sys_i386.c linux-2.6.18.2-vs2.1.1/arch/i386/kernel/sys_i386.c
+--- linux-2.6.18.2/arch/i386/kernel/sys_i386.c	2006-06-18 04:51:53 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/i386/kernel/sys_i386.c	2006-09-20 17:01:44 +0200
 @@ -19,6 +19,7 @@
  #include <linux/mman.h>
  #include <linux/file.h>
@@ -735,9 +831,9 @@
  	error |= __put_user(0,name->machine+__OLD_UTS_LEN);
  	
  	up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/syscall_table.S linux-2.6.18.1-vs2.1.1-rc43/arch/i386/kernel/syscall_table.S
---- linux-2.6.18.1/arch/i386/kernel/syscall_table.S	2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/i386/kernel/syscall_table.S	2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/i386/kernel/syscall_table.S linux-2.6.18.2-vs2.1.1/arch/i386/kernel/syscall_table.S
+--- linux-2.6.18.2/arch/i386/kernel/syscall_table.S	2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/i386/kernel/syscall_table.S	2006-09-20 17:01:44 +0200
 @@ -272,7 +272,7 @@ ENTRY(sys_call_table)
  	.long sys_tgkill	/* 270 */
  	.long sys_utimes
@@ -747,9 +843,9 @@
  	.long sys_mbind
  	.long sys_get_mempolicy
  	.long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/sysenter.c linux-2.6.18.1-vs2.1.1-rc43/arch/i386/kernel/sysenter.c
---- linux-2.6.18.1/arch/i386/kernel/sysenter.c	2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/i386/kernel/sysenter.c	2006-09-20 21:46:26 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/i386/kernel/sysenter.c linux-2.6.18.2-vs2.1.1/arch/i386/kernel/sysenter.c
+--- linux-2.6.18.2/arch/i386/kernel/sysenter.c	2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/i386/kernel/sysenter.c	2006-09-20 21:46:26 +0200
 @@ -17,6 +17,7 @@
  #include <linux/elf.h>
  #include <linux/mm.h>
@@ -767,9 +863,9 @@
  up_fail:
  	up_write(&mm->mmap_sem);
  	return ret;
-diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/traps.c linux-2.6.18.1-vs2.1.1-rc43/arch/i386/kernel/traps.c
---- linux-2.6.18.1/arch/i386/kernel/traps.c	2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/i386/kernel/traps.c	2006-09-25 15:40:02 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/i386/kernel/traps.c linux-2.6.18.2-vs2.1.1/arch/i386/kernel/traps.c
+--- linux-2.6.18.2/arch/i386/kernel/traps.c	2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/i386/kernel/traps.c	2006-09-25 15:40:02 +0200
 @@ -53,6 +53,8 @@
  #include <asm/kdebug.h>
  
@@ -811,9 +907,9 @@
  			/* Executive summary in case the oops scrolled away */
  			esp = (unsigned long) (&regs->esp);
  			savesegment(ss, ss);
-diff -NurpP --minimal linux-2.6.18.1/arch/ia64/Kconfig linux-2.6.18.1-vs2.1.1-rc43/arch/ia64/Kconfig
---- linux-2.6.18.1/arch/ia64/Kconfig	2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.1.1-rc43/arch/ia64/Kconfig	2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/ia64/Kconfig linux-2.6.18.2-vs2.1.1/arch/ia64/Kconfig
+--- linux-2.6.18.2/arch/ia64/Kconfig	2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.1.1/arch/ia64/Kconfig	2006-09-20 17:01:44 +0200
 @@ -525,6 +525,8 @@ endmenu
  
  source "arch/ia64/Kconfig.debug"
@@ -823,9 +919,9 @@
  source "security/Kconfig"
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-vs2.1.patch?r1=1.1.2.42&r2=1.1.2.43&f=u



More information about the pld-cvs-commit mailing list