]> git.pld-linux.org Git - packages/kernel.git/blame - kernel-vserver-2.3.patch
projects / packages / kernel.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- new
[packages/kernel.git] / kernel-vserver-2.3.patch
CommitLineData
3914fd55
AM		 1diff -NurpP --minimal linux-2.6.30.2/arch/alpha/Kconfig linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/alpha/Kconfig
2--- linux-2.6.30.2/arch/alpha/Kconfig 2009-03-24 14:18:07.000000000 +0100
3+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/alpha/Kconfig 2009-07-04 01:11:38.000000000 +0200
2380c486
JR		 4@@ -666,6 +666,8 @@ config DUMMY_CONSOLE
5 depends on VGA_HOSE
6 default y
d337f35e
JR		 7
8+source "kernel/vserver/Kconfig"
9+
10 source "security/Kconfig"
11
12 source "crypto/Kconfig"
3914fd55
AM		 13diff -NurpP --minimal linux-2.6.30.2/arch/alpha/kernel/entry.S linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/alpha/kernel/entry.S
14--- linux-2.6.30.2/arch/alpha/kernel/entry.S 2009-06-11 17:11:46.000000000 +0200
15+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/alpha/kernel/entry.S 2009-07-04 01:11:38.000000000 +0200
2380c486 16@@ -874,24 +874,15 @@ sys_getxgid:
d337f35e
JR		 17 .globl sys_getxpid
18 .ent sys_getxpid
19 sys_getxpid:
20+ lda $sp, -16($sp)
21+ stq $26, 0($sp)
22 .prologue 0
23- ldq $2, TI_TASK($8)
24
25- /* See linux/kernel/timer.c sys_getppid for discussion
26- about this loop. */
27- ldq $3, TASK_GROUP_LEADER($2)
28- ldq $4, TASK_REAL_PARENT($3)
29- ldl $0, TASK_TGID($2)
30-1: ldl $1, TASK_TGID($4)
31-#ifdef CONFIG_SMP
32- mov $4, $5
33- mb
34- ldq $3, TASK_GROUP_LEADER($2)
35- ldq $4, TASK_REAL_PARENT($3)
36- cmpeq $4, $5, $5
37- beq $5, 1b
38-#endif
39- stq $1, 80($sp)
40+ lda $16, 96($sp)
41+ jsr $26, do_getxpid
42+ ldq $26, 0($sp)
43+
44+ lda $sp, 16($sp)
45 ret
46 .end sys_getxpid
47
3914fd55
AM		 48diff -NurpP --minimal linux-2.6.30.2/arch/alpha/kernel/osf_sys.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/alpha/kernel/osf_sys.c
49--- linux-2.6.30.2/arch/alpha/kernel/osf_sys.c 2009-06-11 17:11:46.000000000 +0200
50+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/alpha/kernel/osf_sys.c 2009-07-04 01:11:38.000000000 +0200
9474138d 51@@ -875,7 +875,7 @@ SYSCALL_DEFINE2(osf_gettimeofday, struct
d337f35e
JR		 52 {
53 if (tv) {
54 struct timeval ktv;
55- do_gettimeofday(&ktv);
56+ vx_gettimeofday(&ktv);
57 if (put_tv32(tv, &ktv))
58 return -EFAULT;
59 }
3914fd55
AM		 60diff -NurpP --minimal linux-2.6.30.2/arch/alpha/kernel/ptrace.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/alpha/kernel/ptrace.c
61--- linux-2.6.30.2/arch/alpha/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
62+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/alpha/kernel/ptrace.c 2009-07-04 01:11:38.000000000 +0200
d337f35e
JR		 63@@ -15,6 +15,7 @@
64 #include <linux/slab.h>
65 #include <linux/security.h>
66 #include <linux/signal.h>
67+#include <linux/vs_base.h>
68
69 #include <asm/uaccess.h>
70 #include <asm/pgtable.h>
3914fd55
AM		 71diff -NurpP --minimal linux-2.6.30.2/arch/alpha/kernel/systbls.S linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/alpha/kernel/systbls.S
72--- linux-2.6.30.2/arch/alpha/kernel/systbls.S 2009-03-24 14:18:08.000000000 +0100
73+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/alpha/kernel/systbls.S 2009-07-04 01:11:38.000000000 +0200
d337f35e
JR		 74@@ -446,7 +446,7 @@ sys_call_table:
75 .quad sys_stat64 /* 425 */
76 .quad sys_lstat64
77 .quad sys_fstat64
78- .quad sys_ni_syscall /* sys_vserver */
79+ .quad sys_vserver /* sys_vserver */
80 .quad sys_ni_syscall /* sys_mbind */
81 .quad sys_ni_syscall /* sys_get_mempolicy */
82 .quad sys_ni_syscall /* sys_set_mempolicy */
3914fd55
AM		 83diff -NurpP --minimal linux-2.6.30.2/arch/alpha/kernel/traps.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/alpha/kernel/traps.c
84--- linux-2.6.30.2/arch/alpha/kernel/traps.c 2009-06-11 17:11:46.000000000 +0200
85+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/alpha/kernel/traps.c 2009-07-04 01:11:38.000000000 +0200
2380c486 86@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
d337f35e
JR		 87 #ifdef CONFIG_SMP
88 printk("CPU %d ", hard_smp_processor_id());
89 #endif
2380c486 90- printk("%s(%d): %s %ld\n", current->comm, task_pid_nr(current), str, err);
d337f35e 91+ printk("%s(%d[#%u]): %s %ld\n", current->comm,
2380c486 92+ task_pid_nr(current), current->xid, str, err);
d337f35e 93 dik_show_regs(regs, r9_15);
2380c486 94 add_taint(TAINT_DIE);
d337f35e 95 dik_show_trace((unsigned long *)(regs+1));
3914fd55
AM		 96diff -NurpP --minimal linux-2.6.30.2/arch/alpha/mm/fault.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/alpha/mm/fault.c
97--- linux-2.6.30.2/arch/alpha/mm/fault.c 2008-12-25 00:26:37.000000000 +0100
98+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/alpha/mm/fault.c 2009-07-04 01:11:38.000000000 +0200
2380c486
JR		 99@@ -193,8 +193,8 @@ do_page_fault(unsigned long address, uns
100 down_read(&mm->mmap_sem);
101 goto survive;
102 }
103- printk(KERN_ALERT "VM: killing process %s(%d)\n",
104- current->comm, task_pid_nr(current));
105+ printk(KERN_ALERT "VM: killing process %s(%d:#%u)\n",
106+ current->comm, task_pid_nr(current), current->xid);
107 if (!user_mode(regs))
108 goto no_context;
109 do_group_exit(SIGKILL);
3914fd55
AM		 110diff -NurpP --minimal linux-2.6.30.2/arch/arm/Kconfig linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/arm/Kconfig
111--- linux-2.6.30.2/arch/arm/Kconfig 2009-06-11 17:11:46.000000000 +0200
112+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/arm/Kconfig 2009-07-04 01:11:38.000000000 +0200
9474138d 113@@ -1429,6 +1429,8 @@ source "fs/Kconfig"
d337f35e
JR		 114
115 source "arch/arm/Kconfig.debug"
116
117+source "kernel/vserver/Kconfig"
118+
119 source "security/Kconfig"
120
121 source "crypto/Kconfig"
3914fd55
AM		 122diff -NurpP --minimal linux-2.6.30.2/arch/arm/kernel/calls.S linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/arm/kernel/calls.S
123--- linux-2.6.30.2/arch/arm/kernel/calls.S 2009-06-11 17:11:48.000000000 +0200
124+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/arm/kernel/calls.S 2009-07-04 01:11:38.000000000 +0200
d337f35e
JR		 125@@ -322,7 +322,7 @@
126 /* 310 */ CALL(sys_request_key)
127 CALL(sys_keyctl)
128 CALL(ABI(sys_semtimedop, sys_oabi_semtimedop))
129-/* vserver */ CALL(sys_ni_syscall)
130+ CALL(sys_vserver)
131 CALL(sys_ioprio_set)
132 /* 315 */ CALL(sys_ioprio_get)
133 CALL(sys_inotify_init)
3914fd55
AM		 134diff -NurpP --minimal linux-2.6.30.2/arch/arm/kernel/process.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/arm/kernel/process.c
135--- linux-2.6.30.2/arch/arm/kernel/process.c 2009-06-11 17:11:49.000000000 +0200
136+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/arm/kernel/process.c 2009-07-04 01:11:38.000000000 +0200
9474138d 137@@ -263,7 +263,8 @@ void __show_regs(struct pt_regs *regs)
d337f35e
JR		 138 void show_regs(struct pt_regs * regs)
139 {
140 printk("\n");
2380c486 141- printk("Pid: %d, comm: %20s\n", task_pid_nr(current), current->comm);
d337f35e 142+ printk("Pid: %d[#%u], comm: %20s\n",
2380c486 143+ task_pid_nr(current), current->xid, current->comm);
d337f35e
JR		 144 __show_regs(regs);
145 __backtrace();
146 }
3914fd55
AM		 147diff -NurpP --minimal linux-2.6.30.2/arch/arm/kernel/traps.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/arm/kernel/traps.c
148--- linux-2.6.30.2/arch/arm/kernel/traps.c 2009-06-11 17:11:49.000000000 +0200
149+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/arm/kernel/traps.c 2009-07-04 01:11:38.000000000 +0200
9474138d 150@@ -228,8 +228,8 @@ static void __die(const char *str, int e
2380c486 151 str, err, ++die_counter);
d337f35e
JR		 152 print_modules();
153 __show_regs(regs);
154- printk("Process %s (pid: %d, stack limit = 0x%p)\n",
2380c486 155- tsk->comm, task_pid_nr(tsk), thread + 1);
d337f35e 156+ printk("Process %s (pid: %d:#%u, stack limit = 0x%p)\n",
2380c486 157+ tsk->comm, task_pid_nr(tsk), tsk->xid, thread + 1);
d337f35e
JR		 158
159 if (!user_mode(regs) || in_interrupt()) {
160 dump_mem("Stack: ", regs->ARM_sp,
3914fd55
AM		 161diff -NurpP --minimal linux-2.6.30.2/arch/arm/mm/fault.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/arm/mm/fault.c
162--- linux-2.6.30.2/arch/arm/mm/fault.c 2009-03-24 14:18:17.000000000 +0100
163+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/arm/mm/fault.c 2009-07-04 01:11:38.000000000 +0200
2380c486
JR		 164@@ -294,7 +294,8 @@ do_page_fault(unsigned long addr, unsign
165 * happened to us that made us unable to handle
166 * the page fault gracefully.
167 */
168- printk("VM: killing process %s\n", tsk->comm);
169+ printk("VM: killing process %s(%d:#%u)\n",
170+ tsk->comm, task_pid_nr(tsk), tsk->xid);
171 do_group_exit(SIGKILL);
172 return 0;
173 }
3914fd55
AM		 174diff -NurpP --minimal linux-2.6.30.2/arch/cris/Kconfig linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/cris/Kconfig
175--- linux-2.6.30.2/arch/cris/Kconfig 2009-06-11 17:11:56.000000000 +0200
176+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/cris/Kconfig 2009-07-04 01:11:38.000000000 +0200
2380c486 177@@ -685,6 +685,8 @@ source "drivers/staging/Kconfig"
d337f35e
JR		 178
179 source "arch/cris/Kconfig.debug"
180
181+source "kernel/vserver/Kconfig"
182+
183 source "security/Kconfig"
184
185 source "crypto/Kconfig"
3914fd55
AM		 186diff -NurpP --minimal linux-2.6.30.2/arch/frv/kernel/kernel_thread.S linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/frv/kernel/kernel_thread.S
187--- linux-2.6.30.2/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
188+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/frv/kernel/kernel_thread.S 2009-07-04 01:11:38.000000000 +0200
2380c486 189@@ -37,7 +37,7 @@ kernel_thread:
d337f35e
JR		 190
191 # start by forking the current process, but with shared VM
192 setlos.p #__NR_clone,gr7 ; syscall number
193- ori gr10,#CLONE_VM,gr8 ; first syscall arg [clone_flags]
194+ ori gr10,#CLONE_KT,gr8 ; first syscall arg [clone_flags]
195 sethi.p #0xe4e4,gr9 ; second syscall arg [newsp]
196 setlo #0xe4e4,gr9
197 setlos.p #0,gr10 ; third syscall arg [parent_tidptr]
3914fd55
AM		 198diff -NurpP --minimal linux-2.6.30.2/arch/h8300/Kconfig linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/h8300/Kconfig
199--- linux-2.6.30.2/arch/h8300/Kconfig 2009-03-24 14:18:24.000000000 +0100
200+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/h8300/Kconfig 2009-07-04 01:11:38.000000000 +0200
2380c486 201@@ -226,6 +226,8 @@ source "fs/Kconfig"
d337f35e
JR		 202
203 source "arch/h8300/Kconfig.debug"
204
205+source "kernel/vserver/Kconfig"
206+
207 source "security/Kconfig"
208
209 source "crypto/Kconfig"
3914fd55
AM		 210diff -NurpP --minimal linux-2.6.30.2/arch/ia64/ia32/ia32_entry.S linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/ia64/ia32/ia32_entry.S
211--- linux-2.6.30.2/arch/ia64/ia32/ia32_entry.S 2009-06-11 17:11:57.000000000 +0200
212+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/ia64/ia32/ia32_entry.S 2009-07-04 01:11:38.000000000 +0200
2380c486
JR		 213@@ -451,7 +451,7 @@ ia32_syscall_table:
214 data8 sys_tgkill /* 270 */
215 data8 compat_sys_utimes
216 data8 sys32_fadvise64_64
217- data8 sys_ni_syscall
218+ data8 sys32_vserver
219 data8 sys_ni_syscall
220 data8 sys_ni_syscall /* 275 */
221 data8 sys_ni_syscall
3914fd55
AM		 222diff -NurpP --minimal linux-2.6.30.2/arch/ia64/Kconfig linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/ia64/Kconfig
223--- linux-2.6.30.2/arch/ia64/Kconfig 2009-06-11 17:11:57.000000000 +0200
224+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/ia64/Kconfig 2009-07-04 01:11:38.000000000 +0200
9474138d 225@@ -675,6 +675,8 @@ source "fs/Kconfig"
2380c486
JR		 226
227 source "arch/ia64/Kconfig.debug"
d337f35e
JR		 228
229+source "kernel/vserver/Kconfig"
230+
231 source "security/Kconfig"
232
233 source "crypto/Kconfig"
3914fd55
AM		 234diff -NurpP --minimal linux-2.6.30.2/arch/ia64/kernel/entry.S linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/ia64/kernel/entry.S
235--- linux-2.6.30.2/arch/ia64/kernel/entry.S 2009-06-11 17:11:57.000000000 +0200
236+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/ia64/kernel/entry.S 2009-07-04 01:11:38.000000000 +0200
9474138d 237@@ -1753,7 +1753,7 @@ sys_call_table:
2380c486
JR		 238 data8 sys_mq_notify
239 data8 sys_mq_getsetattr
240 data8 sys_kexec_load
241- data8 sys_ni_syscall // reserved for vserver
242+ data8 sys_vserver
243 data8 sys_waitid // 1270
244 data8 sys_add_key
245 data8 sys_request_key
3914fd55
AM		 246diff -NurpP --minimal linux-2.6.30.2/arch/ia64/kernel/perfmon.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/ia64/kernel/perfmon.c
247--- linux-2.6.30.2/arch/ia64/kernel/perfmon.c 2009-06-11 17:11:57.000000000 +0200
248+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/ia64/kernel/perfmon.c 2009-07-04 01:11:38.000000000 +0200
2380c486
JR		 249@@ -41,6 +41,7 @@
250 #include <linux/rcupdate.h>
251 #include <linux/completion.h>
252 #include <linux/tracehook.h>
253+#include <linux/vs_memory.h>
d337f35e 254
2380c486
JR		 255 #include <asm/errno.h>
256 #include <asm/intrinsics.h>
257@@ -2372,7 +2373,7 @@ pfm_smpl_buffer_alloc(struct task_struct
258 */
259 insert_vm_struct(mm, vma);
d337f35e 260
2380c486
JR		 261- mm->total_vm += size >> PAGE_SHIFT;
262+ vx_vmpages_add(mm, size >> PAGE_SHIFT);
263 vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file,
264 vma_pages(vma));
265 up_write(&task->mm->mmap_sem);
3914fd55
AM		 266diff -NurpP --minimal linux-2.6.30.2/arch/ia64/kernel/process.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/ia64/kernel/process.c
267--- linux-2.6.30.2/arch/ia64/kernel/process.c 2009-06-11 17:11:57.000000000 +0200
268+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/ia64/kernel/process.c 2009-07-04 01:11:38.000000000 +0200
2380c486
JR		 269@@ -110,8 +110,8 @@ show_regs (struct pt_regs *regs)
270 unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
d337f35e 271
2380c486
JR		 272 print_modules();
273- printk("\nPid: %d, CPU %d, comm: %20s\n", task_pid_nr(current),
274- smp_processor_id(), current->comm);
275+ printk("\nPid: %d[#%u], CPU %d, comm: %20s\n", task_pid_nr(current),
276+ current->xid, smp_processor_id(), current->comm);
277 printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n",
278 regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
279 init_utsname()->release);
3914fd55
AM		 280diff -NurpP --minimal linux-2.6.30.2/arch/ia64/kernel/ptrace.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/ia64/kernel/ptrace.c
281--- linux-2.6.30.2/arch/ia64/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
282+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/ia64/kernel/ptrace.c 2009-07-04 01:11:38.000000000 +0200
2380c486
JR		 283@@ -23,6 +23,7 @@
284 #include <linux/regset.h>
d337f35e 285 #include <linux/elf.h>
2380c486 286 #include <linux/tracehook.h>
d337f35e
JR		 287+#include <linux/vs_base.h>
288
289 #include <asm/pgtable.h>
290 #include <asm/processor.h>
3914fd55
AM		 291diff -NurpP --minimal linux-2.6.30.2/arch/ia64/kernel/traps.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/ia64/kernel/traps.c
292--- linux-2.6.30.2/arch/ia64/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
293+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/ia64/kernel/traps.c 2009-07-04 01:11:38.000000000 +0200
2380c486 294@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
d337f35e
JR		 295 put_cpu();
296
297 if (++die.lock_owner_depth < 3) {
298- printk("%s[%d]: %s %ld [%d]\n",
2380c486 299- current->comm, task_pid_nr(current), str, err, ++die_counter);
d337f35e 300+ printk("%s[%d[#%u]]: %s %ld [%d]\n",
2380c486 301+ current->comm, task_pid_nr(current), current->xid,
d337f35e 302+ str, err, ++die_counter);
2380c486
JR		 303 if (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV)
304 != NOTIFY_STOP)
305 show_regs(regs);
306@@ -324,8 +325,9 @@ handle_fpu_swa (int fp_fault, struct pt_
307 if ((last.count & 15) < 5 && (ia64_fetchadd(1, &last.count, acq) & 15) < 5) {
308 last.time = current_jiffies + 5 * HZ;
309 printk(KERN_WARNING
310- "%s(%d): floating-point assist fault at ip %016lx, isr %016lx\n",
311- current->comm, task_pid_nr(current), regs->cr_iip + ia64_psr(regs)->ri, isr);
312+ "%s(%d[#%u]): floating-point assist fault at ip %016lx, isr %016lx\n",
313+ current->comm, task_pid_nr(current), current->xid,
314+ regs->cr_iip + ia64_psr(regs)->ri, isr);
315 }
316 }
d337f35e 317 }
3914fd55
AM		 318diff -NurpP --minimal linux-2.6.30.2/arch/ia64/mm/fault.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/ia64/mm/fault.c
319--- linux-2.6.30.2/arch/ia64/mm/fault.c 2008-12-25 00:26:37.000000000 +0100
320+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/ia64/mm/fault.c 2009-07-04 01:11:38.000000000 +0200
d337f35e 321@@ -10,6 +10,7 @@
d337f35e
JR		 322 #include <linux/interrupt.h>
323 #include <linux/kprobes.h>
2380c486 324 #include <linux/kdebug.h>
d337f35e
JR		 325+#include <linux/vs_memory.h>
326
327 #include <asm/pgtable.h>
328 #include <asm/processor.h>
3914fd55
AM		 329diff -NurpP --minimal linux-2.6.30.2/arch/m32r/kernel/traps.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/m32r/kernel/traps.c
330--- linux-2.6.30.2/arch/m32r/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
331+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/m32r/kernel/traps.c 2009-07-04 01:11:38.000000000 +0200
2380c486 332@@ -196,8 +196,9 @@ static void show_registers(struct pt_reg
d337f35e
JR		 333 } else {
334 printk("SPI: %08lx\n", sp);
335 }
336- printk("Process %s (pid: %d, process nr: %d, stackpage=%08lx)",
2380c486 337- current->comm, task_pid_nr(current), 0xffff & i, 4096+(unsigned long)current);
d337f35e 338+ printk("Process %s (pid: %d[#%u], process nr: %d, stackpage=%08lx)",
2380c486 339+ current->comm, task_pid_nr(current), current->xid,
d337f35e
JR		 340+ 0xffff & i, 4096+(unsigned long)current);
341
342 /*
343 * When in-kernel, we also print out the stack and code at the
3914fd55
AM		 344diff -NurpP --minimal linux-2.6.30.2/arch/m68k/Kconfig linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/m68k/Kconfig
345--- linux-2.6.30.2/arch/m68k/Kconfig 2009-03-24 14:18:26.000000000 +0100
346+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/m68k/Kconfig 2009-07-04 01:11:38.000000000 +0200
2380c486 347@@ -616,6 +616,8 @@ source "fs/Kconfig"
d337f35e
JR		 348
349 source "arch/m68k/Kconfig.debug"
350
351+source "kernel/vserver/Kconfig"
352+
353 source "security/Kconfig"
354
355 source "crypto/Kconfig"
3914fd55
AM		 356diff -NurpP --minimal linux-2.6.30.2/arch/m68k/kernel/ptrace.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/m68k/kernel/ptrace.c
357--- linux-2.6.30.2/arch/m68k/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
358+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/m68k/kernel/ptrace.c 2009-07-04 01:11:38.000000000 +0200
2380c486 359@@ -18,6 +18,7 @@
d337f35e
JR		 360 #include <linux/ptrace.h>
361 #include <linux/user.h>
362 #include <linux/signal.h>
363+#include <linux/vs_base.h>
364
365 #include <asm/uaccess.h>
366 #include <asm/page.h>
2380c486 367@@ -269,6 +270,8 @@ long arch_ptrace(struct task_struct *chi
d337f35e
JR		 368 ret = ptrace_request(child, request, addr, data);
369 break;
370 }
2380c486 371+ if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT))
d337f35e
JR		 372+ goto out_tsk;
373
374 return ret;
375 out_eio:
3914fd55
AM		 376diff -NurpP --minimal linux-2.6.30.2/arch/m68k/kernel/traps.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/m68k/kernel/traps.c
377--- linux-2.6.30.2/arch/m68k/kernel/traps.c 2009-03-24 14:18:26.000000000 +0100
378+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/m68k/kernel/traps.c 2009-07-04 01:11:38.000000000 +0200
2380c486 379@@ -906,8 +906,8 @@ void show_registers(struct pt_regs *regs
d337f35e
JR		 380 printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
381 regs->d4, regs->d5, regs->a0, regs->a1);
382
383- printk("Process %s (pid: %d, task=%p)\n",
2380c486 384- current->comm, task_pid_nr(current), current);
d337f35e 385+ printk("Process %s (pid: %d[#%u], task=%p)\n",
2380c486 386+ current->comm, task_pid_nr(current), current->xid, current);
d337f35e
JR		 387 addr = (unsigned long)&fp->un;
388 printk("Frame format=%X ", regs->format);
389 switch (regs->format) {
3914fd55
AM		 390diff -NurpP --minimal linux-2.6.30.2/arch/m68knommu/Kconfig linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/m68knommu/Kconfig
391--- linux-2.6.30.2/arch/m68knommu/Kconfig 2009-06-11 17:11:59.000000000 +0200
392+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/m68knommu/Kconfig 2009-07-04 01:11:38.000000000 +0200
9474138d 393@@ -721,6 +721,8 @@ source "fs/Kconfig"
d337f35e
JR		 394
395 source "arch/m68knommu/Kconfig.debug"
396
397+source "kernel/vserver/Kconfig"
398+
399 source "security/Kconfig"
400
401 source "crypto/Kconfig"
3914fd55
AM		 402diff -NurpP --minimal linux-2.6.30.2/arch/m68knommu/kernel/traps.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/m68knommu/kernel/traps.c
403--- linux-2.6.30.2/arch/m68knommu/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
404+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/m68knommu/kernel/traps.c 2009-07-04 01:11:38.000000000 +0200
2380c486 405@@ -78,8 +78,9 @@ void die_if_kernel(char *str, struct pt_
d337f35e
JR		 406 printk(KERN_EMERG "d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
407 fp->d4, fp->d5, fp->a0, fp->a1);
408
409- printk(KERN_EMERG "Process %s (pid: %d, stackpage=%08lx)\n",
410- current->comm, current->pid, PAGE_SIZE+(unsigned long)current);
411+ printk(KERN_EMERG "Process %s (pid: %d[#%u], stackpage=%08lx)\n",
2380c486 412+ current->comm, task_pid_nr(current), current->xid,
d337f35e 413+ PAGE_SIZE+(unsigned long)current);
2380c486
JR		 414 show_stack(NULL, (unsigned long *)(fp + 1));
415 add_taint(TAINT_DIE);
d337f35e 416 do_exit(SIGSEGV);
3914fd55
AM		 417diff -NurpP --minimal linux-2.6.30.2/arch/mips/Kconfig linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/mips/Kconfig
418--- linux-2.6.30.2/arch/mips/Kconfig 2009-06-11 17:12:00.000000000 +0200
419+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/mips/Kconfig 2009-07-04 01:11:38.000000000 +0200
9474138d 420@@ -2137,6 +2137,8 @@ source "fs/Kconfig"
d337f35e
JR		 421
422 source "arch/mips/Kconfig.debug"
423
424+source "kernel/vserver/Kconfig"
425+
426 source "security/Kconfig"
427
428 source "crypto/Kconfig"
3914fd55
AM		 429diff -NurpP --minimal linux-2.6.30.2/arch/mips/kernel/ptrace.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/mips/kernel/ptrace.c
430--- linux-2.6.30.2/arch/mips/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
431+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/mips/kernel/ptrace.c 2009-07-04 01:11:38.000000000 +0200
2380c486 432@@ -25,6 +25,7 @@
d337f35e 433 #include <linux/security.h>
2380c486
JR		 434 #include <linux/audit.h>
435 #include <linux/seccomp.h>
d337f35e
JR		 436+#include <linux/vs_base.h>
437
438 #include <asm/byteorder.h>
439 #include <asm/cpu.h>
2380c486 440@@ -259,6 +260,9 @@ long arch_ptrace(struct task_struct *chi
d337f35e
JR		 441 {
442 int ret;
443
2380c486 444+ if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT))
d337f35e
JR		 445+ goto out;
446+
447 switch (request) {
448 /* when I and D space are separate, these will need to be fixed. */
449 case PTRACE_PEEKTEXT: /* read word at location addr. */
3914fd55
AM		 450diff -NurpP --minimal linux-2.6.30.2/arch/mips/kernel/scall32-o32.S linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/mips/kernel/scall32-o32.S
451--- linux-2.6.30.2/arch/mips/kernel/scall32-o32.S 2009-06-11 17:12:01.000000000 +0200
452+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/mips/kernel/scall32-o32.S 2009-07-04 01:11:38.000000000 +0200
2380c486 453@@ -597,7 +597,7 @@ einval: li v0, -ENOSYS
d337f35e
JR		 454 sys sys_mq_timedreceive 5
455 sys sys_mq_notify 2 /* 4275 */
456 sys sys_mq_getsetattr 3
457- sys sys_ni_syscall 0 /* sys_vserver */
458+ sys sys_vserver 3
459 sys sys_waitid 5
460 sys sys_ni_syscall 0 /* available, was setaltroot */
461 sys sys_add_key 5 /* 4280 */
3914fd55
AM		 462diff -NurpP --minimal linux-2.6.30.2/arch/mips/kernel/scall64-64.S linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/mips/kernel/scall64-64.S
463--- linux-2.6.30.2/arch/mips/kernel/scall64-64.S 2009-06-11 17:12:01.000000000 +0200
464+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/mips/kernel/scall64-64.S 2009-07-04 01:11:38.000000000 +0200
d337f35e
JR		 465@@ -434,7 +434,7 @@ sys_call_table:
466 PTR sys_mq_timedreceive
467 PTR sys_mq_notify
468 PTR sys_mq_getsetattr /* 5235 */
469- PTR sys_ni_syscall /* sys_vserver */
470+ PTR sys_vserver
471 PTR sys_waitid
472 PTR sys_ni_syscall /* available, was setaltroot */
473 PTR sys_add_key
3914fd55
AM		 474diff -NurpP --minimal linux-2.6.30.2/arch/mips/kernel/scall64-n32.S linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/mips/kernel/scall64-n32.S
475--- linux-2.6.30.2/arch/mips/kernel/scall64-n32.S 2009-06-11 17:12:01.000000000 +0200
476+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/mips/kernel/scall64-n32.S 2009-07-04 01:11:38.000000000 +0200
d337f35e
JR		 477@@ -360,7 +360,7 @@ EXPORT(sysn32_call_table)
478 PTR compat_sys_mq_timedreceive
479 PTR compat_sys_mq_notify
480 PTR compat_sys_mq_getsetattr
481- PTR sys_ni_syscall /* 6240, sys_vserver */
482+ PTR sys32_vserver /* 6240 */
2380c486 483 PTR compat_sys_waitid
d337f35e
JR		 484 PTR sys_ni_syscall /* available, was setaltroot */
485 PTR sys_add_key
3914fd55
AM		 486diff -NurpP --minimal linux-2.6.30.2/arch/mips/kernel/scall64-o32.S linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/mips/kernel/scall64-o32.S
487--- linux-2.6.30.2/arch/mips/kernel/scall64-o32.S 2009-06-11 17:12:01.000000000 +0200
488+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/mips/kernel/scall64-o32.S 2009-07-04 01:11:38.000000000 +0200
2380c486 489@@ -480,7 +480,7 @@ sys_call_table:
d337f35e
JR		 490 PTR compat_sys_mq_timedreceive
491 PTR compat_sys_mq_notify /* 4275 */
492 PTR compat_sys_mq_getsetattr
493- PTR sys_ni_syscall /* sys_vserver */
494+ PTR sys32_vserver
2380c486 495 PTR sys_32_waitid
d337f35e
JR		 496 PTR sys_ni_syscall /* available, was setaltroot */
497 PTR sys_add_key /* 4280 */
3914fd55
AM		 498diff -NurpP --minimal linux-2.6.30.2/arch/mips/kernel/traps.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/mips/kernel/traps.c
499--- linux-2.6.30.2/arch/mips/kernel/traps.c 2009-06-11 17:12:01.000000000 +0200
500+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/mips/kernel/traps.c 2009-07-04 01:11:38.000000000 +0200
2380c486
JR		 501@@ -335,9 +335,10 @@ void show_registers(const struct pt_regs
502
503 __show_regs(regs);
d337f35e 504 print_modules();
2380c486
JR		 505- printk("Process %s (pid: %d, threadinfo=%p, task=%p, tls=%0*lx)\n",
506- current->comm, current->pid, current_thread_info(), current,
507- field, current_thread_info()->tp_value);
508+ printk("Process %s (pid: %d:#%u, threadinfo=%p, task=%p, tls=%0*lx)\n",
509+ current->comm, task_pid_nr(current), current->xid,
510+ current_thread_info(), current,
511+ field, current_thread_info()->tp_value);
512 if (cpu_has_userlocal) {
513 unsigned long tls;
514
3914fd55
AM		 515diff -NurpP --minimal linux-2.6.30.2/arch/parisc/Kconfig linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/parisc/Kconfig
516--- linux-2.6.30.2/arch/parisc/Kconfig 2009-06-11 17:12:02.000000000 +0200
517+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/parisc/Kconfig 2009-07-04 01:11:38.000000000 +0200
9474138d 518@@ -291,6 +291,8 @@ source "fs/Kconfig"
d337f35e
JR		 519
520 source "arch/parisc/Kconfig.debug"
521
522+source "kernel/vserver/Kconfig"
523+
524 source "security/Kconfig"
525
526 source "crypto/Kconfig"
3914fd55
AM		 527diff -NurpP --minimal linux-2.6.30.2/arch/parisc/kernel/syscall_table.S linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/parisc/kernel/syscall_table.S
528--- linux-2.6.30.2/arch/parisc/kernel/syscall_table.S 2009-06-11 17:12:03.000000000 +0200
529+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/parisc/kernel/syscall_table.S 2009-07-04 01:11:38.000000000 +0200
2380c486 530@@ -361,7 +361,7 @@
d337f35e
JR		 531 ENTRY_COMP(mbind) /* 260 */
532 ENTRY_COMP(get_mempolicy)
533 ENTRY_COMP(set_mempolicy)
534- ENTRY_SAME(ni_syscall) /* 263: reserved for vserver */
535+ ENTRY_DIFF(vserver)
536 ENTRY_SAME(add_key)
537 ENTRY_SAME(request_key) /* 265 */
538 ENTRY_SAME(keyctl)
3914fd55
AM		 539diff -NurpP --minimal linux-2.6.30.2/arch/parisc/kernel/traps.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/parisc/kernel/traps.c
540--- linux-2.6.30.2/arch/parisc/kernel/traps.c 2009-06-11 17:12:03.000000000 +0200
541+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/parisc/kernel/traps.c 2009-07-04 01:11:38.000000000 +0200
2380c486 542@@ -236,8 +236,9 @@ void die_if_kernel(char *str, struct pt_
d337f35e
JR		 543 if (err == 0)
544 return; /* STFU */
545
546- printk(KERN_CRIT "%s (pid %d): %s (code %ld) at " RFMT "\n",
2380c486 547- current->comm, task_pid_nr(current), str, err, regs->iaoq[0]);
d337f35e 548+ printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld) at " RFMT "\n",
2380c486 549+ current->comm, task_pid_nr(current), current->xid,
d337f35e
JR		 550+ str, err, regs->iaoq[0]);
551 #ifdef PRINT_USER_FAULTS
552 /* XXX for debugging only */
553 show_regs(regs);
9474138d 554@@ -271,8 +272,8 @@ KERN_CRIT " || |
d337f35e
JR		 555 pdc_console_restart();
556
2380c486
JR		 557 if (err)
558- printk(KERN_CRIT "%s (pid %d): %s (code %ld)\n",
559- current->comm, task_pid_nr(current), str, err);
560+ printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld)\n",
561+ current->comm, task_pid_nr(current), current->xid, str, err);
562
563 /* Wot's wrong wif bein' racy? */
564 if (current->thread.flags & PARISC_KERNEL_DEATH) {
3914fd55
AM		 565diff -NurpP --minimal linux-2.6.30.2/arch/parisc/mm/fault.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/parisc/mm/fault.c
566--- linux-2.6.30.2/arch/parisc/mm/fault.c 2009-03-24 14:18:33.000000000 +0100
567+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/parisc/mm/fault.c 2009-07-04 01:11:38.000000000 +0200
2380c486 568@@ -238,8 +238,9 @@ bad_area:
d337f35e
JR		 569
570 #ifdef PRINT_USER_FAULTS
571 printk(KERN_DEBUG "\n");
572- printk(KERN_DEBUG "do_page_fault() pid=%d command='%s' type=%lu address=0x%08lx\n",
2380c486 573- task_pid_nr(tsk), tsk->comm, code, address);
d337f35e
JR		 574+ printk(KERN_DEBUG "do_page_fault() pid=%d:#%u "
575+ "command='%s' type=%lu address=0x%08lx\n",
2380c486 576+ task_pid_nr(tsk), tsk->xid, tsk->comm, code, address);
d337f35e
JR		 577 if (vma) {
578 printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n",
579 vma->vm_start, vma->vm_end);
2380c486
JR		 580@@ -265,7 +266,8 @@ no_context:
581
582 out_of_memory:
583 up_read(&mm->mmap_sem);
584- printk(KERN_CRIT "VM: killing process %s\n", current->comm);
585+ printk(KERN_CRIT "VM: killing process %s(%d:#%u)\n",
586+ current->comm, current->pid, current->xid);
587 if (user_mode(regs))
588 do_group_exit(SIGKILL);
589 goto no_context;
3914fd55
AM		 590diff -NurpP --minimal linux-2.6.30.2/arch/powerpc/Kconfig linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/powerpc/Kconfig
591--- linux-2.6.30.2/arch/powerpc/Kconfig 2009-06-11 17:12:03.000000000 +0200
592+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/powerpc/Kconfig 2009-07-04 01:11:38.000000000 +0200
9474138d 593@@ -922,6 +922,8 @@ source "lib/Kconfig"
d337f35e
JR		 594
595 source "arch/powerpc/Kconfig.debug"
596
597+source "kernel/vserver/Kconfig"
598+
599 source "security/Kconfig"
600
601 config KEYS_COMPAT
3914fd55
AM		 602diff -NurpP --minimal linux-2.6.30.2/arch/powerpc/kernel/irq.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/powerpc/kernel/irq.c
603--- linux-2.6.30.2/arch/powerpc/kernel/irq.c 2009-06-11 17:12:14.000000000 +0200
604+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/powerpc/kernel/irq.c 2009-07-04 01:11:38.000000000 +0200
d337f35e 605@@ -53,6 +53,7 @@
d337f35e
JR		 606 #include <linux/bootmem.h>
607 #include <linux/pci.h>
2380c486 608 #include <linux/debugfs.h>
d337f35e
JR		 609+#include <linux/vs_context.h>
610
611 #include <asm/uaccess.h>
612 #include <asm/system.h>
3914fd55
AM		 613diff -NurpP --minimal linux-2.6.30.2/arch/powerpc/kernel/process.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/powerpc/kernel/process.c
614--- linux-2.6.30.2/arch/powerpc/kernel/process.c 2009-06-11 17:12:14.000000000 +0200
615+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/powerpc/kernel/process.c 2009-07-04 01:11:38.000000000 +0200
9474138d 616@@ -519,8 +519,9 @@ void show_regs(struct pt_regs * regs)
2380c486 617 #else
d337f35e 618 printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr);
2380c486 619 #endif
d337f35e 620- printk("TASK = %p[%d] '%s' THREAD: %p",
2380c486 621- current, task_pid_nr(current), current->comm, task_thread_info(current));
d337f35e 622+ printk("TASK = %p[%d,#%u] '%s' THREAD: %p",
2380c486 623+ current, task_pid_nr(current), current->xid,
d337f35e
JR		 624+ current->comm, task_thread_info(current));
625
626 #ifdef CONFIG_SMP
2380c486 627 printk(" CPU: %d", raw_smp_processor_id());
3914fd55
AM		 628diff -NurpP --minimal linux-2.6.30.2/arch/powerpc/kernel/traps.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/powerpc/kernel/traps.c
629--- linux-2.6.30.2/arch/powerpc/kernel/traps.c 2009-06-11 17:12:14.000000000 +0200
630+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/powerpc/kernel/traps.c 2009-07-04 01:11:38.000000000 +0200
9474138d 631@@ -921,8 +921,9 @@ void nonrecoverable_exception(struct pt_
d337f35e
JR		 632
633 void trace_syscall(struct pt_regs *regs)
634 {
635- printk("Task: %p(%d), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n",
2380c486 636- current, task_pid_nr(current), regs->nip, regs->link, regs->gpr[0],
d337f35e 637+ printk("Task: %p(%d[#%u]), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n",
2380c486 638+ current, task_pid_nr(current), current->xid,
d337f35e
JR		 639+ regs->nip, regs->link, regs->gpr[0],
640 regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
641 }
642
3914fd55
AM		 643diff -NurpP --minimal linux-2.6.30.2/arch/powerpc/kernel/vdso.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/powerpc/kernel/vdso.c
644--- linux-2.6.30.2/arch/powerpc/kernel/vdso.c 2009-03-24 14:18:35.000000000 +0100
645+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/powerpc/kernel/vdso.c 2009-07-04 01:11:38.000000000 +0200
d337f35e 646@@ -22,6 +22,7 @@
d337f35e
JR		 647 #include <linux/security.h>
648 #include <linux/bootmem.h>
2380c486 649 #include <linux/lmb.h>
d337f35e
JR		 650+#include <linux/vs_memory.h>
651
652 #include <asm/pgtable.h>
653 #include <asm/system.h>
3914fd55
AM		 654diff -NurpP --minimal linux-2.6.30.2/arch/powerpc/mm/fault.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/powerpc/mm/fault.c
655--- linux-2.6.30.2/arch/powerpc/mm/fault.c 2009-06-11 17:12:14.000000000 +0200
656+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/powerpc/mm/fault.c 2009-07-04 01:11:38.000000000 +0200
9474138d 657@@ -350,7 +350,8 @@ out_of_memory:
2380c486
JR		 658 down_read(&mm->mmap_sem);
659 goto survive;
660 }
661- printk("VM: killing process %s\n", current->comm);
662+ printk("VM: killing process %s(%d:#%u)\n",
663+ current->comm, current->pid, current->xid);
664 if (user_mode(regs))
665 do_group_exit(SIGKILL);
666 return SIGKILL;
3914fd55
AM		 667diff -NurpP --minimal linux-2.6.30.2/arch/s390/Kconfig linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/s390/Kconfig
668--- linux-2.6.30.2/arch/s390/Kconfig 2009-06-11 17:12:16.000000000 +0200
669+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/s390/Kconfig 2009-07-04 01:11:38.000000000 +0200
9474138d 670@@ -583,6 +583,8 @@ source "fs/Kconfig"
d337f35e
JR		 671
672 source "arch/s390/Kconfig.debug"
673
674+source "kernel/vserver/Kconfig"
675+
676 source "security/Kconfig"
677
678 source "crypto/Kconfig"
3914fd55
AM		 679diff -NurpP --minimal linux-2.6.30.2/arch/s390/kernel/ptrace.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/s390/kernel/ptrace.c
680--- linux-2.6.30.2/arch/s390/kernel/ptrace.c 2009-03-24 14:18:40.000000000 +0100
681+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/s390/kernel/ptrace.c 2009-07-04 01:11:38.000000000 +0200
2380c486
JR		 682@@ -36,6 +36,7 @@
683 #include <linux/elf.h>
684 #include <linux/regset.h>
685 #include <linux/tracehook.h>
d337f35e
JR		 686+#include <linux/vs_base.h>
687
688 #include <asm/segment.h>
689 #include <asm/page.h>
3914fd55
AM		 690diff -NurpP --minimal linux-2.6.30.2/arch/s390/kernel/syscalls.S linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/s390/kernel/syscalls.S
691--- linux-2.6.30.2/arch/s390/kernel/syscalls.S 2009-06-11 17:12:16.000000000 +0200
692+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/s390/kernel/syscalls.S 2009-07-04 01:11:38.000000000 +0200
d337f35e
JR		 693@@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett
694 SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper) /* 260 */
695 SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper)
696 SYSCALL(sys_clock_nanosleep,sys_clock_nanosleep,sys32_clock_nanosleep_wrapper)
697-NI_SYSCALL /* reserved for vserver */
698+SYSCALL(sys_vserver,sys_vserver,sys32_vserver)
2380c486 699 SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper)
d337f35e
JR		 700 SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper)
701 SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper)
3914fd55
AM		 702diff -NurpP --minimal linux-2.6.30.2/arch/sh/Kconfig linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/sh/Kconfig
703--- linux-2.6.30.2/arch/sh/Kconfig 2009-06-11 17:12:16.000000000 +0200
704+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/sh/Kconfig 2009-07-04 01:11:38.000000000 +0200
9474138d 705@@ -757,6 +757,8 @@ source "fs/Kconfig"
d337f35e
JR		 706
707 source "arch/sh/Kconfig.debug"
708
709+source "kernel/vserver/Kconfig"
710+
711 source "security/Kconfig"
712
713 source "crypto/Kconfig"
3914fd55
AM		 714diff -NurpP --minimal linux-2.6.30.2/arch/sh/kernel/irq.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/sh/kernel/irq.c
715--- linux-2.6.30.2/arch/sh/kernel/irq.c 2009-06-11 17:12:18.000000000 +0200
716+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/sh/kernel/irq.c 2009-07-04 01:11:38.000000000 +0200
2380c486
JR		 717@@ -11,6 +11,7 @@
718 #include <linux/module.h>
d337f35e
JR		 719 #include <linux/kernel_stat.h>
720 #include <linux/seq_file.h>
d337f35e 721+#include <linux/vs_context.h>
d337f35e 722 #include <asm/processor.h>
2380c486 723 #include <asm/machvec.h>
d337f35e 724 #include <asm/uaccess.h>
3914fd55
AM		 725diff -NurpP --minimal linux-2.6.30.2/arch/sh/kernel/vsyscall/vsyscall.c linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/sh/kernel/vsyscall/vsyscall.c
726--- linux-2.6.30.2/arch/sh/kernel/vsyscall/vsyscall.c 2009-03-24 14:18:42.000000000 +0100
727+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/sh/kernel/vsyscall/vsyscall.c 2009-07-04 01:11:38.000000000 +0200
2380c486 728@@ -19,6 +19,7 @@
d337f35e 729 #include <linux/elf.h>
2380c486
JR		 730 #include <linux/sched.h>
731 #include <linux/err.h>
d337f35e
JR		 732+#include <linux/vs_memory.h>
733
734 /*
735 * Should the kernel map a VDSO page into processes and pass its
3914fd55
AM		 736diff -NurpP --minimal linux-2.6.30.2/arch/sparc/include/asm/tlb_64.h linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/sparc/include/asm/tlb_64.h
737--- linux-2.6.30.2/arch/sparc/include/asm/tlb_64.h 2009-06-11 17:12:18.000000000 +0200
738+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/sparc/include/asm/tlb_64.h 2009-07-04 01:11:38.000000000 +0200
50e68740
JR		 739@@ -3,6 +3,7 @@
740
741 #include <linux/swap.h>
742 #include <linux/pagemap.h>
743+#include <linux/vs_memory.h>
744 #include <asm/pgalloc.h>
745 #include <asm/tlbflush.h>
746 #include <asm/mmu_context.h>
3914fd55
AM		 747diff -NurpP --minimal linux-2.6.30.2/arch/sparc/include/asm/unistd.h linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/sparc/include/asm/unistd.h
748--- linux-2.6.30.2/arch/sparc/include/asm/unistd.h 2009-06-11 17:12:18.000000000 +0200
749+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/sparc/include/asm/unistd.h 2009-07-04 01:11:38.000000000 +0200
50e68740
JR		 750@@ -335,7 +335,7 @@
751 #define __NR_timer_getoverrun 264
752 #define __NR_timer_delete 265
753 #define __NR_timer_create 266
754-/* #define __NR_vserver 267 Reserved for VSERVER */
755+#define __NR_vserver 267
756 #define __NR_io_setup 268
757 #define __NR_io_destroy 269
758 #define __NR_io_submit 270
3914fd55
AM		 759diff -NurpP --minimal linux-2.6.30.2/arch/sparc/Kconfig linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/sparc/Kconfig
760--- linux-2.6.30.2/arch/sparc/Kconfig 2009-06-11 17:12:18.000000000 +0200
761+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/sparc/Kconfig 2009-07-04 01:11:38.000000000 +0200
9474138d 762@@ -525,6 +525,8 @@ source "fs/Kconfig"
d337f35e
JR		 763
764 source "arch/sparc/Kconfig.debug"
765
766+source "kernel/vserver/Kconfig"
767+
768 source "security/Kconfig"
769
770 source "crypto/Kconfig"
3914fd55
AM		 771diff -NurpP --minimal linux-2.6.30.2/arch/sparc/kernel/systbls_32.S linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/sparc/kernel/systbls_32.S
772--- linux-2.6.30.2/arch/sparc/kernel/systbls_32.S 2009-06-11 17:12:19.000000000 +0200
773+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/sparc/kernel/systbls_32.S 2009-07-04 01:11:38.000000000 +0200
50e68740
JR		 774@@ -70,7 +70,7 @@ sys_call_table:
775 /*250*/ .long sparc_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
776 /*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
777 /*260*/ .long sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
778-/*265*/ .long sys_timer_delete, sys_timer_create, sys_nis_syscall, sys_io_setup, sys_io_destroy
779+/*265*/ .long sys_timer_delete, sys_timer_create, sys_vserver, sys_io_setup, sys_io_destroy
780 /*270*/ .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
781 /*275*/ .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
782 /*280*/ .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
3914fd55
AM		 783diff -NurpP --minimal linux-2.6.30.2/arch/sparc/kernel/systbls_64.S linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/sparc/kernel/systbls_64.S
784--- linux-2.6.30.2/arch/sparc/kernel/systbls_64.S 2009-06-11 17:12:19.000000000 +0200
785+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/sparc/kernel/systbls_64.S 2009-07-04 01:11:38.000000000 +0200
50e68740
JR		 786@@ -71,7 +71,7 @@ sys_call_table32:
787 /*250*/ .word sys32_mremap, sys32_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl
788 .word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
789 /*260*/ .word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, sys32_timer_settime, compat_sys_timer_gettime, sys_timer_getoverrun
790- .word sys_timer_delete, compat_sys_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy
791+ .word sys_timer_delete, compat_sys_timer_create, sys32_vserver, compat_sys_io_setup, sys_io_destroy
792 /*270*/ .word sys32_io_submit, sys_io_cancel, compat_sys_io_getevents, sys32_mq_open, sys_mq_unlink
793 .word compat_sys_mq_timedsend, compat_sys_mq_timedreceive, compat_sys_mq_notify, compat_sys_mq_getsetattr, compat_sys_waitid
794 /*280*/ .word sys32_tee, sys_add_key, sys_request_key, sys_keyctl, compat_sys_openat
795@@ -145,7 +145,7 @@ sys_call_table:
796 /*250*/ .word sys_64_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
797 .word sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
798 /*260*/ .word sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
799- .word sys_timer_delete, sys_timer_create, sys_ni_syscall, sys_io_setup, sys_io_destroy
800+ .word sys_timer_delete, sys_timer_create, sys_vserver, sys_io_setup, sys_io_destroy
801 /*270*/ .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
802 .word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
803 /*280*/ .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
3914fd55
AM		 804diff -NurpP --minimal linux-2.6.30.2/arch/x86/ia32/ia32entry.S linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/x86/ia32/ia32entry.S
805--- linux-2.6.30.2/arch/x86/ia32/ia32entry.S 2009-06-11 17:12:20.000000000 +0200
806+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/x86/ia32/ia32entry.S 2009-07-04 01:11:38.000000000 +0200
2380c486
JR		 807@@ -768,7 +768,7 @@ ia32_sys_call_table:
808 .quad sys_tgkill /* 270 */
809 .quad compat_sys_utimes
810 .quad sys32_fadvise64_64
811- .quad quiet_ni_syscall /* sys_vserver */
812+ .quad sys32_vserver
813 .quad sys_mbind
814 .quad compat_sys_get_mempolicy /* 275 */
815 .quad sys_set_mempolicy
3914fd55
AM		 816diff -NurpP --minimal linux-2.6.30.2/arch/x86/include/asm/unistd_64.h linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/x86/include/asm/unistd_64.h
817--- linux-2.6.30.2/arch/x86/include/asm/unistd_64.h 2009-06-11 17:12:21.000000000 +0200
818+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/x86/include/asm/unistd_64.h 2009-07-04 01:11:38.000000000 +0200
2380c486
JR		 819@@ -535,7 +535,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill)
820 #define __NR_utimes 235
821 __SYSCALL(__NR_utimes, sys_utimes)
822 #define __NR_vserver 236
823-__SYSCALL(__NR_vserver, sys_ni_syscall)
824+__SYSCALL(__NR_vserver, sys_vserver)
825 #define __NR_mbind 237
826 __SYSCALL(__NR_mbind, sys_mbind)
827 #define __NR_set_mempolicy 238
3914fd55
AM		 828diff -NurpP --minimal linux-2.6.30.2/arch/x86/Kconfig linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/x86/Kconfig
829--- linux-2.6.30.2/arch/x86/Kconfig 2009-06-11 17:12:19.000000000 +0200
830+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/x86/Kconfig 2009-07-04 01:11:38.000000000 +0200
9474138d 831@@ -2045,6 +2045,8 @@ source "fs/Kconfig"
d337f35e 832
2380c486 833 source "arch/x86/Kconfig.debug"
d337f35e
JR		 834
835+source "kernel/vserver/Kconfig"
836+
837 source "security/Kconfig"
838
839 source "crypto/Kconfig"
3914fd55
AM		 840diff -NurpP --minimal linux-2.6.30.2/arch/x86/kernel/syscall_table_32.S linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/x86/kernel/syscall_table_32.S
841--- linux-2.6.30.2/arch/x86/kernel/syscall_table_32.S 2009-06-11 17:12:23.000000000 +0200
842+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/arch/x86/kernel/syscall_table_32.S 2009-07-04 01:11:38.000000000 +0200
2380c486
JR		 843@@ -272,7 +272,7 @@ ENTRY(sys_call_table)
844 .long sys_tgkill /* 270 */
845 .long sys_utimes
846 .long sys_fadvise64_64
847- .long sys_ni_syscall /* sys_vserver */
848+ .long sys_vserver
849 .long sys_mbind
850 .long sys_get_mempolicy
851 .long sys_set_mempolicy
3914fd55
AM		 852diff -NurpP --minimal linux-2.6.30.2/Documentation/vserver/debug.txt linux-2.6.30.2-vs2.3.0.36.14-pre4/Documentation/vserver/debug.txt
853--- linux-2.6.30.2/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
854+++ linux-2.6.30.2-vs2.3.0.36.14-pre4/Documentation/vserver/debug.txt 2009-07-04 01:11:38.000000000 +0200
2380c486 855@@ -0,0 +1,154 @@
d337f35e 856+
2380c486 857+debug_cvirt:
d337f35e 858+
2380c486
JR		 859+ 2 4 "vx_map_tgid: %p/%llx: %d -> %d"
860+ "vx_rmap_tgid: %p/%llx: %d -> %d"
d337f35e 861+
2380c486 862+debug_dlim:
d337f35e 863+
2380c486
JR		 864+ 0 1 "ALLOC (%p,#%d)%c inode (%d)"
865+ "FREE (%p,#%d)%c inode"
866+ 1 2 "ALLOC (%p,#%d)%c %lld bytes (%d)"
867+ "FREE (%p,#%d)%c %lld bytes"
868+ 2 4 "ADJUST: %lld,%lld on %ld,%ld [mult=%d]"
869+ 3 8 "ext3_has_free_blocks(%p): %lu<%lu+1, %c, %u!=%u r=%d"
870+ "ext3_has_free_blocks(%p): free=%lu, root=%lu"
871+ "rcu_free_dl_info(%p)"
872+ 4 10 "alloc_dl_info(%p,%d) = %p"
873+ "dealloc_dl_info(%p)"
874+ "get_dl_info(%p[#%d.%d])"
875+ "put_dl_info(%p[#%d.%d])"
876+ 5 20 "alloc_dl_info(%p,%d)*"
877+ 6 40 "__hash_dl_info: %p[#%d]"
878+ "__unhash_dl_info: %p[#%d]"
879+ 7 80 "locate_dl_info(%p,#%d) = %p"
880+
881+debug_misc:
882+
883+ 0 1 "destroy_dqhash: %p [#0x%08x] c=%d"
884+ "new_dqhash: %p [#0x%08x]"
885+ "vroot[%d]_clr_dev: dev=%p[%lu,%d:%d]"
886+ "vroot[%d]_get_real_bdev: dev=%p[%lu,%d:%d]"
887+ "vroot[%d]_set_dev: dev=%p[%lu,%d:%d]"
888+ "vroot_get_real_bdev not set"
889