SOURCES (LINUX_2_6): linux-2.6-vs2.3.patch - updated for 2.6.24
arekm
arekm at pld-linux.org
Fri Jan 18 15:53:55 CET 2008
Author: arekm Date: Fri Jan 18 14:53:55 2008 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- updated for 2.6.24
---- Files affected:
SOURCES:
linux-2.6-vs2.3.patch (1.2.4.11.2.12 -> 1.2.4.11.2.13)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.12 SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.13
--- SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.12 Tue Oct 9 16:39:02 2007
+++ SOURCES/linux-2.6-vs2.3.patch Fri Jan 18 15:53:49 2008
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.23-rc9/Documentation/vserver/debug.txt linux-2.6.23-rc9-vs2.3.0-pre2/Documentation/vserver/debug.txt
---- linux-2.6.23-rc9/Documentation/vserver/debug.txt 1970-01-01 01:00:00 +0100
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/Documentation/vserver/debug.txt 2007-09-13 03:59:33 +0200
+diff -NurpP --minimal linux-2.6.24-rc7/Documentation/vserver/debug.txt linux-2.6.24-rc7-vs2.2.0.5.0.7/Documentation/vserver/debug.txt
+--- linux-2.6.24-rc7/Documentation/vserver/debug.txt 1970-01-01 01:00:00 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/Documentation/vserver/debug.txt 2007-12-13 13:25:42 +0100
@@ -0,0 +1,154 @@
+
+debug_cvirt:
@@ -156,21 +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.23-rc9/Makefile linux-2.6.23-rc9-vs2.3.0-pre2/Makefile
---- linux-2.6.23-rc9/Makefile 2007-10-07 13:49:25 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/Makefile 2007-10-07 14:26:35 +0200
-@@ -1,7 +1,7 @@
- VERSION = 2
- PATCHLEVEL = 6
- SUBLEVEL = 23
--EXTRAVERSION =-rc9
-+EXTRAVERSION = -rc9-vs2.3.0-pre2
- NAME = Arr Matey! A Hairy Bilge Rat!
-
- # *DOCUMENTATION*
-diff -NurpP --minimal linux-2.6.23-rc9/arch/alpha/Kconfig linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/Kconfig
---- linux-2.6.23-rc9/arch/alpha/Kconfig 2007-09-12 01:54:36 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/Kconfig 2007-09-13 03:59:33 +0200
+diff -NurpP --minimal linux-2.6.24-rc7/arch/alpha/Kconfig linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/alpha/Kconfig
+--- linux-2.6.24-rc7/arch/alpha/Kconfig 2007-11-29 01:09:49 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/alpha/Kconfig 2007-12-13 13:25:26 +0100
@@ -665,6 +665,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -180,9 +168,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.23-rc9/arch/alpha/kernel/asm-offsets.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/asm-offsets.c
---- linux-2.6.23-rc9/arch/alpha/kernel/asm-offsets.c 2006-02-15 13:54:10 +0100
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/asm-offsets.c 2007-09-13 03:59:33 +0200
+diff -NurpP --minimal linux-2.6.24-rc7/arch/alpha/kernel/asm-offsets.c linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/alpha/kernel/asm-offsets.c
+--- linux-2.6.24-rc7/arch/alpha/kernel/asm-offsets.c 2006-02-15 13:54:10 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/alpha/kernel/asm-offsets.c 2007-12-13 13:25:44 +0100
@@ -36,6 +36,7 @@ void foo(void)
DEFINE(PT_PTRACED, PT_PTRACED);
DEFINE(CLONE_VM, CLONE_VM);
@@ -191,9 +179,9 @@
DEFINE(SIGCHLD, SIGCHLD);
BLANK();
-diff -NurpP --minimal linux-2.6.23-rc9/arch/alpha/kernel/entry.S linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/entry.S
---- linux-2.6.23-rc9/arch/alpha/kernel/entry.S 2007-07-09 13:17:31 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/entry.S 2007-09-13 03:59:33 +0200
+diff -NurpP --minimal linux-2.6.24-rc7/arch/alpha/kernel/entry.S linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/alpha/kernel/entry.S
+--- linux-2.6.24-rc7/arch/alpha/kernel/entry.S 2007-11-29 01:09:50 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/alpha/kernel/entry.S 2007-12-13 13:25:48 +0100
@@ -643,7 +643,7 @@ kernel_thread:
stq $2, 152($sp) /* HAE */
@@ -235,9 +223,9 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.23-rc9/arch/alpha/kernel/osf_sys.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/osf_sys.c
---- linux-2.6.23-rc9/arch/alpha/kernel/osf_sys.c 2007-07-09 13:17:31 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/osf_sys.c 2007-09-13 03:59:33 +0200
+diff -NurpP --minimal linux-2.6.24-rc7/arch/alpha/kernel/osf_sys.c linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.24-rc7/arch/alpha/kernel/osf_sys.c 2007-11-29 01:09:50 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/alpha/kernel/osf_sys.c 2007-12-13 13:25:31 +0100
@@ -883,7 +883,7 @@ osf_gettimeofday(struct timeval32 __user
{
if (tv) {
@@ -247,9 +235,9 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.23-rc9/arch/alpha/kernel/ptrace.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/ptrace.c
---- linux-2.6.23-rc9/arch/alpha/kernel/ptrace.c 2007-09-12 01:54:36 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/ptrace.c 2007-09-13 03:59:33 +0200
+diff -NurpP --minimal linux-2.6.24-rc7/arch/alpha/kernel/ptrace.c linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/alpha/kernel/ptrace.c
+--- linux-2.6.24-rc7/arch/alpha/kernel/ptrace.c 2007-11-29 01:09:50 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/alpha/kernel/ptrace.c 2007-12-13 13:25:11 +0100
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/security.h>
@@ -258,29 +246,17 @@
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-@@ -283,6 +284,11 @@ do_sys_ptrace(long request, long pid, lo
- goto out_notsk;
- }
-
-+ if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT)) {
-+ ret = -EPERM;
-+ goto out;
-+ }
-+
- if (request == PTRACE_ATTACH) {
- ret = ptrace_attach(child);
- goto out;
-diff -NurpP --minimal linux-2.6.23-rc9/arch/alpha/kernel/semaphore.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/semaphore.c
---- linux-2.6.23-rc9/arch/alpha/kernel/semaphore.c 2004-08-14 12:55:32 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/semaphore.c 2007-09-13 03:59:33 +0200
+diff -NurpP --minimal linux-2.6.24-rc7/arch/alpha/kernel/semaphore.c linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/alpha/kernel/semaphore.c
+--- linux-2.6.24-rc7/arch/alpha/kernel/semaphore.c 2007-11-29 01:09:50 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/alpha/kernel/semaphore.c 2007-12-13 13:25:29 +0100
@@ -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);
+- tsk->comm, task_pid_nr(tsk), sem);
+ printk("%s(%d:#%u): down failed(%p)\n",
-+ tsk->comm, tsk->pid, tsk->xid, sem);
++ tsk->comm, task_pid_nr(tsk), tsk->xid, sem);
#endif
tsk->state = TASK_UNINTERRUPTIBLE;
@@ -289,9 +265,9 @@
#ifdef CONFIG_DEBUG_SEMAPHORE
- printk("%s(%d): down acquired(%p)\n",
-- tsk->comm, tsk->pid, sem);
+- tsk->comm, task_pid_nr(tsk), sem);
+ printk("%s(%d:#%u): down acquired(%p)\n",
-+ tsk->comm, tsk->pid, tsk->xid, sem);
++ tsk->comm, task_pid_nr(tsk), tsk->xid, sem);
#endif
}
@@ -300,15 +276,15 @@
#ifdef CONFIG_DEBUG_SEMAPHORE
- printk("%s(%d): down failed(%p)\n",
-- tsk->comm, tsk->pid, sem);
+- tsk->comm, task_pid_nr(tsk), sem);
+ printk("%s(%d:#%u): down failed(%p)\n",
-+ tsk->comm, tsk->pid, tsk->xid, sem);
++ tsk->comm, task_pid_nr(tsk), tsk->xid, sem);
#endif
tsk->state = TASK_INTERRUPTIBLE;
-diff -NurpP --minimal linux-2.6.23-rc9/arch/alpha/kernel/systbls.S linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/systbls.S
---- linux-2.6.23-rc9/arch/alpha/kernel/systbls.S 2007-07-09 13:17:31 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/systbls.S 2007-09-13 03:59:33 +0200
+diff -NurpP --minimal linux-2.6.24-rc7/arch/alpha/kernel/systbls.S linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/alpha/kernel/systbls.S
+--- linux-2.6.24-rc7/arch/alpha/kernel/systbls.S 2007-07-09 13:17:31 +0200
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/alpha/kernel/systbls.S 2007-12-13 13:25:27 +0100
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -318,37 +294,37 @@
.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.23-rc9/arch/alpha/kernel/traps.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/traps.c
---- linux-2.6.23-rc9/arch/alpha/kernel/traps.c 2007-09-12 01:54:36 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/kernel/traps.c 2007-09-13 03:59:33 +0200
+diff -NurpP --minimal linux-2.6.24-rc7/arch/alpha/kernel/traps.c linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/alpha/kernel/traps.c
+--- linux-2.6.24-rc7/arch/alpha/kernel/traps.c 2007-11-29 01:09:50 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/alpha/kernel/traps.c 2007-12-13 13:25:29 +0100
@@ -182,7 +182,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
#endif
-- printk("%s(%d): %s %ld\n", current->comm, current->pid, str, err);
+- printk("%s(%d): %s %ld\n", current->comm, task_pid_nr(current), str, err);
+ printk("%s(%d[#%u]): %s %ld\n", current->comm,
-+ current->pid, current->xid, str, err);
++ task_pid_nr(current), current->xid, str, err);
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-2.6.23-rc9/arch/alpha/mm/fault.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/mm/fault.c
---- linux-2.6.23-rc9/arch/alpha/mm/fault.c 2007-09-12 01:54:36 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/alpha/mm/fault.c 2007-09-13 03:59:33 +0200
+diff -NurpP --minimal linux-2.6.24-rc7/arch/alpha/mm/fault.c linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/alpha/mm/fault.c
+--- linux-2.6.24-rc7/arch/alpha/mm/fault.c 2007-11-29 01:09:50 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/alpha/mm/fault.c 2007-12-13 13:25:29 +0100
@@ -193,8 +193,8 @@ do_page_fault(unsigned long address, uns
down_read(&mm->mmap_sem);
goto survive;
}
- printk(KERN_ALERT "VM: killing process %s(%d)\n",
-- current->comm, current->pid);
+- current->comm, task_pid_nr(current));
+ printk(KERN_ALERT "VM: killing process %s(%d:#%u)\n",
-+ current->comm, current->pid, current->xid);
++ current->comm, task_pid_nr(current), current->xid);
if (!user_mode(regs))
goto no_context;
- do_exit(SIGKILL);
-diff -NurpP --minimal linux-2.6.23-rc9/arch/arm/Kconfig linux-2.6.23-rc9-vs2.3.0-pre2/arch/arm/Kconfig
---- linux-2.6.23-rc9/arch/arm/Kconfig 2007-09-12 01:54:36 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/arm/Kconfig 2007-09-13 03:59:33 +0200
-@@ -1063,6 +1063,8 @@ source "arch/arm/oprofile/Kconfig"
+ do_group_exit(SIGKILL);
+diff -NurpP --minimal linux-2.6.24-rc7/arch/arm/Kconfig linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/arm/Kconfig
+--- linux-2.6.24-rc7/arch/arm/Kconfig 2007-12-31 17:58:08 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/arm/Kconfig 2007-12-31 12:34:02 +0100
+@@ -1080,6 +1080,8 @@ source "kernel/Kconfig.instrumentation"
source "arch/arm/Kconfig.debug"
@@ -357,9 +333,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.23-rc9/arch/arm/kernel/calls.S linux-2.6.23-rc9-vs2.3.0-pre2/arch/arm/kernel/calls.S
---- linux-2.6.23-rc9/arch/arm/kernel/calls.S 2007-07-09 13:17:32 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/arm/kernel/calls.S 2007-09-13 03:59:33 +0200
+diff -NurpP --minimal linux-2.6.24-rc7/arch/arm/kernel/calls.S linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/arm/kernel/calls.S
+--- linux-2.6.24-rc7/arch/arm/kernel/calls.S 2007-11-29 01:09:50 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/arm/kernel/calls.S 2007-12-13 13:25:28 +0100
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -369,28 +345,16 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.23-rc9/arch/arm/kernel/ecard.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/arm/kernel/ecard.c
---- linux-2.6.23-rc9/arch/arm/kernel/ecard.c 2007-07-09 13:17:32 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/arm/kernel/ecard.c 2007-10-01 18:33:50 +0200
-@@ -249,7 +249,7 @@ static void ecard_init_pgtables(struct m
-
- static int ecard_init_mm(void)
- {
-- struct mm_struct * mm = mm_alloc();
-+ struct mm_struct * mm = mm_alloc(current->vx_info);
- struct mm_struct *active_mm = current->active_mm;
-
- if (!mm)
-diff -NurpP --minimal linux-2.6.23-rc9/arch/arm/kernel/process.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/arm/kernel/process.c
---- linux-2.6.23-rc9/arch/arm/kernel/process.c 2007-09-12 01:54:36 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/arm/kernel/process.c 2007-09-13 03:59:33 +0200
+diff -NurpP --minimal linux-2.6.24-rc7/arch/arm/kernel/process.c linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/arm/kernel/process.c
+--- linux-2.6.24-rc7/arch/arm/kernel/process.c 2007-11-29 01:09:50 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/arm/kernel/process.c 2007-12-13 13:25:44 +0100
@@ -265,7 +265,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
printk("\n");
-- printk("Pid: %d, comm: %20s\n", current->pid, current->comm);
+- printk("Pid: %d, comm: %20s\n", task_pid_nr(current), current->comm);
+ printk("Pid: %d[#%u], comm: %20s\n",
-+ current->pid, current->xid, current->comm);
++ task_pid_nr(current), current->xid, current->comm);
__show_regs(regs);
__backtrace();
}
@@ -404,37 +368,37 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.23-rc9/arch/arm/kernel/traps.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/arm/kernel/traps.c
---- linux-2.6.23-rc9/arch/arm/kernel/traps.c 2007-09-12 01:54:36 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/arm/kernel/traps.c 2007-09-13 03:59:33 +0200
+diff -NurpP --minimal linux-2.6.24-rc7/arch/arm/kernel/traps.c linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/arm/kernel/traps.c
+--- linux-2.6.24-rc7/arch/arm/kernel/traps.c 2007-12-31 17:58:08 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/arm/kernel/traps.c 2007-12-31 12:34:02 +0100
@@ -222,8 +222,8 @@ static void __die(const char *str, int e
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);
+- tsk->comm, task_pid_nr(tsk), thread + 1);
+ printk("Process %s (pid: %d:#%u, stack limit = 0x%p)\n",
-+ tsk->comm, tsk->pid, tsk->xid, thread + 1);
++ tsk->comm, task_pid_nr(tsk), tsk->xid, thread + 1);
if (!user_mode(regs) || in_interrupt()) {
dump_mem("Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.23-rc9/arch/arm/mm/fault.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/arm/mm/fault.c
---- linux-2.6.23-rc9/arch/arm/mm/fault.c 2007-09-12 01:54:40 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/arm/mm/fault.c 2007-09-13 03:59:33 +0200
+diff -NurpP --minimal linux-2.6.24-rc7/arch/arm/mm/fault.c linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/arm/mm/fault.c
+--- linux-2.6.24-rc7/arch/arm/mm/fault.c 2007-11-29 01:09:52 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/arm/mm/fault.c 2007-12-13 13:25:29 +0100
@@ -265,7 +265,8 @@ do_page_fault(unsigned long addr, unsign
* happened to us that made us unable to handle
* the page fault gracefully.
*/
- printk("VM: killing process %s\n", tsk->comm);
+ printk("VM: killing process %s(%d:#%u)\n",
-+ tsk->comm, tsk->pid, tsk->xid);
- do_exit(SIGKILL);
++ tsk->comm, task_pid_nr(tsk), tsk->xid);
+ do_group_exit(SIGKILL);
return 0;
}
-diff -NurpP --minimal linux-2.6.23-rc9/arch/cris/Kconfig linux-2.6.23-rc9-vs2.3.0-pre2/arch/cris/Kconfig
---- linux-2.6.23-rc9/arch/cris/Kconfig 2007-09-12 01:54:41 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/cris/Kconfig 2007-09-13 03:59:33 +0200
-@@ -198,6 +198,8 @@ source "drivers/usb/Kconfig"
+diff -NurpP --minimal linux-2.6.24-rc7/arch/cris/Kconfig linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/cris/Kconfig
+--- linux-2.6.24-rc7/arch/cris/Kconfig 2007-11-29 01:09:56 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/cris/Kconfig 2007-12-13 13:25:26 +0100
+@@ -217,6 +217,8 @@ source "kernel/Kconfig.instrumentation"
source "arch/cris/Kconfig.debug"
@@ -443,9 +407,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.23-rc9/arch/cris/arch-v10/kernel/process.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/cris/arch-v10/kernel/process.c
---- linux-2.6.23-rc9/arch/cris/arch-v10/kernel/process.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/cris/arch-v10/kernel/process.c 2007-09-13 03:59:33 +0200
+diff -NurpP --minimal linux-2.6.24-rc7/arch/cris/arch-v10/kernel/process.c linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/cris/arch-v10/kernel/process.c
+--- linux-2.6.24-rc7/arch/cris/arch-v10/kernel/process.c 2007-11-29 01:09:57 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/cris/arch-v10/kernel/process.c 2007-12-13 13:25:44 +0100
@@ -103,7 +103,8 @@ int kernel_thread(int (*fn)(void *), voi
regs.dccr = 1 << I_DCCR_BITNR;
@@ -456,9 +420,9 @@
}
/* setup the child's kernel stack with a pt_regs and switch_stack on it.
-diff -NurpP --minimal linux-2.6.23-rc9/arch/cris/arch-v32/kernel/process.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/cris/arch-v32/kernel/process.c
---- linux-2.6.23-rc9/arch/cris/arch-v32/kernel/process.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/cris/arch-v32/kernel/process.c 2007-09-13 03:59:33 +0200
+diff -NurpP --minimal linux-2.6.24-rc7/arch/cris/arch-v32/kernel/process.c linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/cris/arch-v32/kernel/process.c
+--- linux-2.6.24-rc7/arch/cris/arch-v32/kernel/process.c 2007-11-29 01:09:57 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/cris/arch-v32/kernel/process.c 2007-12-13 13:25:44 +0100
@@ -120,7 +120,8 @@ kernel_thread(int (*fn)(void *), void *
regs.ccs = 1 << (I_CCS_BITNR + CCS_SHIFT);
@@ -469,9 +433,9 @@
}
/*
-diff -NurpP --minimal linux-2.6.23-rc9/arch/frv/kernel/kernel_thread.S linux-2.6.23-rc9-vs2.3.0-pre2/arch/frv/kernel/kernel_thread.S
---- linux-2.6.23-rc9/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20 +0100
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/frv/kernel/kernel_thread.S 2007-09-13 03:59:33 +0200
+diff -NurpP --minimal linux-2.6.24-rc7/arch/frv/kernel/kernel_thread.S linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.24-rc7/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/frv/kernel/kernel_thread.S 2007-12-13 13:25:44 +0100
@@ -13,6 +13,8 @@
#include <asm/unistd.h>
@@ -490,10 +454,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.23-rc9/arch/h8300/Kconfig linux-2.6.23-rc9-vs2.3.0-pre2/arch/h8300/Kconfig
---- linux-2.6.23-rc9/arch/h8300/Kconfig 2007-09-12 01:54:42 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/h8300/Kconfig 2007-09-13 03:59:33 +0200
-@@ -225,6 +225,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.24-rc7/arch/h8300/Kconfig linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/h8300/Kconfig
+--- linux-2.6.24-rc7/arch/h8300/Kconfig 2007-11-29 01:09:58 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/h8300/Kconfig 2007-12-13 13:25:26 +0100
+@@ -227,6 +227,8 @@ source "kernel/Kconfig.instrumentation"
source "arch/h8300/Kconfig.debug"
@@ -502,9 +466,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.23-rc9/arch/h8300/kernel/process.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/h8300/kernel/process.c
---- linux-2.6.23-rc9/arch/h8300/kernel/process.c 2007-09-12 01:54:42 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/h8300/kernel/process.c 2007-09-13 03:59:33 +0200
+diff -NurpP --minimal linux-2.6.24-rc7/arch/h8300/kernel/process.c linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/h8300/kernel/process.c
+--- linux-2.6.24-rc7/arch/h8300/kernel/process.c 2007-11-29 01:00:10 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/h8300/kernel/process.c 2007-12-13 13:25:44 +0100
@@ -135,7 +135,7 @@ int kernel_thread(int (*fn)(void *), voi
fs = get_fs();
@@ -514,128 +478,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.23-rc9/arch/i386/Kconfig linux-2.6.23-rc9-vs2.3.0-pre2/arch/i386/Kconfig
---- linux-2.6.23-rc9/arch/i386/Kconfig 2007-09-12 01:54:42 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/i386/Kconfig 2007-09-13 03:59:33 +0200
-@@ -1256,6 +1256,8 @@ endif # INSTRUMENTATION
-
- source "arch/i386/Kconfig.debug"
-
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
-
- source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.23-rc9/arch/i386/kernel/process.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/i386/kernel/process.c
---- linux-2.6.23-rc9/arch/i386/kernel/process.c 2007-09-12 01:54:44 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/i386/kernel/process.c 2007-09-13 03:59:33 +0200
-@@ -303,8 +303,10 @@ void show_regs(struct pt_regs * regs)
- unsigned long d0, d1, d2, d3, d6, d7;
-
- printk("\n");
-- printk("Pid: %d, comm: %20s\n", current->pid, current->comm);
-- printk("EIP: %04x:[<%08lx>] CPU: %d\n",0xffff & regs->xcs,regs->eip, smp_processor_id());
-+ printk("Pid: %d[#%u], comm: %20s\n",
-+ current->pid, current->xid, current->comm);
-+ printk("EIP: %04x:[<%08lx>] CPU: %d\n",
-+ 0xffff & regs->xcs,regs->eip, smp_processor_id());
- print_symbol("EIP is at %s\n", regs->eip);
-
- if (user_mode_vm(regs))
-@@ -367,7 +369,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.. */
-- return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, ®s, 0, NULL, NULL);
-+ return do_fork(flags | CLONE_VM | CLONE_UNTRACED | CLONE_KTHREAD,
-+ 0, ®s, 0, NULL, NULL);
- }
- EXPORT_SYMBOL(kernel_thread);
-
-diff -NurpP --minimal linux-2.6.23-rc9/arch/i386/kernel/syscall_table.S linux-2.6.23-rc9-vs2.3.0-pre2/arch/i386/kernel/syscall_table.S
---- linux-2.6.23-rc9/arch/i386/kernel/syscall_table.S 2007-09-12 01:54:44 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/i386/kernel/syscall_table.S 2007-09-13 03:59:33 +0200
-@@ -272,7 +272,7 @@ ENTRY(sys_call_table)
- .long sys_tgkill /* 270 */
- .long sys_utimes
- .long sys_fadvise64_64
-- .long sys_ni_syscall /* sys_vserver */
-+ .long sys_vserver
- .long sys_mbind
- .long sys_get_mempolicy
- .long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.23-rc9/arch/i386/kernel/sysenter.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/i386/kernel/sysenter.c
---- linux-2.6.23-rc9/arch/i386/kernel/sysenter.c 2007-09-12 01:54:44 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/i386/kernel/sysenter.c 2007-09-13 03:59:33 +0200
-@@ -18,6 +18,7 @@
- #include <linux/mm.h>
- #include <linux/err.h>
- #include <linux/module.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/cpufeature.h>
- #include <asm/msr.h>
-diff -NurpP --minimal linux-2.6.23-rc9/arch/i386/kernel/traps.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/i386/kernel/traps.c
---- linux-2.6.23-rc9/arch/i386/kernel/traps.c 2007-09-12 01:54:44 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/i386/kernel/traps.c 2007-09-13 03:59:33 +0200
-@@ -60,6 +60,8 @@
- #include <asm/stacktrace.h>
-
- #include <linux/module.h>
-+#include <linux/vs_context.h>
-+#include <linux/vserver/history.h>
-
- #include "mach_traps.h"
-
-@@ -317,8 +319,8 @@ void show_registers(struct pt_regs *regs
- regs->esi, regs->edi, regs->ebp, esp);
- printk(KERN_EMERG "ds: %04x es: %04x fs: %04x gs: %04x ss: %04x\n",
- regs->xds & 0xffff, regs->xes & 0xffff, regs->xfs & 0xffff, gs, ss);
-- printk(KERN_EMERG "Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)",
-- TASK_COMM_LEN, current->comm, current->pid,
-+ printk(KERN_EMERG "Process %.*s (pid: %d[#%u], ti=%p task=%p task.ti=%p)",
-+ TASK_COMM_LEN, current->comm, current->pid, current->xid,
- current_thread_info(), current, task_thread_info(current));
- /*
- * When in-kernel, we also print out the stack and code at the
-@@ -389,6 +391,8 @@ void die(const char * str, struct pt_reg
-
- oops_enter();
-
-+ vxh_throw_oops();
-+
- if (die.lock_owner != raw_smp_processor_id()) {
- console_verbose();
- spin_lock_irqsave(&die.lock, flags);
-@@ -426,9 +430,9 @@ void die(const char * str, struct pt_reg
- if (nl)
- printk("\n");
- if (notify_die(DIE_OOPS, str, regs, err,
-- current->thread.trap_no, SIGSEGV) !=
-- NOTIFY_STOP) {
-+ current->thread.trap_no, SIGSEGV) != NOTIFY_STOP) {
- show_registers(regs);
-+ vxh_dump_history();
- /* Executive summary in case the oops scrolled away */
- esp = (unsigned long) (®s->esp);
- savesegment(ss, ss);
-diff -NurpP --minimal linux-2.6.23-rc9/arch/i386/mm/fault.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/i386/mm/fault.c
---- linux-2.6.23-rc9/arch/i386/mm/fault.c 2007-09-12 01:54:44 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/i386/mm/fault.c 2007-09-13 03:59:33 +0200
-@@ -596,7 +596,8 @@ out_of_memory:
- down_read(&mm->mmap_sem);
- goto survive;
- }
-- printk("VM: killing process %s\n", tsk->comm);
-+ printk("VM: killing process %s(%d:#%u)\n",
-+ tsk->comm, tsk->pid, tsk->xid);
- if (error_code & 4)
- do_exit(SIGKILL);
- goto no_context;
-diff -NurpP --minimal linux-2.6.23-rc9/arch/ia64/Kconfig linux-2.6.23-rc9-vs2.3.0-pre2/arch/ia64/Kconfig
---- linux-2.6.23-rc9/arch/ia64/Kconfig 2007-09-12 01:54:44 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/ia64/Kconfig 2007-09-13 03:59:33 +0200
-@@ -591,6 +591,8 @@ endmenu
+diff -NurpP --minimal linux-2.6.24-rc7/arch/ia64/Kconfig linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/ia64/Kconfig
+--- linux-2.6.24-rc7/arch/ia64/Kconfig 2007-11-29 01:10:02 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/ia64/Kconfig 2007-12-13 13:25:26 +0100
+@@ -596,6 +596,8 @@ source "kernel/Kconfig.instrumentation"
source "arch/ia64/Kconfig.debug"
@@ -644,9 +490,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.23-rc9/arch/ia64/ia32/ia32_entry.S linux-2.6.23-rc9-vs2.3.0-pre2/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.23-rc9/arch/ia64/ia32/ia32_entry.S 2007-09-12 01:54:45 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/ia64/ia32/ia32_entry.S 2007-09-13 03:59:33 +0200
+diff -NurpP --minimal linux-2.6.24-rc7/arch/ia64/ia32/ia32_entry.S linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/ia64/ia32/ia32_entry.S
+--- linux-2.6.24-rc7/arch/ia64/ia32/ia32_entry.S 2007-11-29 01:00:17 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/ia64/ia32/ia32_entry.S 2007-12-13 13:25:28 +0100
@@ -446,7 +446,7 @@ ia32_syscall_table:
data8 sys_tgkill /* 270 */
data8 compat_sys_utimes
@@ -656,9 +502,9 @@
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.23-rc9/arch/ia64/ia32/sys_ia32.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/ia64/ia32/sys_ia32.c
---- linux-2.6.23-rc9/arch/ia64/ia32/sys_ia32.c 2007-09-12 01:54:45 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/ia64/ia32/sys_ia32.c 2007-09-13 03:59:33 +0200
+diff -NurpP --minimal linux-2.6.24-rc7/arch/ia64/ia32/sys_ia32.c linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/ia64/ia32/sys_ia32.c
+--- linux-2.6.24-rc7/arch/ia64/ia32/sys_ia32.c 2007-11-29 01:10:03 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/ia64/ia32/sys_ia32.c 2007-12-13 13:25:31 +0100
@@ -1182,7 +1182,7 @@ sys32_gettimeofday (struct compat_timeva
{
if (tv) {
@@ -668,9 +514,9 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.23-rc9/arch/ia64/kernel/asm-offsets.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/ia64/kernel/asm-offsets.c
---- linux-2.6.23-rc9/arch/ia64/kernel/asm-offsets.c 2007-09-12 01:54:45 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/ia64/kernel/asm-offsets.c 2007-09-13 03:59:33 +0200
+diff -NurpP --minimal linux-2.6.24-rc7/arch/ia64/kernel/asm-offsets.c linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/ia64/kernel/asm-offsets.c
+--- linux-2.6.24-rc7/arch/ia64/kernel/asm-offsets.c 2007-11-29 01:00:17 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/ia64/kernel/asm-offsets.c 2007-12-13 13:25:44 +0100
@@ -194,6 +194,7 @@ void foo(void)
/* for assembly files which can't include sched.h: */
DEFINE(IA64_CLONE_VFORK, CLONE_VFORK);
@@ -679,9 +525,9 @@
BLANK();
DEFINE(IA64_CPUINFO_NSEC_PER_CYC_OFFSET,
-diff -NurpP --minimal linux-2.6.23-rc9/arch/ia64/kernel/entry.S linux-2.6.23-rc9-vs2.3.0-pre2/arch/ia64/kernel/entry.S
---- linux-2.6.23-rc9/arch/ia64/kernel/entry.S 2007-09-12 01:54:45 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/ia64/kernel/entry.S 2007-09-13 03:59:33 +0200
+diff -NurpP --minimal linux-2.6.24-rc7/arch/ia64/kernel/entry.S linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/ia64/kernel/entry.S
+--- linux-2.6.24-rc7/arch/ia64/kernel/entry.S 2007-11-29 01:00:17 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/ia64/kernel/entry.S 2007-12-13 13:25:28 +0100
@@ -1547,7 +1547,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
@@ -691,9 +537,9 @@
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.23-rc9/arch/ia64/kernel/perfmon.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/ia64/kernel/perfmon.c
---- linux-2.6.23-rc9/arch/ia64/kernel/perfmon.c 2007-09-12 01:54:45 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/ia64/kernel/perfmon.c 2007-09-13 03:59:33 +0200
+diff -NurpP --minimal linux-2.6.24-rc7/arch/ia64/kernel/perfmon.c linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/ia64/kernel/perfmon.c
+--- linux-2.6.24-rc7/arch/ia64/kernel/perfmon.c 2007-11-29 01:10:03 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/ia64/kernel/perfmon.c 2007-12-13 13:25:41 +0100
@@ -40,6 +40,7 @@
#include <linux/capability.h>
#include <linux/rcupdate.h>
@@ -702,7 +548,7 @@
#include <asm/errno.h>
#include <asm/intrinsics.h>
-@@ -2395,7 +2396,7 @@ pfm_smpl_buffer_alloc(struct task_struct
+@@ -2389,7 +2390,7 @@ pfm_smpl_buffer_alloc(struct task_struct
*/
insert_vm_struct(mm, vma);
@@ -711,20 +557,21 @@
vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file,
vma_pages(vma));
up_write(&task->mm->mmap_sem);
-diff -NurpP --minimal linux-2.6.23-rc9/arch/ia64/kernel/process.c linux-2.6.23-rc9-vs2.3.0-pre2/arch/ia64/kernel/process.c
---- linux-2.6.23-rc9/arch/ia64/kernel/process.c 2007-09-12 01:54:45 +0200
-+++ linux-2.6.23-rc9-vs2.3.0-pre2/arch/ia64/kernel/process.c 2007-09-13 03:59:33 +0200
-@@ -105,7 +105,8 @@ show_regs (struct pt_regs *regs)
+diff -NurpP --minimal linux-2.6.24-rc7/arch/ia64/kernel/process.c linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/ia64/kernel/process.c
+--- linux-2.6.24-rc7/arch/ia64/kernel/process.c 2007-12-31 17:58:10 +0100
++++ linux-2.6.24-rc7-vs2.2.0.5.0.7/arch/ia64/kernel/process.c 2007-12-31 12:36:36 +0100
<<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.12&r2=1.2.4.11.2.13&f=u
More information about the pld-cvs-commit
mailing list