Author: hawk Date: Sun Mar 30 21:02:54 2008 GMT
Module: SOURCES Tag: Titanium
---- Log message:
- http://vserver.13thfloor.at/Experimental/patch-2.6.24.4-vs2.3.0.34.diff
with extraversion killed
---- Files affected:
SOURCES:
linux-2.6-vs2.3.patch (1.1.2.17.2.2 -> 1.1.2.17.2.3)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.1.2.17.2.2
SOURCES/linux-2.6-vs2.3.patch:1.1.2.17.2.3
--- SOURCES/linux-2.6-vs2.3.patch:1.1.2.17.2.2 Thu Mar 27 15:12:31 2008
+++ SOURCES/linux-2.6-vs2.3.patch Sun Mar 30 23:02:47 2008
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.22.19/Documentation/vserver/debug.txt
linux-2.6.22.19-vs2.3.0.34/Documentation/vserver/debug.txt
---- linux-2.6.22.19/Documentation/vserver/debug.txt 1970-01-01 01:00:00
+0100
-+++ linux-2.6.22.19-vs2.3.0.34/Documentation/vserver/debug.txt 2007-08-05
20:53:12 +0200
+diff -NurpP --minimal linux-2.6.24.4/Documentation/vserver/debug.txt
linux-2.6.24.4-vs2.3.0.34/Documentation/vserver/debug.txt
+--- linux-2.6.24.4/Documentation/vserver/debug.txt 1970-01-01 01:00:00
+0100
++++ linux-2.6.24.4-vs2.3.0.34/Documentation/vserver/debug.txt 2007-12-13
13:25:42 +0100
@@ -0,0 +1,154 @@
+
+debug_cvirt:
@@ -156,10 +156,10 @@
+ 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.19/arch/alpha/Kconfig
linux-2.6.22.19-vs2.3.0.34/arch/alpha/Kconfig
---- linux-2.6.22.19/arch/alpha/Kconfig 2007-07-09 13:17:31 +0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/alpha/Kconfig 2007-08-05 20:53:12
+0200
-@@ -662,6 +662,8 @@ config DUMMY_CONSOLE
+diff -NurpP --minimal linux-2.6.24.4/arch/alpha/Kconfig
linux-2.6.24.4-vs2.3.0.34/arch/alpha/Kconfig
+--- linux-2.6.24.4/arch/alpha/Kconfig 2008-03-27 17:44:40 +0100
++++ linux-2.6.24.4-vs2.3.0.34/arch/alpha/Kconfig 2007-12-13 13:25:26
+0100
+@@ -665,6 +665,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -168,9 +168,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.19/arch/alpha/kernel/asm-offsets.c
linux-2.6.22.19-vs2.3.0.34/arch/alpha/kernel/asm-offsets.c
---- linux-2.6.22.19/arch/alpha/kernel/asm-offsets.c 2006-02-15 13:54:10
+0100
-+++ linux-2.6.22.19-vs2.3.0.34/arch/alpha/kernel/asm-offsets.c 2007-08-05
20:53:12 +0200
+diff -NurpP --minimal linux-2.6.24.4/arch/alpha/kernel/asm-offsets.c
linux-2.6.24.4-vs2.3.0.34/arch/alpha/kernel/asm-offsets.c
+--- linux-2.6.24.4/arch/alpha/kernel/asm-offsets.c 2006-02-15 13:54:10
+0100
++++ linux-2.6.24.4-vs2.3.0.34/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);
@@ -179,9 +179,9 @@
DEFINE(SIGCHLD, SIGCHLD);
BLANK();
-diff -NurpP --minimal linux-2.6.22.19/arch/alpha/kernel/entry.S
linux-2.6.22.19-vs2.3.0.34/arch/alpha/kernel/entry.S
---- linux-2.6.22.19/arch/alpha/kernel/entry.S 2007-07-09 13:17:31 +0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/alpha/kernel/entry.S 2007-08-05
20:53:12 +0200
+diff -NurpP --minimal linux-2.6.24.4/arch/alpha/kernel/entry.S
linux-2.6.24.4-vs2.3.0.34/arch/alpha/kernel/entry.S
+--- linux-2.6.24.4/arch/alpha/kernel/entry.S 2008-03-27 17:44:40 +0100
++++ linux-2.6.24.4-vs2.3.0.34/arch/alpha/kernel/entry.S 2007-12-13
13:25:48 +0100
@@ -643,7 +643,7 @@ kernel_thread:
stq $2, 152($sp) /* HAE */
@@ -223,9 +223,9 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.22.19/arch/alpha/kernel/osf_sys.c
linux-2.6.22.19-vs2.3.0.34/arch/alpha/kernel/osf_sys.c
---- linux-2.6.22.19/arch/alpha/kernel/osf_sys.c 2007-07-09 13:17:31
+0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/alpha/kernel/osf_sys.c 2007-08-05
20:53:12 +0200
+diff -NurpP --minimal linux-2.6.24.4/arch/alpha/kernel/osf_sys.c
linux-2.6.24.4-vs2.3.0.34/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.24.4/arch/alpha/kernel/osf_sys.c 2008-03-27 17:44:40 +0100
++++ linux-2.6.24.4-vs2.3.0.34/arch/alpha/kernel/osf_sys.c 2007-12-13
13:25:31 +0100
@@ -883,7 +883,7 @@ osf_gettimeofday(struct timeval32 __user
{
if (tv) {
@@ -235,9 +235,9 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.22.19/arch/alpha/kernel/ptrace.c
linux-2.6.22.19-vs2.3.0.34/arch/alpha/kernel/ptrace.c
---- linux-2.6.22.19/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/alpha/kernel/ptrace.c 2007-08-05
20:53:12 +0200
+diff -NurpP --minimal linux-2.6.24.4/arch/alpha/kernel/ptrace.c
linux-2.6.24.4-vs2.3.0.34/arch/alpha/kernel/ptrace.c
+--- linux-2.6.24.4/arch/alpha/kernel/ptrace.c 2008-03-27 17:44:40 +0100
++++ linux-2.6.24.4-vs2.3.0.34/arch/alpha/kernel/ptrace.c 2007-12-13
13:25:11 +0100
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/security.h>
@@ -246,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.22.19/arch/alpha/kernel/semaphore.c
linux-2.6.22.19-vs2.3.0.34/arch/alpha/kernel/semaphore.c
---- linux-2.6.22.19/arch/alpha/kernel/semaphore.c 2004-08-14 12:55:32
+0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/alpha/kernel/semaphore.c 2007-08-05
20:53:12 +0200
+diff -NurpP --minimal linux-2.6.24.4/arch/alpha/kernel/semaphore.c
linux-2.6.24.4-vs2.3.0.34/arch/alpha/kernel/semaphore.c
+--- linux-2.6.24.4/arch/alpha/kernel/semaphore.c 2008-03-27 17:44:40
+0100
++++ linux-2.6.24.4-vs2.3.0.34/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;
@@ -277,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
}
@@ -288,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.22.19/arch/alpha/kernel/systbls.S
linux-2.6.22.19-vs2.3.0.34/arch/alpha/kernel/systbls.S
---- linux-2.6.22.19/arch/alpha/kernel/systbls.S 2007-07-09 13:17:31
+0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/alpha/kernel/systbls.S 2007-08-05
20:53:12 +0200
+diff -NurpP --minimal linux-2.6.24.4/arch/alpha/kernel/systbls.S
linux-2.6.24.4-vs2.3.0.34/arch/alpha/kernel/systbls.S
+--- linux-2.6.24.4/arch/alpha/kernel/systbls.S 2007-07-09 13:17:31 +0200
++++ linux-2.6.24.4-vs2.3.0.34/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
@@ -306,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.22.19/arch/alpha/kernel/traps.c
linux-2.6.22.19-vs2.3.0.34/arch/alpha/kernel/traps.c
---- linux-2.6.22.19/arch/alpha/kernel/traps.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/alpha/kernel/traps.c 2007-08-05
20:53:12 +0200
+diff -NurpP --minimal linux-2.6.24.4/arch/alpha/kernel/traps.c
linux-2.6.24.4-vs2.3.0.34/arch/alpha/kernel/traps.c
+--- linux-2.6.24.4/arch/alpha/kernel/traps.c 2008-03-27 17:44:40 +0100
++++ linux-2.6.24.4-vs2.3.0.34/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));
- dik_show_code((unsigned int *)regs->pc);
-diff -NurpP --minimal linux-2.6.22.19/arch/alpha/mm/fault.c
linux-2.6.22.19-vs2.3.0.34/arch/alpha/mm/fault.c
---- linux-2.6.22.19/arch/alpha/mm/fault.c 2007-07-09 13:17:32 +0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/alpha/mm/fault.c 2007-08-05 20:53:12
+0200
-@@ -197,8 +197,8 @@ do_page_fault(unsigned long address, uns
+diff -NurpP --minimal linux-2.6.24.4/arch/alpha/mm/fault.c
linux-2.6.24.4-vs2.3.0.34/arch/alpha/mm/fault.c
+--- linux-2.6.24.4/arch/alpha/mm/fault.c 2008-03-27 17:44:40 +0100
++++ linux-2.6.24.4-vs2.3.0.34/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.22.19/arch/arm/Kconfig
linux-2.6.22.19-vs2.3.0.34/arch/arm/Kconfig
---- linux-2.6.22.19/arch/arm/Kconfig 2007-07-09 13:17:32 +0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/arm/Kconfig 2007-08-05 20:53:12
+0200
-@@ -1042,6 +1042,8 @@ source "arch/arm/oprofile/Kconfig"
+ do_group_exit(SIGKILL);
+diff -NurpP --minimal linux-2.6.24.4/arch/arm/Kconfig
linux-2.6.24.4-vs2.3.0.34/arch/arm/Kconfig
+--- linux-2.6.24.4/arch/arm/Kconfig 2008-03-27 17:44:42 +0100
++++ linux-2.6.24.4-vs2.3.0.34/arch/arm/Kconfig 2008-01-28 20:35:50 +0100
+@@ -1082,6 +1082,8 @@ source "arch/arm/Kconfig.instrumentation
source "arch/arm/Kconfig.debug"
@@ -345,9 +333,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.19/arch/arm/kernel/calls.S
linux-2.6.22.19-vs2.3.0.34/arch/arm/kernel/calls.S
---- linux-2.6.22.19/arch/arm/kernel/calls.S 2007-07-09 13:17:32 +0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/arm/kernel/calls.S 2007-08-05 20:53:12
+0200
+diff -NurpP --minimal linux-2.6.24.4/arch/arm/kernel/calls.S
linux-2.6.24.4-vs2.3.0.34/arch/arm/kernel/calls.S
+--- linux-2.6.24.4/arch/arm/kernel/calls.S 2008-03-27 17:44:42 +0100
++++ linux-2.6.24.4-vs2.3.0.34/arch/arm/kernel/calls.S 2007-12-13 13:25:28
+0100
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -357,20 +345,20 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.22.19/arch/arm/kernel/process.c
linux-2.6.22.19-vs2.3.0.34/arch/arm/kernel/process.c
---- linux-2.6.22.19/arch/arm/kernel/process.c 2007-07-09 13:17:32 +0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/arm/kernel/process.c 2007-08-05
20:53:12 +0200
-@@ -261,7 +261,8 @@ void __show_regs(struct pt_regs *regs)
+diff -NurpP --minimal linux-2.6.24.4/arch/arm/kernel/process.c
linux-2.6.24.4-vs2.3.0.34/arch/arm/kernel/process.c
+--- linux-2.6.24.4/arch/arm/kernel/process.c 2008-03-27 17:44:42 +0100
++++ linux-2.6.24.4-vs2.3.0.34/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();
}
-@@ -423,7 +424,8 @@ pid_t kernel_thread(int (*fn)(void *), v
+@@ -427,7 +428,8 @@ pid_t kernel_thread(int (*fn)(void *), v
regs.ARM_pc = (unsigned long)kernel_thread_helper;
regs.ARM_cpsr = SVC_MODE;
@@ -380,92 +368,37 @@
}
EXPORT_SYMBOL(kernel_thread);
-diff -NurpP --minimal linux-2.6.22.19/arch/arm/kernel/traps.c
linux-2.6.22.19-vs2.3.0.34/arch/arm/kernel/traps.c
---- linux-2.6.22.19/arch/arm/kernel/traps.c 2007-07-09 13:17:32 +0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/arm/kernel/traps.c 2007-08-05 20:53:12
+0200
+diff -NurpP --minimal linux-2.6.24.4/arch/arm/kernel/traps.c
linux-2.6.24.4-vs2.3.0.34/arch/arm/kernel/traps.c
+--- linux-2.6.24.4/arch/arm/kernel/traps.c 2008-03-27 17:44:42 +0100
++++ linux-2.6.24.4-vs2.3.0.34/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.22.19/arch/arm/mm/fault.c
linux-2.6.22.19-vs2.3.0.34/arch/arm/mm/fault.c
---- linux-2.6.22.19/arch/arm/mm/fault.c 2007-07-09 13:17:39 +0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/arm/mm/fault.c 2007-08-05 20:53:12
+0200
-@@ -266,7 +266,8 @@ do_page_fault(unsigned long addr, unsign
+diff -NurpP --minimal linux-2.6.24.4/arch/arm/mm/fault.c
linux-2.6.24.4-vs2.3.0.34/arch/arm/mm/fault.c
+--- linux-2.6.24.4/arch/arm/mm/fault.c 2008-03-27 17:44:44 +0100
++++ linux-2.6.24.4-vs2.3.0.34/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.22.19/arch/arm26/Kconfig
linux-2.6.22.19-vs2.3.0.34/arch/arm26/Kconfig
---- linux-2.6.22.19/arch/arm26/Kconfig 2007-07-09 13:17:40 +0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/arm26/Kconfig 2007-08-05 20:53:12
+0200
-@@ -243,6 +243,8 @@ source "drivers/usb/Kconfig"
-
- source "arch/arm26/Kconfig.debug"
-
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
-
- source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.19/arch/arm26/kernel/calls.S
linux-2.6.22.19-vs2.3.0.34/arch/arm26/kernel/calls.S
---- linux-2.6.22.19/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
-+++ linux-2.6.22.19-vs2.3.0.34/arch/arm26/kernel/calls.S 2007-08-05
20:53:12 +0200
-@@ -257,6 +257,11 @@ __syscall_start:
- .long sys_lremovexattr
- .long sys_fremovexattr
- .long sys_tkill
-+
-+ .rept 313 - (. - __syscall_start) / 4
-+ .long sys_ni_syscall
-+ .endr
-+ .long sys_vserver /* 313 */
- __syscall_end:
-
- .rept NR_syscalls - (__syscall_end - __syscall_start) / 4
-diff -NurpP --minimal linux-2.6.22.19/arch/arm26/kernel/process.c
linux-2.6.22.19-vs2.3.0.34/arch/arm26/kernel/process.c
---- linux-2.6.22.19/arch/arm26/kernel/process.c 2006-09-20 16:57:57
+0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/arm26/kernel/process.c 2007-08-05
20:53:12 +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;
-
-- 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.22.19/arch/arm26/kernel/traps.c
linux-2.6.22.19-vs2.3.0.34/arch/arm26/kernel/traps.c
---- linux-2.6.22.19/arch/arm26/kernel/traps.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/arm26/kernel/traps.c 2007-08-05
20:53:12 +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());
- show_regs(regs);
-- printk("Process %s (pid: %d, stack limit = 0x%p)\n",
-- current->comm, current->pid, end_of_stack(tsk));
-+ printk("Process %s (pid: %d[#%u], stack limit = 0x%p)\n",
-+ current->comm, current->pid,
-+ current->xid, end_of_stack(tsk));
-
- if (!user_mode(regs) || in_interrupt()) {
- __dump_stack(tsk, (unsigned long)(regs + 1));
-diff -NurpP --minimal linux-2.6.22.19/arch/cris/Kconfig
linux-2.6.22.19-vs2.3.0.34/arch/cris/Kconfig
---- linux-2.6.22.19/arch/cris/Kconfig 2007-05-02 19:24:19 +0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/cris/Kconfig 2007-08-05 20:53:12
+0200
-@@ -200,6 +200,8 @@ source "drivers/usb/Kconfig"
+ }
+diff -NurpP --minimal linux-2.6.24.4/arch/cris/Kconfig
linux-2.6.24.4-vs2.3.0.34/arch/cris/Kconfig
+--- linux-2.6.24.4/arch/cris/Kconfig 2008-03-27 17:44:47 +0100
++++ linux-2.6.24.4-vs2.3.0.34/arch/cris/Kconfig 2007-12-13 13:25:26
+0100
+@@ -217,6 +217,8 @@ source "kernel/Kconfig.instrumentation"
source "arch/cris/Kconfig.debug"
@@ -474,9 +407,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.19/arch/cris/arch-v10/kernel/process.c
linux-2.6.22.19-vs2.3.0.34/arch/cris/arch-v10/kernel/process.c
---- linux-2.6.22.19/arch/cris/arch-v10/kernel/process.c 2006-09-20
16:57:57 +0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/cris/arch-v10/kernel/process.c
2007-08-05 20:53:12 +0200
+diff -NurpP --minimal linux-2.6.24.4/arch/cris/arch-v10/kernel/process.c
linux-2.6.24.4-vs2.3.0.34/arch/cris/arch-v10/kernel/process.c
+--- linux-2.6.24.4/arch/cris/arch-v10/kernel/process.c 2008-03-27 17:44:48
+0100
++++ linux-2.6.24.4-vs2.3.0.34/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;
@@ -487,9 +420,9 @@
}
/* setup the child's kernel stack with a pt_regs and switch_stack on it.
-diff -NurpP --minimal linux-2.6.22.19/arch/cris/arch-v32/kernel/process.c
linux-2.6.22.19-vs2.3.0.34/arch/cris/arch-v32/kernel/process.c
---- linux-2.6.22.19/arch/cris/arch-v32/kernel/process.c 2006-09-20
16:57:57 +0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/cris/arch-v32/kernel/process.c
2007-08-05 20:53:12 +0200
+diff -NurpP --minimal linux-2.6.24.4/arch/cris/arch-v32/kernel/process.c
linux-2.6.24.4-vs2.3.0.34/arch/cris/arch-v32/kernel/process.c
+--- linux-2.6.24.4/arch/cris/arch-v32/kernel/process.c 2008-03-27 17:44:48
+0100
++++ linux-2.6.24.4-vs2.3.0.34/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);
@@ -500,9 +433,9 @@
}
/*
-diff -NurpP --minimal linux-2.6.22.19/arch/frv/kernel/kernel_thread.S
linux-2.6.22.19-vs2.3.0.34/arch/frv/kernel/kernel_thread.S
---- linux-2.6.22.19/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20
+0100
-+++ linux-2.6.22.19-vs2.3.0.34/arch/frv/kernel/kernel_thread.S 2007-08-05
20:53:12 +0200
+diff -NurpP --minimal linux-2.6.24.4/arch/frv/kernel/kernel_thread.S
linux-2.6.24.4-vs2.3.0.34/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.24.4/arch/frv/kernel/kernel_thread.S 2005-03-02 12:38:20
+0100
++++ linux-2.6.24.4-vs2.3.0.34/arch/frv/kernel/kernel_thread.S 2007-12-13
13:25:44 +0100
@@ -13,6 +13,8 @@
#include <asm/unistd.h>
@@ -521,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.22.19/arch/h8300/Kconfig
linux-2.6.22.19-vs2.3.0.34/arch/h8300/Kconfig
---- linux-2.6.22.19/arch/h8300/Kconfig 2007-07-09 13:17:41 +0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/h8300/Kconfig 2007-08-05 20:53:12
+0200
-@@ -222,6 +222,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.24.4/arch/h8300/Kconfig
linux-2.6.24.4-vs2.3.0.34/arch/h8300/Kconfig
+--- linux-2.6.24.4/arch/h8300/Kconfig 2008-03-27 17:44:49 +0100
++++ linux-2.6.24.4-vs2.3.0.34/arch/h8300/Kconfig 2007-12-13 13:25:26
+0100
+@@ -227,6 +227,8 @@ source "kernel/Kconfig.instrumentation"
source "arch/h8300/Kconfig.debug"
@@ -533,10 +466,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.19/arch/h8300/kernel/process.c
linux-2.6.22.19-vs2.3.0.34/arch/h8300/kernel/process.c
---- linux-2.6.22.19/arch/h8300/kernel/process.c 2006-09-20 16:57:58
+0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/h8300/kernel/process.c 2007-08-05
20:53:12 +0200
-@@ -134,7 +134,7 @@ int kernel_thread(int (*fn)(void *), voi
+diff -NurpP --minimal linux-2.6.24.4/arch/h8300/kernel/process.c
linux-2.6.24.4-vs2.3.0.34/arch/h8300/kernel/process.c
+--- linux-2.6.24.4/arch/h8300/kernel/process.c 2007-11-29 01:00:10 +0100
++++ linux-2.6.24.4-vs2.3.0.34/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();
set_fs (KERNEL_DS);
@@ -545,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.22.19/arch/i386/Kconfig
linux-2.6.22.19-vs2.3.0.34/arch/i386/Kconfig
---- linux-2.6.22.19/arch/i386/Kconfig 2007-07-09 13:17:41 +0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/i386/Kconfig 2007-08-05 20:53:12
+0200
-@@ -1230,6 +1230,8 @@ endmenu
-
- source "arch/i386/Kconfig.debug"
-
-+source "kernel/vserver/Kconfig"
-+
- source "security/Kconfig"
-
- source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.19/arch/i386/kernel/process.c
linux-2.6.22.19-vs2.3.0.34/arch/i386/kernel/process.c
---- linux-2.6.22.19/arch/i386/kernel/process.c 2007-07-09 13:17:42 +0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/i386/kernel/process.c 2007-08-05
20:53:12 +0200
-@@ -302,8 +302,10 @@ void show_regs(struct pt_regs * regs)
- unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L;
-
- 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))
-@@ -355,7 +357,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.22.19/arch/i386/kernel/syscall_table.S
linux-2.6.22.19-vs2.3.0.34/arch/i386/kernel/syscall_table.S
---- linux-2.6.22.19/arch/i386/kernel/syscall_table.S 2007-07-09 13:17:42
+0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/i386/kernel/syscall_table.S
2007-08-05 20:53:12 +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.22.19/arch/i386/kernel/sysenter.c
linux-2.6.22.19-vs2.3.0.34/arch/i386/kernel/sysenter.c
---- linux-2.6.22.19/arch/i386/kernel/sysenter.c 2008-03-14 20:18:58
+0100
-+++ linux-2.6.22.19-vs2.3.0.34/arch/i386/kernel/sysenter.c 2007-09-05
03:06:10 +0200
-@@ -17,6 +17,7 @@
- #include <linux/elf.h>
- #include <linux/mm.h>
- #include <linux/module.h>
-+#include <linux/vs_memory.h>
-
- #include <asm/cpufeature.h>
- #include <asm/msr.h>
-diff -NurpP --minimal linux-2.6.22.19/arch/i386/kernel/traps.c
linux-2.6.22.19-vs2.3.0.34/arch/i386/kernel/traps.c
---- linux-2.6.22.19/arch/i386/kernel/traps.c 2008-03-14 20:18:58 +0100
-+++ linux-2.6.22.19-vs2.3.0.34/arch/i386/kernel/traps.c 2008-03-14
21:11:29 +0100
-@@ -56,6 +56,8 @@
- #include <asm/stacktrace.h>
-
- #include <linux/module.h>
-+#include <linux/vs_context.h>
-+#include <linux/vserver/history.h>
-
- #include "mach_traps.h"
-
-@@ -303,8 +305,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
-@@ -375,6 +377,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);
-@@ -412,9 +416,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.22.19/arch/i386/mm/fault.c
linux-2.6.22.19-vs2.3.0.34/arch/i386/mm/fault.c
---- linux-2.6.22.19/arch/i386/mm/fault.c 2008-03-14 20:18:58 +0100
-+++ linux-2.6.22.19-vs2.3.0.34/arch/i386/mm/fault.c 2007-09-05 03:06:10
+0200
-@@ -587,7 +587,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.22.19/arch/ia64/Kconfig
linux-2.6.22.19-vs2.3.0.34/arch/ia64/Kconfig
---- linux-2.6.22.19/arch/ia64/Kconfig 2007-07-09 13:17:43 +0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/ia64/Kconfig 2007-08-05 20:53:12
+0200
-@@ -592,6 +592,8 @@ endmenu
+diff -NurpP --minimal linux-2.6.24.4/arch/ia64/Kconfig
linux-2.6.24.4-vs2.3.0.34/arch/ia64/Kconfig
+--- linux-2.6.24.4/arch/ia64/Kconfig 2008-03-27 17:44:54 +0100
++++ linux-2.6.24.4-vs2.3.0.34/arch/ia64/Kconfig 2007-12-13 13:25:26
+0100
+@@ -596,6 +596,8 @@ source "kernel/Kconfig.instrumentation"
source "arch/ia64/Kconfig.debug"
@@ -675,22 +490,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.22.19/arch/ia64/ia32/binfmt_elf32.c
linux-2.6.22.19-vs2.3.0.34/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.22.19/arch/ia64/ia32/binfmt_elf32.c 2007-05-02 19:24:20
+0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/ia64/ia32/binfmt_elf32.c 2007-08-05
20:53:12 +0200
-@@ -233,7 +233,8 @@ ia32_setup_arg_pages (struct linux_binpr
- kmem_cache_free(vm_area_cachep, mpnt);
- return ret;
- }
-- current->mm->stack_vm = current->mm->total_vm = vma_pages(mpnt);
-+ vx_vmpages_sub(current->mm, current->mm->total_vm -
vma_pages(mpnt));
-+ current->mm->stack_vm = current->mm->total_vm;
- }
-
- for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-diff -NurpP --minimal linux-2.6.22.19/arch/ia64/ia32/ia32_entry.S
linux-2.6.22.19-vs2.3.0.34/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.22.19/arch/ia64/ia32/ia32_entry.S 2007-07-09 13:17:43
+0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/ia64/ia32/ia32_entry.S 2007-08-05
20:53:12 +0200
+diff -NurpP --minimal linux-2.6.24.4/arch/ia64/ia32/ia32_entry.S
linux-2.6.24.4-vs2.3.0.34/arch/ia64/ia32/ia32_entry.S
+--- linux-2.6.24.4/arch/ia64/ia32/ia32_entry.S 2007-11-29 01:00:17 +0100
++++ linux-2.6.24.4-vs2.3.0.34/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
@@ -700,9 +502,9 @@
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.22.19/arch/ia64/ia32/sys_ia32.c
linux-2.6.22.19-vs2.3.0.34/arch/ia64/ia32/sys_ia32.c
---- linux-2.6.22.19/arch/ia64/ia32/sys_ia32.c 2007-05-02 19:24:20 +0200
-+++ linux-2.6.22.19-vs2.3.0.34/arch/ia64/ia32/sys_ia32.c 2007-08-05
20:53:12 +0200
+diff -NurpP --minimal linux-2.6.24.4/arch/ia64/ia32/sys_ia32.c
linux-2.6.24.4-vs2.3.0.34/arch/ia64/ia32/sys_ia32.c
+--- linux-2.6.24.4/arch/ia64/ia32/sys_ia32.c 2008-03-27 17:44:54 +0100
++++ linux-2.6.24.4-vs2.3.0.34/arch/ia64/ia32/sys_ia32.c 2007-12-13
13:25:31 +0100
@@ -1182,7 +1182,7 @@ sys32_gettimeofday (struct compat_timeva
{
if (tv) {
@@ -712,10 +514,10 @@
<<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.1.2.17.2.2&r2=1.1.2.17.2.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
