]> 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
- package modules.order, empty other ghost files (12.2k in size)
[packages/kernel.git] / kernel-vserver-2.3.patch
CommitLineData
ef116bc3
AM		 1diff -NurpP --minimal linux-2.6.32.1/arch/alpha/Kconfig linux-2.6.32.1-vs2.3.0.36.27/arch/alpha/Kconfig
2--- linux-2.6.32.1/arch/alpha/Kconfig 2009-12-03 20:01:49.000000000 +0100
3+++ linux-2.6.32.1-vs2.3.0.36.27/arch/alpha/Kconfig 2009-12-03 20:04:56.000000000 +0100
7e46296a 4@@ -674,6 +674,8 @@ config DUMMY_CONSOLE
2380c486
JR		 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"
ef116bc3
AM		 13diff -NurpP --minimal linux-2.6.32.1/arch/alpha/kernel/entry.S linux-2.6.32.1-vs2.3.0.36.27/arch/alpha/kernel/entry.S
14--- linux-2.6.32.1/arch/alpha/kernel/entry.S 2009-06-11 17:11:46.000000000 +0200
15+++ linux-2.6.32.1-vs2.3.0.36.27/arch/alpha/kernel/entry.S 2009-12-03 20:04:56.000000000 +0100
ec22aa5c 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
ef116bc3
AM		 48diff -NurpP --minimal linux-2.6.32.1/arch/alpha/kernel/osf_sys.c linux-2.6.32.1-vs2.3.0.36.27/arch/alpha/kernel/osf_sys.c
49--- linux-2.6.32.1/arch/alpha/kernel/osf_sys.c 2009-09-10 15:25:14.000000000 +0200
50+++ linux-2.6.32.1-vs2.3.0.36.27/arch/alpha/kernel/osf_sys.c 2009-12-03 20:04:56.000000000 +0100
ec22aa5c 51@@ -872,7 +872,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 }
ef116bc3
AM		 60diff -NurpP --minimal linux-2.6.32.1/arch/alpha/kernel/ptrace.c linux-2.6.32.1-vs2.3.0.36.27/arch/alpha/kernel/ptrace.c
61--- linux-2.6.32.1/arch/alpha/kernel/ptrace.c 2009-09-10 15:25:14.000000000 +0200
62+++ linux-2.6.32.1-vs2.3.0.36.27/arch/alpha/kernel/ptrace.c 2009-12-03 20:04:56.000000000 +0100
ec22aa5c 63@@ -14,6 +14,7 @@
d337f35e
JR		 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>
ef116bc3
AM		 71diff -NurpP --minimal linux-2.6.32.1/arch/alpha/kernel/systbls.S linux-2.6.32.1-vs2.3.0.36.27/arch/alpha/kernel/systbls.S
72--- linux-2.6.32.1/arch/alpha/kernel/systbls.S 2009-03-24 14:18:08.000000000 +0100
73+++ linux-2.6.32.1-vs2.3.0.36.27/arch/alpha/kernel/systbls.S 2009-12-03 20:04:56.000000000 +0100
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 */
ef116bc3
AM		 83diff -NurpP --minimal linux-2.6.32.1/arch/alpha/kernel/traps.c linux-2.6.32.1-vs2.3.0.36.27/arch/alpha/kernel/traps.c
84--- linux-2.6.32.1/arch/alpha/kernel/traps.c 2009-06-11 17:11:46.000000000 +0200
85+++ linux-2.6.32.1-vs2.3.0.36.27/arch/alpha/kernel/traps.c 2009-12-03 20:04:56.000000000 +0100
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));
ef116bc3
AM		 96diff -NurpP --minimal linux-2.6.32.1/arch/alpha/mm/fault.c linux-2.6.32.1-vs2.3.0.36.27/arch/alpha/mm/fault.c
97--- linux-2.6.32.1/arch/alpha/mm/fault.c 2009-09-10 15:25:14.000000000 +0200
98+++ linux-2.6.32.1-vs2.3.0.36.27/arch/alpha/mm/fault.c 2009-12-03 20:04:56.000000000 +0100
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);
ef116bc3
AM		 110diff -NurpP --minimal linux-2.6.32.1/arch/arm/Kconfig linux-2.6.32.1-vs2.3.0.36.27/arch/arm/Kconfig
111--- linux-2.6.32.1/arch/arm/Kconfig 2009-12-03 20:01:49.000000000 +0100
112+++ linux-2.6.32.1-vs2.3.0.36.27/arch/arm/Kconfig 2009-12-03 20:04:56.000000000 +0100
7e46296a 113@@ -1512,6 +1512,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"
ef116bc3
AM		 122diff -NurpP --minimal linux-2.6.32.1/arch/arm/kernel/calls.S linux-2.6.32.1-vs2.3.0.36.27/arch/arm/kernel/calls.S
123--- linux-2.6.32.1/arch/arm/kernel/calls.S 2009-12-03 20:01:50.000000000 +0100
124+++ linux-2.6.32.1-vs2.3.0.36.27/arch/arm/kernel/calls.S 2009-12-03 20:04:56.000000000 +0100
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)
ef116bc3
AM		 134diff -NurpP --minimal linux-2.6.32.1/arch/arm/kernel/process.c linux-2.6.32.1-vs2.3.0.36.27/arch/arm/kernel/process.c
135--- linux-2.6.32.1/arch/arm/kernel/process.c 2009-12-03 20:01:50.000000000 +0100
136+++ linux-2.6.32.1-vs2.3.0.36.27/arch/arm/kernel/process.c 2009-12-03 20:04:56.000000000 +0100
ec22aa5c 137@@ -269,7 +269,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 }
ef116bc3
AM		 147diff -NurpP --minimal linux-2.6.32.1/arch/arm/kernel/traps.c linux-2.6.32.1-vs2.3.0.36.27/arch/arm/kernel/traps.c
148--- linux-2.6.32.1/arch/arm/kernel/traps.c 2009-12-03 20:01:50.000000000 +0100
149+++ linux-2.6.32.1-vs2.3.0.36.27/arch/arm/kernel/traps.c 2009-12-03 20:04:56.000000000 +0100
7e46296a
AM		 150@@ -234,8 +234,8 @@ static void __die(const char *str, int e
151 sysfs_printk_last_file();
d337f35e
JR		 152 print_modules();
153 __show_regs(regs);
7e46296a
AM		 154- printk(KERN_EMERG "Process %.*s (pid: %d, stack limit = 0x%p)\n",
155- TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), thread + 1);
156+ printk(KERN_EMERG "Process %.*s (pid: %d:#%u, stack limit = 0x%p)\n",
157+ TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), tsk->xid, thread + 1);
d337f35e
JR		 158
159 if (!user_mode(regs) || in_interrupt()) {
7e46296a 160 dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
ef116bc3
AM		 161diff -NurpP --minimal linux-2.6.32.1/arch/avr32/mm/fault.c linux-2.6.32.1-vs2.3.0.36.27/arch/avr32/mm/fault.c
162--- linux-2.6.32.1/arch/avr32/mm/fault.c 2009-09-10 15:25:20.000000000 +0200
163+++ linux-2.6.32.1-vs2.3.0.36.27/arch/avr32/mm/fault.c 2009-12-03 20:04:56.000000000 +0100
4a036bed
AM		 164@@ -216,7 +216,8 @@ out_of_memory:
165 down_read(&mm->mmap_sem);
166 goto survive;
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 if (user_mode(regs))
172 do_group_exit(SIGKILL);
173 goto no_context;
ef116bc3
AM		 174diff -NurpP --minimal linux-2.6.32.1/arch/cris/Kconfig linux-2.6.32.1-vs2.3.0.36.27/arch/cris/Kconfig
175--- linux-2.6.32.1/arch/cris/Kconfig 2009-06-11 17:11:56.000000000 +0200
176+++ linux-2.6.32.1-vs2.3.0.36.27/arch/cris/Kconfig 2009-12-03 20:04:56.000000000 +0100
ec22aa5c 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"
ef116bc3
AM		 186diff -NurpP --minimal linux-2.6.32.1/arch/cris/mm/fault.c linux-2.6.32.1-vs2.3.0.36.27/arch/cris/mm/fault.c
187--- linux-2.6.32.1/arch/cris/mm/fault.c 2009-12-03 20:01:56.000000000 +0100
188+++ linux-2.6.32.1-vs2.3.0.36.27/arch/cris/mm/fault.c 2009-12-03 20:04:56.000000000 +0100
4a036bed
AM		 189@@ -245,7 +245,8 @@ do_page_fault(unsigned long address, str
190
191 out_of_memory:
192 up_read(&mm->mmap_sem);
193- printk("VM: killing process %s\n", tsk->comm);
194+ printk("VM: killing process %s(%d:#%u)\n",
195+ tsk->comm, task_pid_nr(tsk), tsk->xid);
196 if (user_mode(regs))
197 do_exit(SIGKILL);
198 goto no_context;
ef116bc3
AM		 199diff -NurpP --minimal linux-2.6.32.1/arch/frv/kernel/kernel_thread.S linux-2.6.32.1-vs2.3.0.36.27/arch/frv/kernel/kernel_thread.S
200--- linux-2.6.32.1/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
201+++ linux-2.6.32.1-vs2.3.0.36.27/arch/frv/kernel/kernel_thread.S 2009-12-03 20:04:56.000000000 +0100
2380c486 202@@ -37,7 +37,7 @@ kernel_thread:
d337f35e
JR		 203
204 # start by forking the current process, but with shared VM
205 setlos.p #__NR_clone,gr7 ; syscall number
206- ori gr10,#CLONE_VM,gr8 ; first syscall arg [clone_flags]
207+ ori gr10,#CLONE_KT,gr8 ; first syscall arg [clone_flags]
208 sethi.p #0xe4e4,gr9 ; second syscall arg [newsp]
209 setlo #0xe4e4,gr9
210 setlos.p #0,gr10 ; third syscall arg [parent_tidptr]
ef116bc3
AM		 211diff -NurpP --minimal linux-2.6.32.1/arch/frv/mm/fault.c linux-2.6.32.1-vs2.3.0.36.27/arch/frv/mm/fault.c
212--- linux-2.6.32.1/arch/frv/mm/fault.c 2009-09-10 15:25:22.000000000 +0200
213+++ linux-2.6.32.1-vs2.3.0.36.27/arch/frv/mm/fault.c 2009-12-03 20:04:56.000000000 +0100
4a036bed
AM		 214@@ -257,7 +257,8 @@ asmlinkage void do_page_fault(int datamm
215 */
216 out_of_memory:
217 up_read(&mm->mmap_sem);
218- printk("VM: killing process %s\n", current->comm);
219+ printk("VM: killing process %s(%d:#%u)\n",
220+ current->comm, task_pid_nr(current), current->xid);
221 if (user_mode(__frame))
222 do_group_exit(SIGKILL);
223 goto no_context;
ef116bc3
AM		 224diff -NurpP --minimal linux-2.6.32.1/arch/h8300/Kconfig linux-2.6.32.1-vs2.3.0.36.27/arch/h8300/Kconfig
225--- linux-2.6.32.1/arch/h8300/Kconfig 2009-03-24 14:18:24.000000000 +0100
226+++ linux-2.6.32.1-vs2.3.0.36.27/arch/h8300/Kconfig 2009-12-03 20:04:56.000000000 +0100
ec22aa5c 227@@ -226,6 +226,8 @@ source "fs/Kconfig"
d337f35e
JR		 228
229 source "arch/h8300/Kconfig.debug"
230
231+source "kernel/vserver/Kconfig"
232+
233 source "security/Kconfig"
234
235 source "crypto/Kconfig"
ef116bc3
AM		 236diff -NurpP --minimal linux-2.6.32.1/arch/ia64/ia32/ia32_entry.S linux-2.6.32.1-vs2.3.0.36.27/arch/ia64/ia32/ia32_entry.S
237--- linux-2.6.32.1/arch/ia64/ia32/ia32_entry.S 2009-06-11 17:11:57.000000000 +0200
238+++ linux-2.6.32.1-vs2.3.0.36.27/arch/ia64/ia32/ia32_entry.S 2009-12-03 20:04:56.000000000 +0100
ec22aa5c 239@@ -451,7 +451,7 @@ ia32_syscall_table:
2380c486
JR		 240 data8 sys_tgkill /* 270 */
241 data8 compat_sys_utimes
242 data8 sys32_fadvise64_64
243- data8 sys_ni_syscall
244+ data8 sys32_vserver
245 data8 sys_ni_syscall
246 data8 sys_ni_syscall /* 275 */
247 data8 sys_ni_syscall
ef116bc3
AM		 248diff -NurpP --minimal linux-2.6.32.1/arch/ia64/Kconfig linux-2.6.32.1-vs2.3.0.36.27/arch/ia64/Kconfig
249--- linux-2.6.32.1/arch/ia64/Kconfig 2009-12-03 20:01:56.000000000 +0100
250+++ linux-2.6.32.1-vs2.3.0.36.27/arch/ia64/Kconfig 2009-12-03 20:04:56.000000000 +0100
7e46296a 251@@ -685,6 +685,8 @@ source "fs/Kconfig"
2380c486
JR		 252
253 source "arch/ia64/Kconfig.debug"
d337f35e
JR		 254
255+source "kernel/vserver/Kconfig"
256+
257 source "security/Kconfig"
258
259 source "crypto/Kconfig"
ef116bc3
AM		 260diff -NurpP --minimal linux-2.6.32.1/arch/ia64/kernel/entry.S linux-2.6.32.1-vs2.3.0.36.27/arch/ia64/kernel/entry.S
261--- linux-2.6.32.1/arch/ia64/kernel/entry.S 2009-09-10 15:25:22.000000000 +0200
262+++ linux-2.6.32.1-vs2.3.0.36.27/arch/ia64/kernel/entry.S 2009-12-03 20:04:56.000000000 +0100
ec22aa5c 263@@ -1753,7 +1753,7 @@ sys_call_table:
2380c486
JR		 264 data8 sys_mq_notify
265 data8 sys_mq_getsetattr
266 data8 sys_kexec_load
267- data8 sys_ni_syscall // reserved for vserver
268+ data8 sys_vserver
269 data8 sys_waitid // 1270
270 data8 sys_add_key
271 data8 sys_request_key
ef116bc3
AM		 272diff -NurpP --minimal linux-2.6.32.1/arch/ia64/kernel/perfmon.c linux-2.6.32.1-vs2.3.0.36.27/arch/ia64/kernel/perfmon.c
273--- linux-2.6.32.1/arch/ia64/kernel/perfmon.c 2009-09-10 15:25:22.000000000 +0200
274+++ linux-2.6.32.1-vs2.3.0.36.27/arch/ia64/kernel/perfmon.c 2009-12-03 20:04:56.000000000 +0100
ec22aa5c 275@@ -41,6 +41,7 @@
2380c486
JR		 276 #include <linux/rcupdate.h>
277 #include <linux/completion.h>
ec22aa5c 278 #include <linux/tracehook.h>
2380c486 279+#include <linux/vs_memory.h>
d337f35e 280
2380c486
JR		 281 #include <asm/errno.h>
282 #include <asm/intrinsics.h>
ec22aa5c 283@@ -2372,7 +2373,7 @@ pfm_smpl_buffer_alloc(struct task_struct
2380c486
JR		 284 */
285 insert_vm_struct(mm, vma);
d337f35e 286
2380c486
JR		 287- mm->total_vm += size >> PAGE_SHIFT;
288+ vx_vmpages_add(mm, size >> PAGE_SHIFT);
289 vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file,
290 vma_pages(vma));
291 up_write(&task->mm->mmap_sem);
ef116bc3
AM		 292diff -NurpP --minimal linux-2.6.32.1/arch/ia64/kernel/process.c linux-2.6.32.1-vs2.3.0.36.27/arch/ia64/kernel/process.c
293--- linux-2.6.32.1/arch/ia64/kernel/process.c 2009-12-03 20:01:56.000000000 +0100
294+++ linux-2.6.32.1-vs2.3.0.36.27/arch/ia64/kernel/process.c 2009-12-03 20:04:56.000000000 +0100
ec22aa5c 295@@ -110,8 +110,8 @@ show_regs (struct pt_regs *regs)
2380c486 296 unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
d337f35e 297
2380c486
JR		 298 print_modules();
299- printk("\nPid: %d, CPU %d, comm: %20s\n", task_pid_nr(current),
300- smp_processor_id(), current->comm);
301+ printk("\nPid: %d[#%u], CPU %d, comm: %20s\n", task_pid_nr(current),
302+ current->xid, smp_processor_id(), current->comm);
303 printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n",
304 regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
305 init_utsname()->release);
ef116bc3
AM		 306diff -NurpP --minimal linux-2.6.32.1/arch/ia64/kernel/ptrace.c linux-2.6.32.1-vs2.3.0.36.27/arch/ia64/kernel/ptrace.c
307--- linux-2.6.32.1/arch/ia64/kernel/ptrace.c 2009-09-10 15:25:22.000000000 +0200
308+++ linux-2.6.32.1-vs2.3.0.36.27/arch/ia64/kernel/ptrace.c 2009-12-03 20:04:56.000000000 +0100
23f740c4 309@@ -22,6 +22,7 @@
2380c486 310 #include <linux/regset.h>
d337f35e 311 #include <linux/elf.h>
ec22aa5c 312 #include <linux/tracehook.h>
d337f35e
JR		 313+#include <linux/vs_base.h>
314
315 #include <asm/pgtable.h>
316 #include <asm/processor.h>
ef116bc3
AM		 317diff -NurpP --minimal linux-2.6.32.1/arch/ia64/kernel/traps.c linux-2.6.32.1-vs2.3.0.36.27/arch/ia64/kernel/traps.c
318--- linux-2.6.32.1/arch/ia64/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
319+++ linux-2.6.32.1-vs2.3.0.36.27/arch/ia64/kernel/traps.c 2009-12-03 20:04:56.000000000 +0100
2380c486 320@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
d337f35e
JR		 321 put_cpu();
322
323 if (++die.lock_owner_depth < 3) {
324- printk("%s[%d]: %s %ld [%d]\n",
2380c486 325- current->comm, task_pid_nr(current), str, err, ++die_counter);
d337f35e 326+ printk("%s[%d[#%u]]: %s %ld [%d]\n",
2380c486 327+ current->comm, task_pid_nr(current), current->xid,
d337f35e 328+ str, err, ++die_counter);
2380c486
JR		 329 if (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV)
330 != NOTIFY_STOP)
331 show_regs(regs);
332@@ -324,8 +325,9 @@ handle_fpu_swa (int fp_fault, struct pt_
333 if ((last.count & 15) < 5 && (ia64_fetchadd(1, &last.count, acq) & 15) < 5) {
334 last.time = current_jiffies + 5 * HZ;
335 printk(KERN_WARNING
336- "%s(%d): floating-point assist fault at ip %016lx, isr %016lx\n",
337- current->comm, task_pid_nr(current), regs->cr_iip + ia64_psr(regs)->ri, isr);
338+ "%s(%d[#%u]): floating-point assist fault at ip %016lx, isr %016lx\n",
339+ current->comm, task_pid_nr(current), current->xid,
340+ regs->cr_iip + ia64_psr(regs)->ri, isr);
341 }
342 }
d337f35e 343 }
ef116bc3
AM		 344diff -NurpP --minimal linux-2.6.32.1/arch/ia64/mm/fault.c linux-2.6.32.1-vs2.3.0.36.27/arch/ia64/mm/fault.c
345--- linux-2.6.32.1/arch/ia64/mm/fault.c 2009-09-10 15:25:23.000000000 +0200
346+++ linux-2.6.32.1-vs2.3.0.36.27/arch/ia64/mm/fault.c 2009-12-03 20:04:56.000000000 +0100
d337f35e 347@@ -10,6 +10,7 @@
d337f35e
JR		 348 #include <linux/interrupt.h>
349 #include <linux/kprobes.h>
2380c486 350 #include <linux/kdebug.h>
d337f35e
JR		 351+#include <linux/vs_memory.h>
352
353 #include <asm/pgtable.h>
354 #include <asm/processor.h>
4a036bed
AM		 355@@ -281,7 +282,8 @@ ia64_do_page_fault (unsigned long addres
356 down_read(&mm->mmap_sem);
357 goto survive;
358 }
359- printk(KERN_CRIT "VM: killing process %s\n", current->comm);
360+ printk(KERN_CRIT "VM: killing process %s(%d:#%u)\n",
361+ current->comm, task_pid_nr(current), current->xid);
362 if (user_mode(regs))
363 do_group_exit(SIGKILL);
364 goto no_context;
ef116bc3
AM		 365diff -NurpP --minimal linux-2.6.32.1/arch/m32r/kernel/traps.c linux-2.6.32.1-vs2.3.0.36.27/arch/m32r/kernel/traps.c
366--- linux-2.6.32.1/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100
367+++ linux-2.6.32.1-vs2.3.0.36.27/arch/m32r/kernel/traps.c 2009-12-03 20:04:56.000000000 +0100
2380c486 368@@ -196,8 +196,9 @@ static void show_registers(struct pt_reg
d337f35e
JR		 369 } else {
370 printk("SPI: %08lx\n", sp);
371 }
372- printk("Process %s (pid: %d, process nr: %d, stackpage=%08lx)",
2380c486 373- current->comm, task_pid_nr(current), 0xffff & i, 4096+(unsigned long)current);
d337f35e 374+ printk("Process %s (pid: %d[#%u], process nr: %d, stackpage=%08lx)",
2380c486 375+ current->comm, task_pid_nr(current), current->xid,
d337f35e
JR		 376+ 0xffff & i, 4096+(unsigned long)current);
377
378 /*
379 * When in-kernel, we also print out the stack and code at the
ef116bc3
AM		 380diff -NurpP --minimal linux-2.6.32.1/arch/m32r/mm/fault.c linux-2.6.32.1-vs2.3.0.36.27/arch/m32r/mm/fault.c
381--- linux-2.6.32.1/arch/m32r/mm/fault.c 2009-09-10 15:25:23.000000000 +0200
382+++ linux-2.6.32.1-vs2.3.0.36.27/arch/m32r/mm/fault.c 2009-12-03 20:04:56.000000000 +0100
4a036bed
AM		 383@@ -276,7 +276,8 @@ out_of_memory:
384 down_read(&mm->mmap_sem);
385 goto survive;
386 }
387- printk("VM: killing process %s\n", tsk->comm);
388+ printk("VM: killing process %s(%d:#%u)\n",
389+ tsk->comm, task_pid_nr(tsk), tsk->xid);
390 if (error_code & ACE_USERMODE)
391 do_group_exit(SIGKILL);
392 goto no_context;
ef116bc3
AM		 393diff -NurpP --minimal linux-2.6.32.1/arch/m68k/Kconfig linux-2.6.32.1-vs2.3.0.36.27/arch/m68k/Kconfig
394--- linux-2.6.32.1/arch/m68k/Kconfig 2009-12-03 20:01:57.000000000 +0100
395+++ linux-2.6.32.1-vs2.3.0.36.27/arch/m68k/Kconfig 2009-12-03 20:04:56.000000000 +0100
7e46296a 396@@ -622,6 +622,8 @@ source "fs/Kconfig"
d337f35e
JR		 397
398 source "arch/m68k/Kconfig.debug"
399
400+source "kernel/vserver/Kconfig"
401+
402 source "security/Kconfig"
403
404 source "crypto/Kconfig"
ef116bc3
AM		 405diff -NurpP --minimal linux-2.6.32.1/arch/m68k/kernel/ptrace.c linux-2.6.32.1-vs2.3.0.36.27/arch/m68k/kernel/ptrace.c
406--- linux-2.6.32.1/arch/m68k/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
407+++ linux-2.6.32.1-vs2.3.0.36.27/arch/m68k/kernel/ptrace.c 2009-12-03 20:04:56.000000000 +0100
2380c486 408@@ -18,6 +18,7 @@
d337f35e
JR		 409 #include <linux/ptrace.h>
410 #include <linux/user.h>
411 #include <linux/signal.h>
412+#include <linux/vs_base.h>
413
414 #include <asm/uaccess.h>
415 #include <asm/page.h>
2380c486 416@@ -269,6 +270,8 @@ long arch_ptrace(struct task_struct *chi
d337f35e
JR		 417 ret = ptrace_request(child, request, addr, data);
418 break;
419 }
2380c486 420+ if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT))
d337f35e
JR		 421+ goto out_tsk;
422
423 return ret;
424 out_eio:
ef116bc3
AM		 425diff -NurpP --minimal linux-2.6.32.1/arch/m68k/kernel/traps.c linux-2.6.32.1-vs2.3.0.36.27/arch/m68k/kernel/traps.c
426--- linux-2.6.32.1/arch/m68k/kernel/traps.c 2009-09-10 15:25:23.000000000 +0200
427+++ linux-2.6.32.1-vs2.3.0.36.27/arch/m68k/kernel/traps.c 2009-12-03 20:04:56.000000000 +0100
ec22aa5c 428@@ -906,8 +906,8 @@ void show_registers(struct pt_regs *regs
d337f35e
JR		 429 printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
430 regs->d4, regs->d5, regs->a0, regs->a1);
431
432- printk("Process %s (pid: %d, task=%p)\n",
2380c486 433- current->comm, task_pid_nr(current), current);
d337f35e 434+ printk("Process %s (pid: %d[#%u], task=%p)\n",
2380c486 435+ current->comm, task_pid_nr(current), current->xid, current);
d337f35e
JR		 436 addr = (unsigned long)&fp->un;
437 printk("Frame format=%X ", regs->format);
438 switch (regs->format) {
ef116bc3
AM		 439diff -NurpP --minimal linux-2.6.32.1/arch/m68k/mm/fault.c linux-2.6.32.1-vs2.3.0.36.27/arch/m68k/mm/fault.c
440--- linux-2.6.32.1/arch/m68k/mm/fault.c 2009-09-10 15:25:23.000000000 +0200
441+++ linux-2.6.32.1-vs2.3.0.36.27/arch/m68k/mm/fault.c 2009-12-03 20:04:56.000000000 +0100
4a036bed
AM		 442@@ -186,7 +186,8 @@ out_of_memory:
443 goto survive;
444 }
445
446- printk("VM: killing process %s\n", current->comm);
447+ printk("VM: killing process %s(%d:#%u)\n",
448+ current->comm, task_pid_nr(current), current->xid);
449 if (user_mode(regs))
450 do_group_exit(SIGKILL);
451
ef116bc3
AM		 452diff -NurpP --minimal linux-2.6.32.1/arch/m68knommu/Kconfig linux-2.6.32.1-vs2.3.0.36.27/arch/m68knommu/Kconfig
453--- linux-2.6.32.1/arch/m68knommu/Kconfig 2009-12-03 20:01:57.000000000 +0100
454+++ linux-2.6.32.1-vs2.3.0.36.27/arch/m68knommu/Kconfig 2009-12-03 20:04:56.000000000 +0100
7e46296a 455@@ -727,6 +727,8 @@ source "fs/Kconfig"
d337f35e
JR		 456
457 source "arch/m68knommu/Kconfig.debug"
458
459+source "kernel/vserver/Kconfig"
460+
461 source "security/Kconfig"
462
463 source "crypto/Kconfig"
ef116bc3
AM		 464diff -NurpP --minimal linux-2.6.32.1/arch/m68knommu/kernel/traps.c linux-2.6.32.1-vs2.3.0.36.27/arch/m68knommu/kernel/traps.c
465--- linux-2.6.32.1/arch/m68knommu/kernel/traps.c 2009-09-10 15:25:23.000000000 +0200
466+++ linux-2.6.32.1-vs2.3.0.36.27/arch/m68knommu/kernel/traps.c 2009-12-03 20:04:56.000000000 +0100
ec22aa5c 467@@ -78,8 +78,9 @@ void die_if_kernel(char *str, struct pt_
d337f35e
JR		 468 printk(KERN_EMERG "d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
469 fp->d4, fp->d5, fp->a0, fp->a1);
470
471- printk(KERN_EMERG "Process %s (pid: %d, stackpage=%08lx)\n",
472- current->comm, current->pid, PAGE_SIZE+(unsigned long)current);
473+ printk(KERN_EMERG "Process %s (pid: %d[#%u], stackpage=%08lx)\n",
2380c486 474+ current->comm, task_pid_nr(current), current->xid,
d337f35e 475+ PAGE_SIZE+(unsigned long)current);
2380c486
JR		 476 show_stack(NULL, (unsigned long *)(fp + 1));
477 add_taint(TAINT_DIE);
d337f35e 478 do_exit(SIGSEGV);
ef116bc3
AM		 479diff -NurpP --minimal linux-2.6.32.1/arch/microblaze/mm/fault.c linux-2.6.32.1-vs2.3.0.36.27/arch/microblaze/mm/fault.c
480--- linux-2.6.32.1/arch/microblaze/mm/fault.c 2009-09-10 15:25:24.000000000 +0200
481+++ linux-2.6.32.1-vs2.3.0.36.27/arch/microblaze/mm/fault.c 2009-12-03 20:04:56.000000000 +0100
4a036bed
AM		 482@@ -279,7 +279,8 @@ out_of_memory:
483 goto survive;
484 }
485 up_read(&mm->mmap_sem);
486- printk(KERN_WARNING "VM: killing process %s\n", current->comm);
487+ printk(KERN_WARNING "VM: killing process %s(%d:#%u)\n",
488+ current->comm, task_pid_nr(current), current->xid);
489 if (user_mode(regs))
490 do_exit(SIGKILL);
491 bad_page_fault(regs, address, SIGKILL);
ef116bc3
AM		 492diff -NurpP --minimal linux-2.6.32.1/arch/mips/Kconfig linux-2.6.32.1-vs2.3.0.36.27/arch/mips/Kconfig
493--- linux-2.6.32.1/arch/mips/Kconfig 2009-12-03 20:01:58.000000000 +0100
494+++ linux-2.6.32.1-vs2.3.0.36.27/arch/mips/Kconfig 2009-12-03 20:04:56.000000000 +0100
7e46296a 495@@ -2188,6 +2188,8 @@ source "fs/Kconfig"
d337f35e
JR		 496
497 source "arch/mips/Kconfig.debug"
498
499+source "kernel/vserver/Kconfig"
500+
501 source "security/Kconfig"
502
503 source "crypto/Kconfig"
ef116bc3
AM		 504diff -NurpP --minimal linux-2.6.32.1/arch/mips/kernel/ptrace.c linux-2.6.32.1-vs2.3.0.36.27/arch/mips/kernel/ptrace.c
505--- linux-2.6.32.1/arch/mips/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
506+++ linux-2.6.32.1-vs2.3.0.36.27/arch/mips/kernel/ptrace.c 2009-12-03 20:04:56.000000000 +0100
2380c486 507@@ -25,6 +25,7 @@
d337f35e 508 #include <linux/security.h>
2380c486
JR		 509 #include <linux/audit.h>
510 #include <linux/seccomp.h>
d337f35e
JR		 511+#include <linux/vs_base.h>
512
513 #include <asm/byteorder.h>
514 #include <asm/cpu.h>
ec22aa5c 515@@ -259,6 +260,9 @@ long arch_ptrace(struct task_struct *chi
d337f35e
JR		 516 {
517 int ret;
518
2380c486 519+ if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT))
d337f35e
JR		 520+ goto out;
521+
522 switch (request) {
523 /* when I and D space are separate, these will need to be fixed. */
524 case PTRACE_PEEKTEXT: /* read word at location addr. */
ef116bc3
AM		 525diff -NurpP --minimal linux-2.6.32.1/arch/mips/kernel/scall32-o32.S linux-2.6.32.1-vs2.3.0.36.27/arch/mips/kernel/scall32-o32.S
526--- linux-2.6.32.1/arch/mips/kernel/scall32-o32.S 2009-12-03 20:01:59.000000000 +0100
527+++ linux-2.6.32.1-vs2.3.0.36.27/arch/mips/kernel/scall32-o32.S 2009-12-03 20:04:56.000000000 +0100
7e46296a 528@@ -525,7 +525,7 @@ einval: li v0, -ENOSYS
d337f35e
JR		 529 sys sys_mq_timedreceive 5
530 sys sys_mq_notify 2 /* 4275 */
531 sys sys_mq_getsetattr 3
532- sys sys_ni_syscall 0 /* sys_vserver */
533+ sys sys_vserver 3
534 sys sys_waitid 5
535 sys sys_ni_syscall 0 /* available, was setaltroot */
536 sys sys_add_key 5 /* 4280 */
ef116bc3
AM		 537diff -NurpP --minimal linux-2.6.32.1/arch/mips/kernel/scall64-64.S linux-2.6.32.1-vs2.3.0.36.27/arch/mips/kernel/scall64-64.S
538--- linux-2.6.32.1/arch/mips/kernel/scall64-64.S 2009-12-03 20:01:59.000000000 +0100
539+++ linux-2.6.32.1-vs2.3.0.36.27/arch/mips/kernel/scall64-64.S 2009-12-03 20:04:56.000000000 +0100
7e46296a 540@@ -362,7 +362,7 @@ sys_call_table:
d337f35e
JR		 541 PTR sys_mq_timedreceive
542 PTR sys_mq_notify
543 PTR sys_mq_getsetattr /* 5235 */
544- PTR sys_ni_syscall /* sys_vserver */
545+ PTR sys_vserver
546 PTR sys_waitid
547 PTR sys_ni_syscall /* available, was setaltroot */
548 PTR sys_add_key
ef116bc3
AM		 549diff -NurpP --minimal linux-2.6.32.1/arch/mips/kernel/scall64-n32.S linux-2.6.32.1-vs2.3.0.36.27/arch/mips/kernel/scall64-n32.S
550--- linux-2.6.32.1/arch/mips/kernel/scall64-n32.S 2009-12-03 20:01:59.000000000 +0100
551+++ linux-2.6.32.1-vs2.3.0.36.27/arch/mips/kernel/scall64-n32.S 2009-12-03 20:04:56.000000000 +0100
d337f35e
JR		 552@@ -360,7 +360,7 @@ EXPORT(sysn32_call_table)
553 PTR compat_sys_mq_timedreceive
554 PTR compat_sys_mq_notify
555 PTR compat_sys_mq_getsetattr
556- PTR sys_ni_syscall /* 6240, sys_vserver */
557+ PTR sys32_vserver /* 6240 */
2380c486 558 PTR compat_sys_waitid
d337f35e
JR		 559 PTR sys_ni_syscall /* available, was setaltroot */
560 PTR sys_add_key
ef116bc3
AM		 561diff -NurpP --minimal linux-2.6.32.1/arch/mips/kernel/scall64-o32.S linux-2.6.32.1-vs2.3.0.36.27/arch/mips/kernel/scall64-o32.S
562--- linux-2.6.32.1/arch/mips/kernel/scall64-o32.S 2009-12-03 20:01:59.000000000 +0100
563+++ linux-2.6.32.1-vs2.3.0.36.27/arch/mips/kernel/scall64-o32.S 2009-12-03 20:04:56.000000000 +0100
ec22aa5c 564@@ -480,7 +480,7 @@ sys_call_table:
d337f35e
JR		 565 PTR compat_sys_mq_timedreceive
566 PTR compat_sys_mq_notify /* 4275 */
567 PTR compat_sys_mq_getsetattr
568- PTR sys_ni_syscall /* sys_vserver */
569+ PTR sys32_vserver
2380c486 570 PTR sys_32_waitid
d337f35e
JR		 571 PTR sys_ni_syscall /* available, was setaltroot */
572 PTR sys_add_key /* 4280 */
ef116bc3
AM		 573diff -NurpP --minimal linux-2.6.32.1/arch/mips/kernel/traps.c linux-2.6.32.1-vs2.3.0.36.27/arch/mips/kernel/traps.c
574--- linux-2.6.32.1/arch/mips/kernel/traps.c 2009-12-03 20:01:59.000000000 +0100
575+++ linux-2.6.32.1-vs2.3.0.36.27/arch/mips/kernel/traps.c 2009-12-03 20:04:56.000000000 +0100
ec22aa5c 576@@ -335,9 +335,10 @@ void show_registers(const struct pt_regs
2380c486
JR		 577
578 __show_regs(regs);
d337f35e 579 print_modules();
2380c486
JR		 580- printk("Process %s (pid: %d, threadinfo=%p, task=%p, tls=%0*lx)\n",
581- current->comm, current->pid, current_thread_info(), current,
582- field, current_thread_info()->tp_value);
583+ printk("Process %s (pid: %d:#%u, threadinfo=%p, task=%p, tls=%0*lx)\n",
584+ current->comm, task_pid_nr(current), current->xid,
585+ current_thread_info(), current,
586+ field, current_thread_info()->tp_value);
587 if (cpu_has_userlocal) {
588 unsigned long tls;
589
ef116bc3
AM		 590diff -NurpP --minimal linux-2.6.32.1/arch/mn10300/mm/fault.c linux-2.6.32.1-vs2.3.0.36.27/arch/mn10300/mm/fault.c
591--- linux-2.6.32.1/arch/mn10300/mm/fault.c 2009-09-10 15:25:39.000000000 +0200
592+++ linux-2.6.32.1-vs2.3.0.36.27/arch/mn10300/mm/fault.c 2009-12-03 20:04:56.000000000 +0100
4a036bed
AM		 593@@ -339,7 +339,8 @@ no_context:
594 out_of_memory:
595 up_read(&mm->mmap_sem);
596 monitor_signal(regs);
597- printk(KERN_ALERT "VM: killing process %s\n", tsk->comm);
598+ printk(KERN_ALERT "VM: killing process %s(%d:#%u)\n",
599+ tsk->comm, task_pid_nr(tsk), tsk->xid);
600 if ((fault_code & MMUFCR_xFC_ACCESS) == MMUFCR_xFC_ACCESS_USR)
601 do_exit(SIGKILL);
602 goto no_context;
ef116bc3
AM		 603diff -NurpP --minimal linux-2.6.32.1/arch/parisc/Kconfig linux-2.6.32.1-vs2.3.0.36.27/arch/parisc/Kconfig
604--- linux-2.6.32.1/arch/parisc/Kconfig 2009-12-03 20:02:00.000000000 +0100
605+++ linux-2.6.32.1-vs2.3.0.36.27/arch/parisc/Kconfig 2009-12-03 20:04:56.000000000 +0100
7e46296a 606@@ -294,6 +294,8 @@ source "fs/Kconfig"
d337f35e
JR		 607
608 source "arch/parisc/Kconfig.debug"
609
610+source "kernel/vserver/Kconfig"
611+
612 source "security/Kconfig"
613
614 source "crypto/Kconfig"
ef116bc3
AM		 615diff -NurpP --minimal linux-2.6.32.1/arch/parisc/kernel/syscall_table.S linux-2.6.32.1-vs2.3.0.36.27/arch/parisc/kernel/syscall_table.S
616--- linux-2.6.32.1/arch/parisc/kernel/syscall_table.S 2009-12-03 20:02:00.000000000 +0100
617+++ linux-2.6.32.1-vs2.3.0.36.27/arch/parisc/kernel/syscall_table.S 2009-12-03 20:04:56.000000000 +0100
2380c486 618@@ -361,7 +361,7 @@
d337f35e
JR		 619 ENTRY_COMP(mbind) /* 260 */
620 ENTRY_COMP(get_mempolicy)
621 ENTRY_COMP(set_mempolicy)
622- ENTRY_SAME(ni_syscall) /* 263: reserved for vserver */
623+ ENTRY_DIFF(vserver)
624 ENTRY_SAME(add_key)
625 ENTRY_SAME(request_key) /* 265 */
626 ENTRY_SAME(keyctl)
ef116bc3
AM		 627diff -NurpP --minimal linux-2.6.32.1/arch/parisc/kernel/traps.c linux-2.6.32.1-vs2.3.0.36.27/arch/parisc/kernel/traps.c
628--- linux-2.6.32.1/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200
629+++ linux-2.6.32.1-vs2.3.0.36.27/arch/parisc/kernel/traps.c 2009-12-03 20:04:56.000000000 +0100
2380c486 630@@ -236,8 +236,9 @@ void die_if_kernel(char *str, struct pt_
d337f35e
JR		 631 if (err == 0)
632 return; /* STFU */
633
634- printk(KERN_CRIT "%s (pid %d): %s (code %ld) at " RFMT "\n",
2380c486 635- current->comm, task_pid_nr(current), str, err, regs->iaoq[0]);
d337f35e 636+ printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld) at " RFMT "\n",
2380c486 637+ current->comm, task_pid_nr(current), current->xid,
d337f35e
JR		 638+ str, err, regs->iaoq[0]);
639 #ifdef PRINT_USER_FAULTS
640 /* XXX for debugging only */
641 show_regs(regs);
ec22aa5c 642@@ -270,8 +271,8 @@ void die_if_kernel(char *str, struct pt_
d337f35e
JR		 643 pdc_console_restart();
644
2380c486
JR		 645 if (err)
646- printk(KERN_CRIT "%s (pid %d): %s (code %ld)\n",
647- current->comm, task_pid_nr(current), str, err);
648+ printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld)\n",
649+ current->comm, task_pid_nr(current), current->xid, str, err);
650
651 /* Wot's wrong wif bein' racy? */
652 if (current->thread.flags & PARISC_KERNEL_DEATH) {
ef116bc3
AM		 653diff -NurpP --minimal linux-2.6.32.1/arch/parisc/mm/fault.c linux-2.6.32.1-vs2.3.0.36.27/arch/parisc/mm/fault.c
654--- linux-2.6.32.1/arch/parisc/mm/fault.c 2009-09-10 15:25:40.000000000 +0200
655+++ linux-2.6.32.1-vs2.3.0.36.27/arch/parisc/mm/fault.c 2009-12-03 20:04:56.000000000 +0100
ec22aa5c 656@@ -237,8 +237,9 @@ bad_area:
d337f35e
JR		 657
658 #ifdef PRINT_USER_FAULTS
659 printk(KERN_DEBUG "\n");
660- printk(KERN_DEBUG "do_page_fault() pid=%d command='%s' type=%lu address=0x%08lx\n",
2380c486 661- task_pid_nr(tsk), tsk->comm, code, address);
d337f35e
JR		 662+ printk(KERN_DEBUG "do_page_fault() pid=%d:#%u "
663+ "command='%s' type=%lu address=0x%08lx\n",
2380c486 664+ task_pid_nr(tsk), tsk->xid, tsk->comm, code, address);
d337f35e
JR		 665 if (vma) {
666 printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n",
667 vma->vm_start, vma->vm_end);
ec22aa5c 668@@ -264,7 +265,8 @@ no_context:
2380c486
JR		 669
670 out_of_memory:
671 up_read(&mm->mmap_sem);
672- printk(KERN_CRIT "VM: killing process %s\n", current->comm);
673+ printk(KERN_CRIT "VM: killing process %s(%d:#%u)\n",
674+ current->comm, current->pid, current->xid);
675 if (user_mode(regs))
676 do_group_exit(SIGKILL);
677 goto no_context;
ef116bc3
AM		 678diff -NurpP --minimal linux-2.6.32.1/arch/powerpc/include/asm/unistd.h linux-2.6.32.1-vs2.3.0.36.27/arch/powerpc/include/asm/unistd.h
679--- linux-2.6.32.1/arch/powerpc/include/asm/unistd.h 2009-12-03 20:02:01.000000000 +0100
680+++ linux-2.6.32.1-vs2.3.0.36.27/arch/powerpc/include/asm/unistd.h 2009-12-03 20:04:56.000000000 +0100
4a036bed
AM		 681@@ -275,7 +275,7 @@
682 #endif
683 #define __NR_rtas 255
684 #define __NR_sys_debug_setcontext 256
685-/* Number 257 is reserved for vserver */
06102837 686+#define __NR_vserver 257
4a036bed
AM		 687 #define __NR_migrate_pages 258
688 #define __NR_mbind 259
689 #define __NR_get_mempolicy 260
ef116bc3
AM		 690diff -NurpP --minimal linux-2.6.32.1/arch/powerpc/Kconfig linux-2.6.32.1-vs2.3.0.36.27/arch/powerpc/Kconfig
691--- linux-2.6.32.1/arch/powerpc/Kconfig 2009-12-03 20:02:00.000000000 +0100
692+++ linux-2.6.32.1-vs2.3.0.36.27/arch/powerpc/Kconfig 2009-12-03 20:04:56.000000000 +0100
7e46296a 693@@ -943,6 +943,8 @@ source "lib/Kconfig"
d337f35e
JR		 694
695 source "arch/powerpc/Kconfig.debug"
696
697+source "kernel/vserver/Kconfig"
698+
699 source "security/Kconfig"
700
701 config KEYS_COMPAT
ef116bc3
AM		 702diff -NurpP --minimal linux-2.6.32.1/arch/powerpc/kernel/irq.c linux-2.6.32.1-vs2.3.0.36.27/arch/powerpc/kernel/irq.c
703--- linux-2.6.32.1/arch/powerpc/kernel/irq.c 2009-12-03 20:02:01.000000000 +0100
704+++ linux-2.6.32.1-vs2.3.0.36.27/arch/powerpc/kernel/irq.c 2009-12-03 20:04:56.000000000 +0100
ec22aa5c 705@@ -54,6 +54,7 @@
d337f35e 706 #include <linux/pci.h>
2380c486 707 #include <linux/debugfs.h>
7e46296a
AM		 708 #include <linux/perf_event.h>
709+// #include <linux/vs_context.h>
d337f35e
JR		 710
711 #include <asm/uaccess.h>
712 #include <asm/system.h>
ef116bc3
AM		 713diff -NurpP --minimal linux-2.6.32.1/arch/powerpc/kernel/process.c linux-2.6.32.1-vs2.3.0.36.27/arch/powerpc/kernel/process.c
714--- linux-2.6.32.1/arch/powerpc/kernel/process.c 2009-12-03 20:02:02.000000000 +0100
715+++ linux-2.6.32.1-vs2.3.0.36.27/arch/powerpc/kernel/process.c 2009-12-03 20:04:56.000000000 +0100
ec22aa5c 716@@ -519,8 +519,9 @@ void show_regs(struct pt_regs * regs)
2380c486 717 #else
d337f35e 718 printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr);
2380c486 719 #endif
d337f35e 720- printk("TASK = %p[%d] '%s' THREAD: %p",
2380c486 721- current, task_pid_nr(current), current->comm, task_thread_info(current));
d337f35e 722+ printk("TASK = %p[%d,#%u] '%s' THREAD: %p",
2380c486 723+ current, task_pid_nr(current), current->xid,
d337f35e
JR		 724+ current->comm, task_thread_info(current));
725
726 #ifdef CONFIG_SMP
2380c486 727 printk(" CPU: %d", raw_smp_processor_id());
ef116bc3
AM		 728diff -NurpP --minimal linux-2.6.32.1/arch/powerpc/kernel/traps.c linux-2.6.32.1-vs2.3.0.36.27/arch/powerpc/kernel/traps.c
729--- linux-2.6.32.1/arch/powerpc/kernel/traps.c 2009-09-10 15:25:41.000000000 +0200
730+++ linux-2.6.32.1-vs2.3.0.36.27/arch/powerpc/kernel/traps.c 2009-12-03 20:04:56.000000000 +0100
ec22aa5c 731@@ -931,8 +931,9 @@ void nonrecoverable_exception(struct pt_
d337f35e
JR		 732
733 void trace_syscall(struct pt_regs *regs)
734 {
735- printk("Task: %p(%d), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n",
2380c486 736- current, task_pid_nr(current), regs->nip, regs->link, regs->gpr[0],
d337f35e 737+ printk("Task: %p(%d[#%u]), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n",
2380c486 738+ current, task_pid_nr(current), current->xid,
d337f35e
JR		 739+ regs->nip, regs->link, regs->gpr[0],
740 regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
741 }
742
ef116bc3
AM		 743diff -NurpP --minimal linux-2.6.32.1/arch/powerpc/kernel/vdso.c linux-2.6.32.1-vs2.3.0.36.27/arch/powerpc/kernel/vdso.c
744--- linux-2.6.32.1/arch/powerpc/kernel/vdso.c 2009-12-03 20:02:02.000000000 +0100
745+++ linux-2.6.32.1-vs2.3.0.36.27/arch/powerpc/kernel/vdso.c 2009-12-03 20:04:56.000000000 +0100
7e46296a 746@@ -23,6 +23,7 @@
d337f35e
JR		 747 #include <linux/security.h>
748 #include <linux/bootmem.h>
2380c486 749 #include <linux/lmb.h>
d337f35e
JR		 750+#include <linux/vs_memory.h>
751
752 #include <asm/pgtable.h>
753 #include <asm/system.h>
ef116bc3
AM		 754diff -NurpP --minimal linux-2.6.32.1/arch/powerpc/mm/fault.c linux-2.6.32.1-vs2.3.0.36.27/arch/powerpc/mm/fault.c
755--- linux-2.6.32.1/arch/powerpc/mm/fault.c 2009-12-03 20:02:02.000000000 +0100
756+++ linux-2.6.32.1-vs2.3.0.36.27/arch/powerpc/mm/fault.c 2009-12-03 20:04:56.000000000 +0100
ec22aa5c 757@@ -358,7 +358,8 @@ out_of_memory:
2380c486
JR		 758 down_read(&mm->mmap_sem);
759 goto survive;
760 }
761- printk("VM: killing process %s\n", current->comm);
762+ printk("VM: killing process %s(%d:#%u)\n",
763+ current->comm, current->pid, current->xid);
764 if (user_mode(regs))
765 do_group_exit(SIGKILL);
766 return SIGKILL;
ef116bc3
AM		 767diff -NurpP --minimal linux-2.6.32.1/arch/s390/Kconfig linux-2.6.32.1-vs2.3.0.36.27/arch/s390/Kconfig
768--- linux-2.6.32.1/arch/s390/Kconfig 2009-12-03 20:02:03.000000000 +0100
769+++ linux-2.6.32.1-vs2.3.0.36.27/arch/s390/Kconfig 2009-12-03 20:04:56.000000000 +0100
7e46296a 770@@ -616,6 +616,8 @@ source "fs/Kconfig"
d337f35e
JR		 771
772 source "arch/s390/Kconfig.debug"
773
774+source "kernel/vserver/Kconfig"
775+
776 source "security/Kconfig"
777
778 source "crypto/Kconfig"
ef116bc3
AM		 779diff -NurpP --minimal linux-2.6.32.1/arch/s390/kernel/ptrace.c linux-2.6.32.1-vs2.3.0.36.27/arch/s390/kernel/ptrace.c
780--- linux-2.6.32.1/arch/s390/kernel/ptrace.c 2009-12-03 20:02:03.000000000 +0100
781+++ linux-2.6.32.1-vs2.3.0.36.27/arch/s390/kernel/ptrace.c 2009-12-03 20:04:56.000000000 +0100
ec22aa5c 782@@ -36,6 +36,7 @@
2380c486 783 #include <linux/regset.h>
ec22aa5c
AM		 784 #include <linux/tracehook.h>
785 #include <linux/seccomp.h>
d337f35e 786+#include <linux/vs_base.h>
ec22aa5c
AM		 787 #include <trace/syscall.h>
788 #include <asm/compat.h>
d337f35e 789 #include <asm/segment.h>
ef116bc3
AM		 790diff -NurpP --minimal linux-2.6.32.1/arch/s390/kernel/syscalls.S linux-2.6.32.1-vs2.3.0.36.27/arch/s390/kernel/syscalls.S
791--- linux-2.6.32.1/arch/s390/kernel/syscalls.S 2009-12-03 20:02:03.000000000 +0100
792+++ linux-2.6.32.1-vs2.3.0.36.27/arch/s390/kernel/syscalls.S 2009-12-03 20:04:56.000000000 +0100
d337f35e
JR		 793@@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett
794 SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper) /* 260 */
795 SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper)
796 SYSCALL(sys_clock_nanosleep,sys_clock_nanosleep,sys32_clock_nanosleep_wrapper)
797-NI_SYSCALL /* reserved for vserver */
798+SYSCALL(sys_vserver,sys_vserver,sys32_vserver)
2380c486 799 SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper)
d337f35e
JR		 800 SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper)
801 SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper)
ef116bc3
AM		 802diff -NurpP --minimal linux-2.6.32.1/arch/s390/lib/uaccess_pt.c linux-2.6.32.1-vs2.3.0.36.27/arch/s390/lib/uaccess_pt.c
803--- linux-2.6.32.1/arch/s390/lib/uaccess_pt.c 2009-09-10 15:25:43.000000000 +0200
804+++ linux-2.6.32.1-vs2.3.0.36.27/arch/s390/lib/uaccess_pt.c 2009-12-03 20:04:56.000000000 +0100
4a036bed
AM		 805@@ -90,7 +90,8 @@ out_of_memory:
806 down_read(&mm->mmap_sem);
807 goto survive;
808 }
809- printk("VM: killing process %s\n", current->comm);
810+ printk("VM: killing process %s(%d:#%u)\n",
811+ current->comm, task_pid_nr(current), current->xid);
812 return ret;
813
814 out_sigbus:
ef116bc3
AM		 815diff -NurpP --minimal linux-2.6.32.1/arch/sh/Kconfig linux-2.6.32.1-vs2.3.0.36.27/arch/sh/Kconfig
816--- linux-2.6.32.1/arch/sh/Kconfig 2009-12-03 20:02:03.000000000 +0100
817+++ linux-2.6.32.1-vs2.3.0.36.27/arch/sh/Kconfig 2009-12-03 20:04:56.000000000 +0100
7e46296a 818@@ -853,6 +853,8 @@ source "fs/Kconfig"
d337f35e
JR		 819
820 source "arch/sh/Kconfig.debug"
821
822+source "kernel/vserver/Kconfig"
823+
824 source "security/Kconfig"
825
826 source "crypto/Kconfig"
ef116bc3
AM		 827diff -NurpP --minimal linux-2.6.32.1/arch/sh/kernel/irq.c linux-2.6.32.1-vs2.3.0.36.27/arch/sh/kernel/irq.c
828--- linux-2.6.32.1/arch/sh/kernel/irq.c 2009-12-03 20:02:10.000000000 +0100
829+++ linux-2.6.32.1-vs2.3.0.36.27/arch/sh/kernel/irq.c 2009-12-03 20:04:56.000000000 +0100
7e46296a 830@@ -12,6 +12,7 @@
d337f35e
JR		 831 #include <linux/kernel_stat.h>
832 #include <linux/seq_file.h>
7e46296a
AM		 833 #include <linux/ftrace.h>
834+// #include <linux/vs_context.h>
d337f35e 835 #include <asm/processor.h>
2380c486 836 #include <asm/machvec.h>
d337f35e 837 #include <asm/uaccess.h>
ef116bc3
AM		 838diff -NurpP --minimal linux-2.6.32.1/arch/sh/kernel/vsyscall/vsyscall.c linux-2.6.32.1-vs2.3.0.36.27/arch/sh/kernel/vsyscall/vsyscall.c
839--- linux-2.6.32.1/arch/sh/kernel/vsyscall/vsyscall.c 2009-03-24 14:18:42.000000000 +0100
840+++ linux-2.6.32.1-vs2.3.0.36.27/arch/sh/kernel/vsyscall/vsyscall.c 2009-12-03 20:04:56.000000000 +0100
2380c486 841@@ -19,6 +19,7 @@
d337f35e 842 #include <linux/elf.h>
2380c486
JR		 843 #include <linux/sched.h>
844 #include <linux/err.h>
d337f35e
JR		 845+#include <linux/vs_memory.h>
846
847 /*
848 * Should the kernel map a VDSO page into processes and pass its
ef116bc3
AM		 849diff -NurpP --minimal linux-2.6.32.1/arch/sh/mm/fault_32.c linux-2.6.32.1-vs2.3.0.36.27/arch/sh/mm/fault_32.c
850--- linux-2.6.32.1/arch/sh/mm/fault_32.c 2009-12-03 20:02:14.000000000 +0100
851+++ linux-2.6.32.1-vs2.3.0.36.27/arch/sh/mm/fault_32.c 2009-12-03 20:04:56.000000000 +0100
7e46296a 852@@ -292,7 +292,8 @@ out_of_memory:
4a036bed
AM		 853 down_read(&mm->mmap_sem);
854 goto survive;
855 }
856- printk("VM: killing process %s\n", tsk->comm);
857+ printk("VM: killing process %s(%d:#%u)\n",
858+ tsk->comm, task_pid_nr(tsk), tsk->xid);
859 if (user_mode(regs))
860 do_group_exit(SIGKILL);
861 goto no_context;
ef116bc3
AM		 862diff -NurpP --minimal linux-2.6.32.1/arch/sh/mm/tlbflush_64.c linux-2.6.32.1-vs2.3.0.36.27/arch/sh/mm/tlbflush_64.c
863--- linux-2.6.32.1/arch/sh/mm/tlbflush_64.c 2009-12-03 20:02:14.000000000 +0100
864+++ linux-2.6.32.1-vs2.3.0.36.27/arch/sh/mm/tlbflush_64.c 2009-12-03 20:04:56.000000000 +0100
4a036bed
AM		 865@@ -306,7 +306,8 @@ out_of_memory:
866 down_read(&mm->mmap_sem);
867 goto survive;
868 }
869- printk("VM: killing process %s\n", tsk->comm);
870+ printk("VM: killing process %s(%d:#%u)\n",
871+ tsk->comm, task_pid_nr(tsk), tsk->xid);
872 if (user_mode(regs))
873 do_group_exit(SIGKILL);
874 goto no_context;
ef116bc3
AM		 875diff -NurpP --minimal linux-2.6.32.1/arch/sparc/include/asm/tlb_64.h linux-2.6.32.1-vs2.3.0.36.27/arch/sparc/include/asm/tlb_64.h
876--- linux-2.6.32.1/arch/sparc/include/asm/tlb_64.h 2009-09-10 15:25:45.000000000 +0200
877+++ linux-2.6.32.1-vs2.3.0.36.27/arch/sparc/include/asm/tlb_64.h 2009-12-03 20:04:56.000000000 +0100
ec22aa5c
AM		 878@@ -3,6 +3,7 @@
879
880 #include <linux/swap.h>
881 #include <linux/pagemap.h>
882+#include <linux/vs_memory.h>
883 #include <asm/pgalloc.h>
884 #include <asm/tlbflush.h>
885 #include <asm/mmu_context.h>
ef116bc3
AM		 886diff -NurpP --minimal linux-2.6.32.1/arch/sparc/include/asm/unistd.h linux-2.6.32.1-vs2.3.0.36.27/arch/sparc/include/asm/unistd.h
887--- linux-2.6.32.1/arch/sparc/include/asm/unistd.h 2009-12-03 20:02:15.000000000 +0100
888+++ linux-2.6.32.1-vs2.3.0.36.27/arch/sparc/include/asm/unistd.h 2009-12-03 20:04:56.000000000 +0100
ec22aa5c
AM		 889@@ -335,7 +335,7 @@
890 #define __NR_timer_getoverrun 264
891 #define __NR_timer_delete 265
892 #define __NR_timer_create 266
893-/* #define __NR_vserver 267 Reserved for VSERVER */
894+#define __NR_vserver 267
895 #define __NR_io_setup 268
896 #define __NR_io_destroy 269
897 #define __NR_io_submit 270
ef116bc3
AM		 898diff -NurpP --minimal linux-2.6.32.1/arch/sparc/Kconfig linux-2.6.32.1-vs2.3.0.36.27/arch/sparc/Kconfig
899--- linux-2.6.32.1/arch/sparc/Kconfig 2009-12-03 20:02:14.000000000 +0100
900+++ linux-2.6.32.1-vs2.3.0.36.27/arch/sparc/Kconfig 2009-12-03 20:04:56.000000000 +0100
7e46296a 901@@ -550,6 +550,8 @@ source "fs/Kconfig"
d337f35e
JR		 902
903 source "arch/sparc/Kconfig.debug"
904
905+source "kernel/vserver/Kconfig"
906+
907 source "security/Kconfig"
908
909 source "crypto/Kconfig"
ef116bc3
AM		 910diff -NurpP --minimal linux-2.6.32.1/arch/sparc/kernel/systbls_32.S linux-2.6.32.1-vs2.3.0.36.27/arch/sparc/kernel/systbls_32.S
911--- linux-2.6.32.1/arch/sparc/kernel/systbls_32.S 2009-12-03 20:02:15.000000000 +0100
912+++ linux-2.6.32.1-vs2.3.0.36.27/arch/sparc/kernel/systbls_32.S 2009-12-03 20:04:56.000000000 +0100
50e68740
JR		 913@@ -70,7 +70,7 @@ sys_call_table:
914 /*250*/ .long sparc_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
915 /*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
916 /*260*/ .long sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
917-/*265*/ .long sys_timer_delete, sys_timer_create, sys_nis_syscall, sys_io_setup, sys_io_destroy
918+/*265*/ .long sys_timer_delete, sys_timer_create, sys_vserver, sys_io_setup, sys_io_destroy
919 /*270*/ .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
920 /*275*/ .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
921 /*280*/ .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
ef116bc3
AM		 922diff -NurpP --minimal linux-2.6.32.1/arch/sparc/kernel/systbls_64.S linux-2.6.32.1-vs2.3.0.36.27/arch/sparc/kernel/systbls_64.S
923--- linux-2.6.32.1/arch/sparc/kernel/systbls_64.S 2009-12-03 20:02:15.000000000 +0100
924+++ linux-2.6.32.1-vs2.3.0.36.27/arch/sparc/kernel/systbls_64.S 2009-12-03 20:04:56.000000000 +0100
50e68740
JR		 925@@ -71,7 +71,7 @@ sys_call_table32:
926 /*250*/ .word sys32_mremap, sys32_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl
927 .word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
928 /*260*/ .word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, sys32_timer_settime, compat_sys_timer_gettime, sys_timer_getoverrun
929- .word sys_timer_delete, compat_sys_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy
930+ .word sys_timer_delete, compat_sys_timer_create, sys32_vserver, compat_sys_io_setup, sys_io_destroy
931 /*270*/ .word sys32_io_submit, sys_io_cancel, compat_sys_io_getevents, sys32_mq_open, sys_mq_unlink
932 .word compat_sys_mq_timedsend, compat_sys_mq_timedreceive, compat_sys_mq_notify, compat_sys_mq_getsetattr, compat_sys_waitid
933 /*280*/ .word sys32_tee, sys_add_key, sys_request_key, sys_keyctl, compat_sys_openat
ec22aa5c 934@@ -146,7 +146,7 @@ sys_call_table:
50e68740
JR		 935 /*250*/ .word sys_64_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
936 .word sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
937 /*260*/ .word sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
938- .word sys_timer_delete, sys_timer_create, sys_ni_syscall, sys_io_setup, sys_io_destroy
939+ .word sys_timer_delete, sys_timer_create, sys_vserver, sys_io_setup, sys_io_destroy
940 /*270*/ .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
941 .word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
942 /*280*/ .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
ef116bc3
AM		 943diff -NurpP --minimal linux-2.6.32.1/arch/x86/ia32/ia32entry.S linux-2.6.32.1-vs2.3.0.36.27/arch/x86/ia32/ia32entry.S
944--- linux-2.6.32.1/arch/x86/ia32/ia32entry.S 2009-12-03 20:02:15.000000000 +0100
945+++ linux-2.6.32.1-vs2.3.0.36.27/arch/x86/ia32/ia32entry.S 2009-12-03 20:04:56.000000000 +0100
1d9ef1d9 946@@ -777,7 +777,7 @@ ia32_sys_call_table:
2380c486
JR		 947 .quad sys_tgkill /* 270 */
948 .quad compat_sys_utimes
949 .quad sys32_fadvise64_64
950- .quad quiet_ni_syscall /* sys_vserver */
951+ .quad sys32_vserver
952 .quad sys_mbind
953 .quad compat_sys_get_mempolicy /* 275 */
954 .quad sys_set_mempolicy
ef116bc3
AM		 955diff -NurpP --minimal linux-2.6.32.1/arch/x86/include/asm/unistd_64.h linux-2.6.32.1-vs2.3.0.36.27/arch/x86/include/asm/unistd_64.h
956--- linux-2.6.32.1/arch/x86/include/asm/unistd_64.h 2009-12-03 20:02:16.000000000 +0100
957+++ linux-2.6.32.1-vs2.3.0.36.27/arch/x86/include/asm/unistd_64.h 2009-12-03 20:04:56.000000000 +0100
ec22aa5c
AM		 958@@ -535,7 +535,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill)
959 #define __NR_utimes 235
960 __SYSCALL(__NR_utimes, sys_utimes)
961 #define __NR_vserver 236
962-__SYSCALL(__NR_vserver, sys_ni_syscall)
963+__SYSCALL(__NR_vserver, sys_vserver)
964 #define __NR_mbind 237
965 __SYSCALL(__NR_mbind, sys_mbind)
966 #define __NR_set_mempolicy 238
ef116bc3
AM		 967diff -NurpP --minimal linux-2.6.32.1/arch/x86/Kconfig linux-2.6.32.1-vs2.3.0.36.27/arch/x86/Kconfig
968--- linux-2.6.32.1/arch/x86/Kconfig 2009-12-03 20:02:15.000000000 +0100
969+++ linux-2.6.32.1-vs2.3.0.36.27/arch/x86/Kconfig 2009-12-03 20:04:56.000000000 +0100
7e46296a 970@@ -2085,6 +2085,8 @@ source "fs/Kconfig"
d337f35e 971
2380c486 972 source "arch/x86/Kconfig.debug"
d337f35e
JR		 973
974+source "kernel/vserver/Kconfig"
975+
976 source "security/Kconfig"
977
978 source "crypto/Kconfig"
ef116bc3
AM		 979diff -NurpP --minimal linux-2.6.32.1/arch/x86/kernel/syscall_table_32.S linux-2.6.32.1-vs2.3.0.36.27/arch/x86/kernel/syscall_table_32.S
980--- linux-2.6.32.1/arch/x86/kernel/syscall_table_32.S 2009-12-03 20:02:16.000000000 +0100
981+++ linux-2.6.32.1-vs2.3.0.36.27/arch/x86/kernel/syscall_table_32.S 2009-12-03 20:04:56.000000000 +0100
2380c486
JR		 982@@ -272,7 +272,7 @@ ENTRY(sys_call_table)
983 .long sys_tgkill /* 270 */
984 .long sys_utimes
985 .long sys_fadvise64_64
986- .long sys_ni_syscall /* sys_vserver */
987+ .long sys_vserver
988 .long sys_mbind
989 .long sys_get_mempolicy
990 .long sys_set_mempolicy
ef116bc3
AM		 991diff -NurpP --minimal linux-2.6.32.1/arch/xtensa/mm/fault.c linux-2.6.32.1-vs2.3.0.36.27/arch/xtensa/mm/fault.c
992--- linux-2.6.32.1/arch/xtensa/mm/fault.c 2009-09-10 15:25:48.000000000 +0200
993+++ linux-2.6.32.1-vs2.3.0.36.27/arch/xtensa/mm/fault.c 2009-12-03 20:04:56.000000000 +0100
4a036bed
AM		 994@@ -151,7 +151,8 @@ out_of_memory:
995 down_read(&mm->mmap_sem);
996 goto survive;
997 }
998- printk("VM: killing process %s\n", current->comm);
999+ printk("VM: killing process %s(%d:#%u)\n",
1000+ current->comm, task_pid_nr(current), current->xid);
1001 if (user_mode(regs))
1002 do_group_exit(SIGKILL);
1003 bad_page_fault(regs, address, SIGKILL);
ef116bc3
AM		 1004diff -NurpP --minimal linux-2.6.32.1/Documentation/scheduler/sched-cfs-hard-limits.txt linux-2.6.32.1-vs2.3.0.36.27/Documentation/scheduler/sched-cfs-hard-limits.txt
1005--- linux-2.6.32.1/Documentation/scheduler/sched-cfs-hard-limits.txt 1970-01-01 01:00:00.000000000 +0100
1006+++ linux-2.6.32.1-vs2.3.0.36.27/Documentation/scheduler/sched-cfs-hard-limits.txt 2009-12-03 20:04:56.000000000 +0100
7e46296a 1007@@ -0,0 +1,48 @@
4a036bed
AM		 1008+CPU HARD LIMITS FOR CFS GROUPS
1009+==============================
1010+
1011+1. Overview
1012+2. Interface
1013+3. Examples
1014+
1015+1. Overview
1016+-----------
1017+
1018+CFS is a proportional share scheduler which tries to divide the CPU time
1019+proportionately between tasks or groups of tasks (task group/cgroup) depending
1020+on the priority/weight of the task or shares assigned to groups of tasks.
1021+In CFS, a task/task group can get more than its share of CPU if there are
1022+enough idle CPU cycles available in the system, due to the work conserving
1023+nature of the scheduler. However in certain scenarios (like pay-per-use),
1024+it is desirable not to provide extra time to a group even in the presence
1025+of idle CPU cycles. This is where hard limiting can be of use.
1026+
1027+Hard limits for task groups can be set by specifying how much CPU runtime a
1028+group can consume within a given period. If the group consumes more CPU time
1029+than the runtime in a given period, it gets throttled. None of the tasks of
1030+the throttled group gets to run until the runtime of the group gets refreshed
1031+at the beginning of the next period.
1032+
1033+2. Interface
1034+------------
1035+
7e46296a 1036+Hard limit feature adds 2 cgroup files for CFS group scheduler:
4a036bed
AM		 1037+
1038+cfs_runtime_us: Hard limit for the group in microseconds.
1039+
1040+cfs_period_us: Time period in microseconds within which hard limits is
1041+enforced.
1042+
7e46296a
AM		 1043+A group gets created with default values for runtime (infinite runtime which
1044+means hard limits disabled) and period (0.5s). Each group can set its own
1045+values for runtime and period independent of other groups in the system.
4a036bed
AM		 1046+
1047+3. Examples
1048+-----------
1049+
1050+# mount -t cgroup -ocpu none /cgroups/
1051+# cd /cgroups
1052+# mkdir 1
1053+# cd 1/
1054+# echo 250000 > cfs_runtime_us /* set a 250ms runtime or limit */
1055+# echo 500000 > cfs_period_us /* set a 500ms period */
ef116bc3
AM		 1056diff -NurpP --minimal linux-2.6.32.1/Documentation/vserver/debug.txt linux-2.6.32.1-vs2.3.0.36.27/Documentation/vserver/debug.txt
1057--- linux-2.6.32.1/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
1058+++ linux-2.6.32.1-vs2.3.0.36.27/Documentation/vserver/debug.txt 2009-12-03 20:04:56.000000000 +0100
2380c486 1059@@ -0,0 +1,154 @@
d337f35e 1060+
2380c486 1061+debug_cvirt:
d337f35e 1062+
2380c486
JR		 1063+ 2 4 "vx_map_tgid: %p/%llx: %d -> %d"
1064+ "vx_rmap_tgid: %p/%llx: %d -> %d"
d337f35e 1065+
2380c486 1066+debug_dlim:
d337f35e 1067+
2380c486
JR		 1068+ 0 1 "ALLOC (%p,#%d)%c inode (%d)"
1069+ "FREE (%p,#%d)%c inode"
1070+ 1 2 "ALLOC (%p,#%d)%c %lld bytes (%d)"
1071+ "FREE (%p,#%d)%c %lld bytes"
1072+ 2 4 "ADJUST: %lld,%lld on %ld,%ld [mult=%d]"
1073+ 3 8 "ext3_has_free_blocks(%p): %lu<%lu+1, %c, %u!=%u r=%d"
1074+ "ext3_has_free_blocks(%p): free=%lu, root=%lu"
1075+ "rcu_free_dl_info(%p)"
1076+ 4 10 "alloc_dl_info(%p,%d) = %p"
1077+ "dealloc_dl_info(%p)"
1078+ "get_dl_info(%p[#%d.%d])"
1079+ "put_dl_info(%p[#%d.%d])"
1080+ 5 20 "alloc_dl_info(%p,%d)*"
1081+ 6 40 "__hash_dl_info: %p[#%d]"
1082+ "__unhash_dl_info: %p[#%d]"
1083+ 7 80 "locate_dl_info(%p,#%d) = %p"
1084+
1085+debug_misc:
1086+
1087+ 0 1 "destroy_dqhash: %p [#0x%08x] c=%d"
1088+ "new_dqhash: %p [#0x%08x]"
1089+ "vroot[%d]_clr_dev: dev=%p[%lu,%d:%d]"
1090+ "vroot[%d]_get_real_bdev: dev=%p[%lu,%d:%d]"
1091+ "vroot[%d]_set_dev: dev=%p[%lu,%d:%d]"
1092+ "vroot_get_real_bdev not set"
1093