]> 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
- don't package genheaders twice
[packages/kernel.git] / kernel-vserver-2.3.patch
CommitLineData
e03b8c3c 1diff -NurpP --minimal linux-2.6.33/arch/alpha/Kconfig linux-2.6.33-vs2.3.0.36.30.3/arch/alpha/Kconfig
2bf5ad28 2--- linux-2.6.33/arch/alpha/Kconfig 2010-02-25 11:51:18.000000000 +0100
e03b8c3c 3+++ linux-2.6.33-vs2.3.0.36.30.3/arch/alpha/Kconfig 2010-02-25 12:02:16.000000000 +0100
2bf5ad28 4@@ -675,6 +675,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"
e03b8c3c 13diff -NurpP --minimal linux-2.6.33/arch/alpha/kernel/entry.S linux-2.6.33-vs2.3.0.36.30.3/arch/alpha/kernel/entry.S
2bf5ad28 14--- linux-2.6.33/arch/alpha/kernel/entry.S 2009-06-11 17:11:46.000000000 +0200
e03b8c3c 15+++ linux-2.6.33-vs2.3.0.36.30.3/arch/alpha/kernel/entry.S 2010-02-25 12:02:16.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
e03b8c3c 48diff -NurpP --minimal linux-2.6.33/arch/alpha/kernel/osf_sys.c linux-2.6.33-vs2.3.0.36.30.3/arch/alpha/kernel/osf_sys.c
2bf5ad28 49--- linux-2.6.33/arch/alpha/kernel/osf_sys.c 2010-02-25 11:51:19.000000000 +0100
e03b8c3c 50+++ linux-2.6.33-vs2.3.0.36.30.3/arch/alpha/kernel/osf_sys.c 2010-02-25 12:02:16.000000000 +0100
9390b158 51@@ -865,7 +865,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 }
e03b8c3c 60diff -NurpP --minimal linux-2.6.33/arch/alpha/kernel/ptrace.c linux-2.6.33-vs2.3.0.36.30.3/arch/alpha/kernel/ptrace.c
2bf5ad28 61--- linux-2.6.33/arch/alpha/kernel/ptrace.c 2009-09-10 15:25:14.000000000 +0200
e03b8c3c 62+++ linux-2.6.33-vs2.3.0.36.30.3/arch/alpha/kernel/ptrace.c 2010-02-25 12:02:16.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>
e03b8c3c 71diff -NurpP --minimal linux-2.6.33/arch/alpha/kernel/systbls.S linux-2.6.33-vs2.3.0.36.30.3/arch/alpha/kernel/systbls.S
2bf5ad28 72--- linux-2.6.33/arch/alpha/kernel/systbls.S 2010-02-25 11:51:19.000000000 +0100
e03b8c3c 73+++ linux-2.6.33-vs2.3.0.36.30.3/arch/alpha/kernel/systbls.S 2010-02-25 12:02:16.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 */
e03b8c3c 83diff -NurpP --minimal linux-2.6.33/arch/alpha/kernel/traps.c linux-2.6.33-vs2.3.0.36.30.3/arch/alpha/kernel/traps.c
2bf5ad28 84--- linux-2.6.33/arch/alpha/kernel/traps.c 2009-06-11 17:11:46.000000000 +0200
e03b8c3c 85+++ linux-2.6.33-vs2.3.0.36.30.3/arch/alpha/kernel/traps.c 2010-02-25 12:02:16.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));
e03b8c3c 96diff -NurpP --minimal linux-2.6.33/arch/alpha/mm/fault.c linux-2.6.33-vs2.3.0.36.30.3/arch/alpha/mm/fault.c
2bf5ad28 97--- linux-2.6.33/arch/alpha/mm/fault.c 2009-09-10 15:25:14.000000000 +0200
e03b8c3c 98+++ linux-2.6.33-vs2.3.0.36.30.3/arch/alpha/mm/fault.c 2010-02-25 12:02:16.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);
e03b8c3c 110diff -NurpP --minimal linux-2.6.33/arch/arm/include/asm/tlb.h linux-2.6.33-vs2.3.0.36.30.3/arch/arm/include/asm/tlb.h
2bf5ad28 111--- linux-2.6.33/arch/arm/include/asm/tlb.h 2009-09-10 15:25:15.000000000 +0200
e03b8c3c 112+++ linux-2.6.33-vs2.3.0.36.30.3/arch/arm/include/asm/tlb.h 2010-02-25 12:02:16.000000000 +0100
2bf5ad28
AM		 113@@ -27,6 +27,7 @@
114
115 #else /* !CONFIG_MMU */
116
117+#include <linux/vs_memory.h>
118 #include <asm/pgalloc.h>
119
120 /*
e03b8c3c 121diff -NurpP --minimal linux-2.6.33/arch/arm/Kconfig linux-2.6.33-vs2.3.0.36.30.3/arch/arm/Kconfig
2bf5ad28 122--- linux-2.6.33/arch/arm/Kconfig 2010-02-25 11:51:19.000000000 +0100
e03b8c3c 123+++ linux-2.6.33-vs2.3.0.36.30.3/arch/arm/Kconfig 2010-02-25 12:02:16.000000000 +0100
2bf5ad28 124@@ -1542,6 +1542,8 @@ source "fs/Kconfig"
d337f35e
JR		 125
126 source "arch/arm/Kconfig.debug"
127
128+source "kernel/vserver/Kconfig"
129+
130 source "security/Kconfig"
131
132 source "crypto/Kconfig"
e03b8c3c 133diff -NurpP --minimal linux-2.6.33/arch/arm/kernel/calls.S linux-2.6.33-vs2.3.0.36.30.3/arch/arm/kernel/calls.S
2bf5ad28 134--- linux-2.6.33/arch/arm/kernel/calls.S 2010-02-25 11:51:20.000000000 +0100
e03b8c3c 135+++ linux-2.6.33-vs2.3.0.36.30.3/arch/arm/kernel/calls.S 2010-02-25 12:02:16.000000000 +0100
d337f35e
JR		 136@@ -322,7 +322,7 @@
137 /* 310 */ CALL(sys_request_key)
138 CALL(sys_keyctl)
139 CALL(ABI(sys_semtimedop, sys_oabi_semtimedop))
140-/* vserver */ CALL(sys_ni_syscall)
141+ CALL(sys_vserver)
142 CALL(sys_ioprio_set)
143 /* 315 */ CALL(sys_ioprio_get)
144 CALL(sys_inotify_init)
e03b8c3c 145diff -NurpP --minimal linux-2.6.33/arch/arm/kernel/process.c linux-2.6.33-vs2.3.0.36.30.3/arch/arm/kernel/process.c
2bf5ad28 146--- linux-2.6.33/arch/arm/kernel/process.c 2010-02-25 11:51:20.000000000 +0100
e03b8c3c 147+++ linux-2.6.33-vs2.3.0.36.30.3/arch/arm/kernel/process.c 2010-02-25 12:02:16.000000000 +0100
2bf5ad28 148@@ -270,7 +270,8 @@ void __show_regs(struct pt_regs *regs)
d337f35e
JR		 149 void show_regs(struct pt_regs * regs)
150 {
151 printk("\n");
2380c486 152- printk("Pid: %d, comm: %20s\n", task_pid_nr(current), current->comm);
d337f35e 153+ printk("Pid: %d[#%u], comm: %20s\n",
2380c486 154+ task_pid_nr(current), current->xid, current->comm);
d337f35e
JR		 155 __show_regs(regs);
156 __backtrace();
157 }
e03b8c3c 158diff -NurpP --minimal linux-2.6.33/arch/arm/kernel/traps.c linux-2.6.33-vs2.3.0.36.30.3/arch/arm/kernel/traps.c
2bf5ad28 159--- linux-2.6.33/arch/arm/kernel/traps.c 2009-12-03 20:01:50.000000000 +0100
e03b8c3c 160+++ linux-2.6.33-vs2.3.0.36.30.3/arch/arm/kernel/traps.c 2010-02-25 12:02:16.000000000 +0100
7e46296a
AM		 161@@ -234,8 +234,8 @@ static void __die(const char *str, int e
162 sysfs_printk_last_file();
d337f35e
JR		 163 print_modules();
164 __show_regs(regs);
7e46296a
AM		 165- printk(KERN_EMERG "Process %.*s (pid: %d, stack limit = 0x%p)\n",
166- TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), thread + 1);
167+ printk(KERN_EMERG "Process %.*s (pid: %d:#%u, stack limit = 0x%p)\n",
168+ TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), tsk->xid, thread + 1);
d337f35e
JR		 169
170 if (!user_mode(regs) || in_interrupt()) {
7e46296a 171 dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
e03b8c3c 172diff -NurpP --minimal linux-2.6.33/arch/avr32/mm/fault.c linux-2.6.33-vs2.3.0.36.30.3/arch/avr32/mm/fault.c
2bf5ad28 173--- linux-2.6.33/arch/avr32/mm/fault.c 2009-09-10 15:25:20.000000000 +0200
e03b8c3c 174+++ linux-2.6.33-vs2.3.0.36.30.3/arch/avr32/mm/fault.c 2010-02-25 12:02:16.000000000 +0100
4a036bed
AM		 175@@ -216,7 +216,8 @@ out_of_memory:
176 down_read(&mm->mmap_sem);
177 goto survive;
178 }
179- printk("VM: Killing process %s\n", tsk->comm);
180+ printk("VM: Killing process %s(%d:#%u)\n",
181+ tsk->comm, task_pid_nr(tsk), tsk->xid);
182 if (user_mode(regs))
183 do_group_exit(SIGKILL);
184 goto no_context;
e03b8c3c 185diff -NurpP --minimal linux-2.6.33/arch/cris/Kconfig linux-2.6.33-vs2.3.0.36.30.3/arch/cris/Kconfig
2bf5ad28 186--- linux-2.6.33/arch/cris/Kconfig 2009-06-11 17:11:56.000000000 +0200
e03b8c3c 187+++ linux-2.6.33-vs2.3.0.36.30.3/arch/cris/Kconfig 2010-02-25 12:02:16.000000000 +0100
ec22aa5c 188@@ -685,6 +685,8 @@ source "drivers/staging/Kconfig"
d337f35e
JR		 189
190 source "arch/cris/Kconfig.debug"
191
192+source "kernel/vserver/Kconfig"
193+
194 source "security/Kconfig"
195
196 source "crypto/Kconfig"
e03b8c3c 197diff -NurpP --minimal linux-2.6.33/arch/cris/mm/fault.c linux-2.6.33-vs2.3.0.36.30.3/arch/cris/mm/fault.c
2bf5ad28 198--- linux-2.6.33/arch/cris/mm/fault.c 2010-02-25 11:51:26.000000000 +0100
e03b8c3c 199+++ linux-2.6.33-vs2.3.0.36.30.3/arch/cris/mm/fault.c 2010-02-25 12:02:16.000000000 +0100
4a036bed
AM		 200@@ -245,7 +245,8 @@ do_page_fault(unsigned long address, str
201
202 out_of_memory:
203 up_read(&mm->mmap_sem);
204- printk("VM: killing process %s\n", tsk->comm);
205+ printk("VM: killing process %s(%d:#%u)\n",
206+ tsk->comm, task_pid_nr(tsk), tsk->xid);
207 if (user_mode(regs))
208 do_exit(SIGKILL);
209 goto no_context;
e03b8c3c 210diff -NurpP --minimal linux-2.6.33/arch/frv/kernel/kernel_thread.S linux-2.6.33-vs2.3.0.36.30.3/arch/frv/kernel/kernel_thread.S
2bf5ad28 211--- linux-2.6.33/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
e03b8c3c 212+++ linux-2.6.33-vs2.3.0.36.30.3/arch/frv/kernel/kernel_thread.S 2010-02-25 12:02:16.000000000 +0100
2380c486 213@@ -37,7 +37,7 @@ kernel_thread:
d337f35e
JR		 214
215 # start by forking the current process, but with shared VM
216 setlos.p #__NR_clone,gr7 ; syscall number
217- ori gr10,#CLONE_VM,gr8 ; first syscall arg [clone_flags]
218+ ori gr10,#CLONE_KT,gr8 ; first syscall arg [clone_flags]
219 sethi.p #0xe4e4,gr9 ; second syscall arg [newsp]
220 setlo #0xe4e4,gr9
221 setlos.p #0,gr10 ; third syscall arg [parent_tidptr]
e03b8c3c 222diff -NurpP --minimal linux-2.6.33/arch/frv/mm/fault.c linux-2.6.33-vs2.3.0.36.30.3/arch/frv/mm/fault.c
2bf5ad28 223--- linux-2.6.33/arch/frv/mm/fault.c 2009-09-10 15:25:22.000000000 +0200
e03b8c3c 224+++ linux-2.6.33-vs2.3.0.36.30.3/arch/frv/mm/fault.c 2010-02-25 12:02:16.000000000 +0100
4a036bed
AM		 225@@ -257,7 +257,8 @@ asmlinkage void do_page_fault(int datamm
226 */
227 out_of_memory:
228 up_read(&mm->mmap_sem);
229- printk("VM: killing process %s\n", current->comm);
230+ printk("VM: killing process %s(%d:#%u)\n",
231+ current->comm, task_pid_nr(current), current->xid);
232 if (user_mode(__frame))
233 do_group_exit(SIGKILL);
234 goto no_context;
e03b8c3c 235diff -NurpP --minimal linux-2.6.33/arch/h8300/Kconfig linux-2.6.33-vs2.3.0.36.30.3/arch/h8300/Kconfig
2bf5ad28 236--- linux-2.6.33/arch/h8300/Kconfig 2010-02-25 11:51:26.000000000 +0100
e03b8c3c 237+++ linux-2.6.33-vs2.3.0.36.30.3/arch/h8300/Kconfig 2010-02-25 12:02:16.000000000 +0100
2bf5ad28 238@@ -230,6 +230,8 @@ source "fs/Kconfig"
d337f35e
JR		 239
240 source "arch/h8300/Kconfig.debug"
241
242+source "kernel/vserver/Kconfig"
243+
244 source "security/Kconfig"
245
246 source "crypto/Kconfig"
e03b8c3c 247diff -NurpP --minimal linux-2.6.33/arch/ia64/ia32/ia32_entry.S linux-2.6.33-vs2.3.0.36.30.3/arch/ia64/ia32/ia32_entry.S
2bf5ad28 248--- linux-2.6.33/arch/ia64/ia32/ia32_entry.S 2010-02-25 11:51:26.000000000 +0100
e03b8c3c 249+++ linux-2.6.33-vs2.3.0.36.30.3/arch/ia64/ia32/ia32_entry.S 2010-02-25 12:02:16.000000000 +0100
ec22aa5c 250@@ -451,7 +451,7 @@ ia32_syscall_table:
2380c486
JR		 251 data8 sys_tgkill /* 270 */
252 data8 compat_sys_utimes
253 data8 sys32_fadvise64_64
254- data8 sys_ni_syscall
255+ data8 sys32_vserver
256 data8 sys_ni_syscall
257 data8 sys_ni_syscall /* 275 */
258 data8 sys_ni_syscall
e03b8c3c 259diff -NurpP --minimal linux-2.6.33/arch/ia64/include/asm/tlb.h linux-2.6.33-vs2.3.0.36.30.3/arch/ia64/include/asm/tlb.h
2bf5ad28 260--- linux-2.6.33/arch/ia64/include/asm/tlb.h 2010-02-25 11:51:26.000000000 +0100
e03b8c3c 261+++ linux-2.6.33-vs2.3.0.36.30.3/arch/ia64/include/asm/tlb.h 2010-02-25 12:02:16.000000000 +0100
0411181d
AM		 262@@ -40,6 +40,7 @@
263 #include <linux/mm.h>
264 #include <linux/pagemap.h>
265 #include <linux/swap.h>
266+#include <linux/vs_memory.h>
267
268 #include <asm/pgalloc.h>
269 #include <asm/processor.h>
e03b8c3c 270diff -NurpP --minimal linux-2.6.33/arch/ia64/Kconfig linux-2.6.33-vs2.3.0.36.30.3/arch/ia64/Kconfig
2bf5ad28 271--- linux-2.6.33/arch/ia64/Kconfig 2010-02-25 11:51:26.000000000 +0100
e03b8c3c 272+++ linux-2.6.33-vs2.3.0.36.30.3/arch/ia64/Kconfig 2010-02-25 12:02:16.000000000 +0100
2bf5ad28 273@@ -682,6 +682,8 @@ source "fs/Kconfig"
2380c486
JR		 274
275 source "arch/ia64/Kconfig.debug"
d337f35e
JR		 276
277+source "kernel/vserver/Kconfig"
278+
279 source "security/Kconfig"
280
281 source "crypto/Kconfig"
e03b8c3c 282diff -NurpP --minimal linux-2.6.33/arch/ia64/kernel/entry.S linux-2.6.33-vs2.3.0.36.30.3/arch/ia64/kernel/entry.S
2bf5ad28 283--- linux-2.6.33/arch/ia64/kernel/entry.S 2010-02-25 11:51:26.000000000 +0100
e03b8c3c 284+++ linux-2.6.33-vs2.3.0.36.30.3/arch/ia64/kernel/entry.S 2010-02-25 12:02:16.000000000 +0100
ec22aa5c 285@@ -1753,7 +1753,7 @@ sys_call_table:
2380c486
JR		 286 data8 sys_mq_notify
287 data8 sys_mq_getsetattr
288 data8 sys_kexec_load
289- data8 sys_ni_syscall // reserved for vserver
290+ data8 sys_vserver
291 data8 sys_waitid // 1270
292 data8 sys_add_key
293 data8 sys_request_key
e03b8c3c 294diff -NurpP --minimal linux-2.6.33/arch/ia64/kernel/perfmon.c linux-2.6.33-vs2.3.0.36.30.3/arch/ia64/kernel/perfmon.c
2bf5ad28 295--- linux-2.6.33/arch/ia64/kernel/perfmon.c 2010-02-25 11:51:26.000000000 +0100
e03b8c3c 296+++ linux-2.6.33-vs2.3.0.36.30.3/arch/ia64/kernel/perfmon.c 2010-02-25 12:02:16.000000000 +0100
ec22aa5c 297@@ -41,6 +41,7 @@
2380c486
JR		 298 #include <linux/rcupdate.h>
299 #include <linux/completion.h>
ec22aa5c 300 #include <linux/tracehook.h>
2380c486 301+#include <linux/vs_memory.h>
d337f35e 302
2380c486
JR		 303 #include <asm/errno.h>
304 #include <asm/intrinsics.h>
2bf5ad28 305@@ -2367,7 +2368,7 @@ pfm_smpl_buffer_alloc(struct task_struct
2380c486
JR		 306 */
307 insert_vm_struct(mm, vma);
d337f35e 308
2380c486
JR		 309- mm->total_vm += size >> PAGE_SHIFT;
310+ vx_vmpages_add(mm, size >> PAGE_SHIFT);
311 vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file,
312 vma_pages(vma));
313 up_write(&task->mm->mmap_sem);
e03b8c3c 314diff -NurpP --minimal linux-2.6.33/arch/ia64/kernel/process.c linux-2.6.33-vs2.3.0.36.30.3/arch/ia64/kernel/process.c
2bf5ad28 315--- linux-2.6.33/arch/ia64/kernel/process.c 2009-12-03 20:01:56.000000000 +0100
e03b8c3c 316+++ linux-2.6.33-vs2.3.0.36.30.3/arch/ia64/kernel/process.c 2010-02-25 12:02:16.000000000 +0100
ec22aa5c 317@@ -110,8 +110,8 @@ show_regs (struct pt_regs *regs)
2380c486 318 unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
d337f35e 319
2380c486
JR		 320 print_modules();
321- printk("\nPid: %d, CPU %d, comm: %20s\n", task_pid_nr(current),
322- smp_processor_id(), current->comm);
323+ printk("\nPid: %d[#%u], CPU %d, comm: %20s\n", task_pid_nr(current),
324+ current->xid, smp_processor_id(), current->comm);
325 printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n",
326 regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
327 init_utsname()->release);
e03b8c3c 328diff -NurpP --minimal linux-2.6.33/arch/ia64/kernel/ptrace.c linux-2.6.33-vs2.3.0.36.30.3/arch/ia64/kernel/ptrace.c
2bf5ad28 329--- linux-2.6.33/arch/ia64/kernel/ptrace.c 2009-09-10 15:25:22.000000000 +0200
e03b8c3c 330+++ linux-2.6.33-vs2.3.0.36.30.3/arch/ia64/kernel/ptrace.c 2010-02-25 12:02:16.000000000 +0100
23f740c4 331@@ -22,6 +22,7 @@
2380c486 332 #include <linux/regset.h>
d337f35e 333 #include <linux/elf.h>
ec22aa5c 334 #include <linux/tracehook.h>
d337f35e
JR		 335+#include <linux/vs_base.h>
336
337 #include <asm/pgtable.h>
338 #include <asm/processor.h>
e03b8c3c 339diff -NurpP --minimal linux-2.6.33/arch/ia64/kernel/traps.c linux-2.6.33-vs2.3.0.36.30.3/arch/ia64/kernel/traps.c
2bf5ad28 340--- linux-2.6.33/arch/ia64/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
e03b8c3c 341+++ linux-2.6.33-vs2.3.0.36.30.3/arch/ia64/kernel/traps.c 2010-02-25 12:02:16.000000000 +0100
2380c486 342@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
d337f35e
JR		 343 put_cpu();
344
345 if (++die.lock_owner_depth < 3) {
346- printk("%s[%d]: %s %ld [%d]\n",
2380c486 347- current->comm, task_pid_nr(current), str, err, ++die_counter);
d337f35e 348+ printk("%s[%d[#%u]]: %s %ld [%d]\n",
2380c486 349+ current->comm, task_pid_nr(current), current->xid,
d337f35e 350+ str, err, ++die_counter);
2380c486
JR		 351 if (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV)
352 != NOTIFY_STOP)
353 show_regs(regs);
354@@ -324,8 +325,9 @@ handle_fpu_swa (int fp_fault, struct pt_
355 if ((last.count & 15) < 5 && (ia64_fetchadd(1, &last.count, acq) & 15) < 5) {
356 last.time = current_jiffies + 5 * HZ;
357 printk(KERN_WARNING
358- "%s(%d): floating-point assist fault at ip %016lx, isr %016lx\n",
359- current->comm, task_pid_nr(current), regs->cr_iip + ia64_psr(regs)->ri, isr);
360+ "%s(%d[#%u]): floating-point assist fault at ip %016lx, isr %016lx\n",
361+ current->comm, task_pid_nr(current), current->xid,
362+ regs->cr_iip + ia64_psr(regs)->ri, isr);
363 }
364 }
d337f35e 365 }
e03b8c3c 366diff -NurpP --minimal linux-2.6.33/arch/ia64/mm/fault.c linux-2.6.33-vs2.3.0.36.30.3/arch/ia64/mm/fault.c
2bf5ad28 367--- linux-2.6.33/arch/ia64/mm/fault.c 2009-09-10 15:25:23.000000000 +0200
e03b8c3c 368+++ linux-2.6.33-vs2.3.0.36.30.3/arch/ia64/mm/fault.c 2010-02-25 12:02:16.000000000 +0100
d337f35e 369@@ -10,6 +10,7 @@
d337f35e
JR		 370 #include <linux/interrupt.h>
371 #include <linux/kprobes.h>
2380c486 372 #include <linux/kdebug.h>
d337f35e
JR		 373+#include <linux/vs_memory.h>
374
375 #include <asm/pgtable.h>
376 #include <asm/processor.h>
4a036bed
AM		 377@@ -281,7 +282,8 @@ ia64_do_page_fault (unsigned long addres
378 down_read(&mm->mmap_sem);
379 goto survive;
380 }
381- printk(KERN_CRIT "VM: killing process %s\n", current->comm);
382+ printk(KERN_CRIT "VM: killing process %s(%d:#%u)\n",
383+ current->comm, task_pid_nr(current), current->xid);
384 if (user_mode(regs))
385 do_group_exit(SIGKILL);
386 goto no_context;
e03b8c3c 387diff -NurpP --minimal linux-2.6.33/arch/m32r/kernel/traps.c linux-2.6.33-vs2.3.0.36.30.3/arch/m32r/kernel/traps.c
2bf5ad28 388--- linux-2.6.33/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100
e03b8c3c 389+++ linux-2.6.33-vs2.3.0.36.30.3/arch/m32r/kernel/traps.c 2010-02-25 12:02:16.000000000 +0100
2380c486 390@@ -196,8 +196,9 @@ static void show_registers(struct pt_reg
d337f35e
JR		 391 } else {
392 printk("SPI: %08lx\n", sp);
393 }
394- printk("Process %s (pid: %d, process nr: %d, stackpage=%08lx)",
2380c486 395- current->comm, task_pid_nr(current), 0xffff & i, 4096+(unsigned long)current);
d337f35e 396+ printk("Process %s (pid: %d[#%u], process nr: %d, stackpage=%08lx)",
2380c486 397+ current->comm, task_pid_nr(current), current->xid,
d337f35e
JR		 398+ 0xffff & i, 4096+(unsigned long)current);
399
400 /*
401 * When in-kernel, we also print out the stack and code at the
e03b8c3c 402diff -NurpP --minimal linux-2.6.33/arch/m32r/mm/fault.c linux-2.6.33-vs2.3.0.36.30.3/arch/m32r/mm/fault.c
2bf5ad28 403--- linux-2.6.33/arch/m32r/mm/fault.c 2009-09-10 15:25:23.000000000 +0200
e03b8c3c 404+++ linux-2.6.33-vs2.3.0.36.30.3/arch/m32r/mm/fault.c 2010-02-25 12:02:16.000000000 +0100
4a036bed
AM		 405@@ -276,7 +276,8 @@ out_of_memory:
406 down_read(&mm->mmap_sem);
407 goto survive;
408 }
409- printk("VM: killing process %s\n", tsk->comm);
410+ printk("VM: killing process %s(%d:#%u)\n",
411+ tsk->comm, task_pid_nr(tsk), tsk->xid);
412 if (error_code & ACE_USERMODE)
413 do_group_exit(SIGKILL);
414 goto no_context;
e03b8c3c 415diff -NurpP --minimal linux-2.6.33/arch/m68k/Kconfig linux-2.6.33-vs2.3.0.36.30.3/arch/m68k/Kconfig
2bf5ad28 416--- linux-2.6.33/arch/m68k/Kconfig 2009-12-03 20:01:57.000000000 +0100
e03b8c3c 417+++ linux-2.6.33-vs2.3.0.36.30.3/arch/m68k/Kconfig 2010-02-25 12:02:16.000000000 +0100
7e46296a 418@@ -622,6 +622,8 @@ source "fs/Kconfig"
d337f35e
JR		 419
420 source "arch/m68k/Kconfig.debug"
421
422+source "kernel/vserver/Kconfig"
423+
424 source "security/Kconfig"
425
426 source "crypto/Kconfig"
e03b8c3c 427diff -NurpP --minimal linux-2.6.33/arch/m68k/kernel/ptrace.c linux-2.6.33-vs2.3.0.36.30.3/arch/m68k/kernel/ptrace.c
2bf5ad28 428--- linux-2.6.33/arch/m68k/kernel/ptrace.c 2010-02-25 11:51:27.000000000 +0100
e03b8c3c 429+++ linux-2.6.33-vs2.3.0.36.30.3/arch/m68k/kernel/ptrace.c 2010-02-25 12:02:16.000000000 +0100
2380c486 430@@ -18,6 +18,7 @@
d337f35e
JR		 431 #include <linux/ptrace.h>
432 #include <linux/user.h>
433 #include <linux/signal.h>
434+#include <linux/vs_base.h>
435
436 #include <asm/uaccess.h>
437 #include <asm/page.h>
2bf5ad28 438@@ -249,6 +250,8 @@ long arch_ptrace(struct task_struct *chi
d337f35e
JR		 439 ret = ptrace_request(child, request, addr, data);
440 break;
441 }
2380c486 442+ if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT))
d337f35e
JR		 443+ goto out_tsk;
444
445 return ret;
446 out_eio:
e03b8c3c 447diff -NurpP --minimal linux-2.6.33/arch/m68k/kernel/traps.c linux-2.6.33-vs2.3.0.36.30.3/arch/m68k/kernel/traps.c
2bf5ad28 448--- linux-2.6.33/arch/m68k/kernel/traps.c 2009-09-10 15:25:23.000000000 +0200
e03b8c3c 449+++ linux-2.6.33-vs2.3.0.36.30.3/arch/m68k/kernel/traps.c 2010-02-25 12:02:16.000000000 +0100
ec22aa5c 450@@ -906,8 +906,8 @@ void show_registers(struct pt_regs *regs
d337f35e
JR		 451 printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
452 regs->d4, regs->d5, regs->a0, regs->a1);
453
454- printk("Process %s (pid: %d, task=%p)\n",
2380c486 455- current->comm, task_pid_nr(current), current);
d337f35e 456+ printk("Process %s (pid: %d[#%u], task=%p)\n",
2380c486 457+ current->comm, task_pid_nr(current), current->xid, current);
d337f35e
JR		 458 addr = (unsigned long)&fp->un;
459 printk("Frame format=%X ", regs->format);
460 switch (regs->format) {
e03b8c3c 461diff -NurpP --minimal linux-2.6.33/arch/m68k/mm/fault.c linux-2.6.33-vs2.3.0.36.30.3/arch/m68k/mm/fault.c
2bf5ad28 462--- linux-2.6.33/arch/m68k/mm/fault.c 2009-09-10 15:25:23.000000000 +0200
e03b8c3c 463+++ linux-2.6.33-vs2.3.0.36.30.3/arch/m68k/mm/fault.c 2010-02-25 12:02:16.000000000 +0100
4a036bed
AM		 464@@ -186,7 +186,8 @@ out_of_memory:
465 goto survive;
466 }
467
468- printk("VM: killing process %s\n", current->comm);
469+ printk("VM: killing process %s(%d:#%u)\n",
470+ current->comm, task_pid_nr(current), current->xid);
471 if (user_mode(regs))
472 do_group_exit(SIGKILL);
473
e03b8c3c 474diff -NurpP --minimal linux-2.6.33/arch/m68knommu/Kconfig linux-2.6.33-vs2.3.0.36.30.3/arch/m68knommu/Kconfig
2bf5ad28 475--- linux-2.6.33/arch/m68knommu/Kconfig 2010-02-25 11:51:27.000000000 +0100
e03b8c3c 476+++ linux-2.6.33-vs2.3.0.36.30.3/arch/m68knommu/Kconfig 2010-02-25 12:02:16.000000000 +0100
2bf5ad28 477@@ -734,6 +734,8 @@ source "fs/Kconfig"
d337f35e
JR		 478
479 source "arch/m68knommu/Kconfig.debug"
480
481+source "kernel/vserver/Kconfig"
482+
483 source "security/Kconfig"
484
485 source "crypto/Kconfig"
e03b8c3c 486diff -NurpP --minimal linux-2.6.33/arch/m68knommu/kernel/traps.c linux-2.6.33-vs2.3.0.36.30.3/arch/m68knommu/kernel/traps.c
2bf5ad28 487--- linux-2.6.33/arch/m68knommu/kernel/traps.c 2009-09-10 15:25:23.000000000 +0200
e03b8c3c 488+++ linux-2.6.33-vs2.3.0.36.30.3/arch/m68knommu/kernel/traps.c 2010-02-25 12:02:16.000000000 +0100
ec22aa5c 489@@ -78,8 +78,9 @@ void die_if_kernel(char *str, struct pt_
d337f35e
JR		 490 printk(KERN_EMERG "d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
491 fp->d4, fp->d5, fp->a0, fp->a1);
492
493- printk(KERN_EMERG "Process %s (pid: %d, stackpage=%08lx)\n",
494- current->comm, current->pid, PAGE_SIZE+(unsigned long)current);
495+ printk(KERN_EMERG "Process %s (pid: %d[#%u], stackpage=%08lx)\n",
2380c486 496+ current->comm, task_pid_nr(current), current->xid,
d337f35e 497+ PAGE_SIZE+(unsigned long)current);
2380c486
JR		 498 show_stack(NULL, (unsigned long *)(fp + 1));
499 add_taint(TAINT_DIE);
d337f35e 500 do_exit(SIGSEGV);
e03b8c3c 501diff -NurpP --minimal linux-2.6.33/arch/microblaze/mm/fault.c linux-2.6.33-vs2.3.0.36.30.3/arch/microblaze/mm/fault.c
2bf5ad28 502--- linux-2.6.33/arch/microblaze/mm/fault.c 2009-09-10 15:25:24.000000000 +0200
e03b8c3c 503+++ linux-2.6.33-vs2.3.0.36.30.3/arch/microblaze/mm/fault.c 2010-02-25 12:02:16.000000000 +0100
4a036bed
AM		 504@@ -279,7 +279,8 @@ out_of_memory:
505 goto survive;
506 }
507 up_read(&mm->mmap_sem);
508- printk(KERN_WARNING "VM: killing process %s\n", current->comm);
509+ printk(KERN_WARNING "VM: killing process %s(%d:#%u)\n",
510+ current->comm, task_pid_nr(current), current->xid);
511 if (user_mode(regs))
512 do_exit(SIGKILL);
513 bad_page_fault(regs, address, SIGKILL);
e03b8c3c 514diff -NurpP --minimal linux-2.6.33/arch/mips/Kconfig linux-2.6.33-vs2.3.0.36.30.3/arch/mips/Kconfig
2bf5ad28 515--- linux-2.6.33/arch/mips/Kconfig 2010-02-25 11:51:27.000000000 +0100
e03b8c3c 516+++ linux-2.6.33-vs2.3.0.36.30.3/arch/mips/Kconfig 2010-02-25 12:02:16.000000000 +0100
2bf5ad28 517@@ -2220,6 +2220,8 @@ source "fs/Kconfig"
d337f35e
JR		 518
519 source "arch/mips/Kconfig.debug"
520
521+source "kernel/vserver/Kconfig"
522+
523 source "security/Kconfig"
524
525 source "crypto/Kconfig"
e03b8c3c 526diff -NurpP --minimal linux-2.6.33/arch/mips/kernel/ptrace.c linux-2.6.33-vs2.3.0.36.30.3/arch/mips/kernel/ptrace.c
2bf5ad28 527--- linux-2.6.33/arch/mips/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
e03b8c3c 528+++ linux-2.6.33-vs2.3.0.36.30.3/arch/mips/kernel/ptrace.c 2010-02-25 12:02:16.000000000 +0100
2380c486 529@@ -25,6 +25,7 @@
d337f35e 530 #include <linux/security.h>
2380c486
JR		 531 #include <linux/audit.h>
532 #include <linux/seccomp.h>
d337f35e
JR		 533+#include <linux/vs_base.h>
534
535 #include <asm/byteorder.h>
536 #include <asm/cpu.h>
ec22aa5c 537@@ -259,6 +260,9 @@ long arch_ptrace(struct task_struct *chi
d337f35e
JR		 538 {
539 int ret;
540
2380c486 541+ if (!vx_check(vx_task_xid(child), VS_WATCH_P | VS_IDENT))
d337f35e
JR		 542+ goto out;
543+
544 switch (request) {
545 /* when I and D space are separate, these will need to be fixed. */
546 case PTRACE_PEEKTEXT: /* read word at location addr. */
e03b8c3c 547diff -NurpP --minimal linux-2.6.33/arch/mips/kernel/scall32-o32.S linux-2.6.33-vs2.3.0.36.30.3/arch/mips/kernel/scall32-o32.S
2bf5ad28 548--- linux-2.6.33/arch/mips/kernel/scall32-o32.S 2010-02-25 11:51:28.000000000 +0100
e03b8c3c 549+++ linux-2.6.33-vs2.3.0.36.30.3/arch/mips/kernel/scall32-o32.S 2010-02-25 12:02:16.000000000 +0100
7e46296a 550@@ -525,7 +525,7 @@ einval: li v0, -ENOSYS
d337f35e
JR		 551 sys sys_mq_timedreceive 5
552 sys sys_mq_notify 2 /* 4275 */
553 sys sys_mq_getsetattr 3
554- sys sys_ni_syscall 0 /* sys_vserver */
555+ sys sys_vserver 3
556 sys sys_waitid 5
557 sys sys_ni_syscall 0 /* available, was setaltroot */
558 sys sys_add_key 5 /* 4280 */
e03b8c3c 559diff -NurpP --minimal linux-2.6.33/arch/mips/kernel/scall64-64.S linux-2.6.33-vs2.3.0.36.30.3/arch/mips/kernel/scall64-64.S
2bf5ad28 560--- linux-2.6.33/arch/mips/kernel/scall64-64.S 2010-02-25 11:51:28.000000000 +0100
e03b8c3c 561+++ linux-2.6.33-vs2.3.0.36.30.3/arch/mips/kernel/scall64-64.S 2010-02-25 12:02:16.000000000 +0100
7e46296a 562@@ -362,7 +362,7 @@ sys_call_table:
d337f35e
JR		 563 PTR sys_mq_timedreceive
564 PTR sys_mq_notify
565 PTR sys_mq_getsetattr /* 5235 */
566- PTR sys_ni_syscall /* sys_vserver */
567+ PTR sys_vserver
568 PTR sys_waitid
569 PTR sys_ni_syscall /* available, was setaltroot */
570 PTR sys_add_key
e03b8c3c 571diff -NurpP --minimal linux-2.6.33/arch/mips/kernel/scall64-n32.S linux-2.6.33-vs2.3.0.36.30.3/arch/mips/kernel/scall64-n32.S
2bf5ad28 572--- linux-2.6.33/arch/mips/kernel/scall64-n32.S 2010-02-25 11:51:28.000000000 +0100
e03b8c3c 573+++ linux-2.6.33-vs2.3.0.36.30.3/arch/mips/kernel/scall64-n32.S 2010-02-25 12:02:16.000000000 +0100
d337f35e
JR		 574@@ -360,7 +360,7 @@ EXPORT(sysn32_call_table)
575 PTR compat_sys_mq_timedreceive
576 PTR compat_sys_mq_notify
577 PTR compat_sys_mq_getsetattr
578- PTR sys_ni_syscall /* 6240, sys_vserver */
579+ PTR sys32_vserver /* 6240 */
2380c486 580 PTR compat_sys_waitid
d337f35e
JR		 581 PTR sys_ni_syscall /* available, was setaltroot */
582 PTR sys_add_key
e03b8c3c 583diff -NurpP --minimal linux-2.6.33/arch/mips/kernel/scall64-o32.S linux-2.6.33-vs2.3.0.36.30.3/arch/mips/kernel/scall64-o32.S
2bf5ad28 584--- linux-2.6.33/arch/mips/kernel/scall64-o32.S 2010-02-25 11:51:28.000000000 +0100
e03b8c3c 585+++ linux-2.6.33-vs2.3.0.36.30.3/arch/mips/kernel/scall64-o32.S 2010-02-25 12:02:16.000000000 +0100
ec22aa5c 586@@ -480,7 +480,7 @@ sys_call_table:
d337f35e
JR		 587 PTR compat_sys_mq_timedreceive
588 PTR compat_sys_mq_notify /* 4275 */
589 PTR compat_sys_mq_getsetattr
590- PTR sys_ni_syscall /* sys_vserver */
591+ PTR sys32_vserver
2380c486 592 PTR sys_32_waitid
d337f35e
JR		 593 PTR sys_ni_syscall /* available, was setaltroot */
594 PTR sys_add_key /* 4280 */
e03b8c3c 595diff -NurpP --minimal linux-2.6.33/arch/mips/kernel/traps.c linux-2.6.33-vs2.3.0.36.30.3/arch/mips/kernel/traps.c
2bf5ad28 596--- linux-2.6.33/arch/mips/kernel/traps.c 2010-02-25 11:51:28.000000000 +0100
e03b8c3c 597+++ linux-2.6.33-vs2.3.0.36.30.3/arch/mips/kernel/traps.c 2010-02-25 12:02:16.000000000 +0100
2bf5ad28 598@@ -333,9 +333,10 @@ void show_registers(const struct pt_regs
2380c486
JR		 599
600 __show_regs(regs);
d337f35e 601 print_modules();
2380c486
JR		 602- printk("Process %s (pid: %d, threadinfo=%p, task=%p, tls=%0*lx)\n",
603- current->comm, current->pid, current_thread_info(), current,
604- field, current_thread_info()->tp_value);
605+ printk("Process %s (pid: %d:#%u, threadinfo=%p, task=%p, tls=%0*lx)\n",
606+ current->comm, task_pid_nr(current), current->xid,
607+ current_thread_info(), current,
608+ field, current_thread_info()->tp_value);
609 if (cpu_has_userlocal) {
610 unsigned long tls;
611
e03b8c3c 612diff -NurpP --minimal linux-2.6.33/arch/mn10300/mm/fault.c linux-2.6.33-vs2.3.0.36.30.3/arch/mn10300/mm/fault.c
2bf5ad28 613--- linux-2.6.33/arch/mn10300/mm/fault.c 2009-09-10 15:25:39.000000000 +0200
e03b8c3c 614+++ linux-2.6.33-vs2.3.0.36.30.3/arch/mn10300/mm/fault.c 2010-02-25 12:02:16.000000000 +0100
4a036bed
AM		 615@@ -339,7 +339,8 @@ no_context:
616 out_of_memory:
617 up_read(&mm->mmap_sem);
618 monitor_signal(regs);
619- printk(KERN_ALERT "VM: killing process %s\n", tsk->comm);
620+ printk(KERN_ALERT "VM: killing process %s(%d:#%u)\n",
621+ tsk->comm, task_pid_nr(tsk), tsk->xid);
622 if ((fault_code & MMUFCR_xFC_ACCESS) == MMUFCR_xFC_ACCESS_USR)
623 do_exit(SIGKILL);
624 goto no_context;
e03b8c3c 625diff -NurpP --minimal linux-2.6.33/arch/parisc/Kconfig linux-2.6.33-vs2.3.0.36.30.3/arch/parisc/Kconfig
2bf5ad28 626--- linux-2.6.33/arch/parisc/Kconfig 2010-02-25 11:51:29.000000000 +0100
e03b8c3c 627+++ linux-2.6.33-vs2.3.0.36.30.3/arch/parisc/Kconfig 2010-02-25 12:02:16.000000000 +0100
2bf5ad28 628@@ -293,6 +293,8 @@ source "fs/Kconfig"
d337f35e
JR		 629
630 source "arch/parisc/Kconfig.debug"
631
632+source "kernel/vserver/Kconfig"
633+
634 source "security/Kconfig"
635
636 source "crypto/Kconfig"
e03b8c3c 637diff -NurpP --minimal linux-2.6.33/arch/parisc/kernel/syscall_table.S linux-2.6.33-vs2.3.0.36.30.3/arch/parisc/kernel/syscall_table.S
2bf5ad28 638--- linux-2.6.33/arch/parisc/kernel/syscall_table.S 2010-02-25 11:51:29.000000000 +0100
e03b8c3c 639+++ linux-2.6.33-vs2.3.0.36.30.3/arch/parisc/kernel/syscall_table.S 2010-02-25 12:02:16.000000000 +0100
2380c486 640@@ -361,7 +361,7 @@
d337f35e
JR		 641 ENTRY_COMP(mbind) /* 260 */
642 ENTRY_COMP(get_mempolicy)
643 ENTRY_COMP(set_mempolicy)
644- ENTRY_SAME(ni_syscall) /* 263: reserved for vserver */
645+ ENTRY_DIFF(vserver)
646 ENTRY_SAME(add_key)
647 ENTRY_SAME(request_key) /* 265 */
648 ENTRY_SAME(keyctl)
e03b8c3c 649diff -NurpP --minimal linux-2.6.33/arch/parisc/kernel/traps.c linux-2.6.33-vs2.3.0.36.30.3/arch/parisc/kernel/traps.c
2bf5ad28 650--- linux-2.6.33/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200
e03b8c3c 651+++ linux-2.6.33-vs2.3.0.36.30.3/arch/parisc/kernel/traps.c 2010-02-25 12:02:16.000000000 +0100
2380c486 652@@ -236,8 +236,9 @@ void die_if_kernel(char *str, struct pt_
d337f35e
JR		 653 if (err == 0)
654 return; /* STFU */
655
656- printk(KERN_CRIT "%s (pid %d): %s (code %ld) at " RFMT "\n",
2380c486 657- current->comm, task_pid_nr(current), str, err, regs->iaoq[0]);
d337f35e 658+ printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld) at " RFMT "\n",
2380c486 659+ current->comm, task_pid_nr(current), current->xid,
d337f35e
JR		 660+ str, err, regs->iaoq[0]);
661 #ifdef PRINT_USER_FAULTS
662 /* XXX for debugging only */
663 show_regs(regs);
ec22aa5c 664@@ -270,8 +271,8 @@ void die_if_kernel(char *str, struct pt_
d337f35e
JR		 665 pdc_console_restart();
666
2380c486
JR		 667 if (err)
668- printk(KERN_CRIT "%s (pid %d): %s (code %ld)\n",
669- current->comm, task_pid_nr(current), str, err);
670+ printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld)\n",
671+ current->comm, task_pid_nr(current), current->xid, str, err);
672
673 /* Wot's wrong wif bein' racy? */
674 if (current->thread.flags & PARISC_KERNEL_DEATH) {
e03b8c3c 675diff -NurpP --minimal linux-2.6.33/arch/parisc/mm/fault.c linux-2.6.33-vs2.3.0.36.30.3/arch/parisc/mm/fault.c
2bf5ad28 676--- linux-2.6.33/arch/parisc/mm/fault.c 2009-09-10 15:25:40.000000000 +0200
e03b8c3c 677+++ linux-2.6.33-vs2.3.0.36.30.3/arch/parisc/mm/fault.c 2010-02-25 12:02:16.000000000 +0100
ec22aa5c 678@@ -237,8 +237,9 @@ bad_area:
d337f35e
JR		 679
680 #ifdef PRINT_USER_FAULTS
681 printk(KERN_DEBUG "\n");
682- printk(KERN_DEBUG "do_page_fault() pid=%d command='%s' type=%lu address=0x%08lx\n",
2380c486 683- task_pid_nr(tsk), tsk->comm, code, address);
d337f35e
JR		 684+ printk(KERN_DEBUG "do_page_fault() pid=%d:#%u "
685+ "command='%s' type=%lu address=0x%08lx\n",
2380c486 686+ task_pid_nr(tsk), tsk->xid, tsk->comm, code, address);
d337f35e
JR		 687 if (vma) {
688 printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n",
689 vma->vm_start, vma->vm_end);
ec22aa5c 690@@ -264,7 +265,8 @@ no_context:
2380c486
JR		 691
692 out_of_memory:
693 up_read(&mm->mmap_sem);
694- printk(KERN_CRIT "VM: killing process %s\n", current->comm);
695+ printk(KERN_CRIT "VM: killing process %s(%d:#%u)\n",
696+ current->comm, current->pid, current->xid);
697 if (user_mode(regs))
698 do_group_exit(SIGKILL);
699 goto no_context;
e03b8c3c 700diff -NurpP --minimal linux-2.6.33/arch/powerpc/include/asm/unistd.h linux-2.6.33-vs2.3.0.36.30.3/arch/powerpc/include/asm/unistd.h
2bf5ad28 701--- linux-2.6.33/arch/powerpc/include/asm/unistd.h 2009-12-03 20:02:01.000000000 +0100
e03b8c3c 702+++ linux-2.6.33-vs2.3.0.36.30.3/arch/powerpc/include/asm/unistd.h 2010-02-25 12:02:16.000000000 +0100
4a036bed
AM		 703@@ -275,7 +275,7 @@
704 #endif
705 #define __NR_rtas 255
706 #define __NR_sys_debug_setcontext 256
707-/* Number 257 is reserved for vserver */
06102837 708+#define __NR_vserver 257
4a036bed
AM		 709 #define __NR_migrate_pages 258
710 #define __NR_mbind 259
711 #define __NR_get_mempolicy 260
e03b8c3c 712diff -NurpP --minimal linux-2.6.33/arch/powerpc/Kconfig linux-2.6.33-vs2.3.0.36.30.3/arch/powerpc/Kconfig
2bf5ad28 713--- linux-2.6.33/arch/powerpc/Kconfig 2010-02-25 11:51:29.000000000 +0100
e03b8c3c 714+++ linux-2.6.33-vs2.3.0.36.30.3/arch/powerpc/Kconfig 2010-02-25 12:02:16.000000000 +0100
2bf5ad28 715@@ -968,6 +968,8 @@ source "lib/Kconfig"
d337f35e
JR		 716
717 source "arch/powerpc/Kconfig.debug"
718
719+source "kernel/vserver/Kconfig"
720+
721 source "security/Kconfig"
722
723 config KEYS_COMPAT
e03b8c3c 724diff -NurpP --minimal linux-2.6.33/arch/powerpc/kernel/irq.c linux-2.6.33-vs2.3.0.36.30.3/arch/powerpc/kernel/irq.c
2bf5ad28 725--- linux-2.6.33/arch/powerpc/kernel/irq.c 2010-02-25 11:51:31.000000000 +0100
e03b8c3c 726+++ linux-2.6.33-vs2.3.0.36.30.3/arch/powerpc/kernel/irq.c 2010-02-25 12:02:16.000000000 +0100
ec22aa5c 727@@ -54,6 +54,7 @@
d337f35e 728 #include <linux/pci.h>
2380c486 729 #include <linux/debugfs.h>
7e46296a
AM		 730 #include <linux/perf_event.h>
731+// #include <linux/vs_context.h>
d337f35e
JR		 732
733 #include <asm/uaccess.h>
734 #include <asm/system.h>
e03b8c3c 735diff -NurpP --minimal linux-2.6.33/arch/powerpc/kernel/process.c linux-2.6.33-vs2.3.0.36.30.3/arch/powerpc/kernel/process.c
2bf5ad28 736--- linux-2.6.33/arch/powerpc/kernel/process.c 2010-02-25 11:51:31.000000000 +0100
e03b8c3c 737+++ linux-2.6.33-vs2.3.0.36.30.3/arch/powerpc/kernel/process.c 2010-02-25 12:02:16.000000000 +0100
ec22aa5c 738@@ -519,8 +519,9 @@ void show_regs(struct pt_regs * regs)
2380c486 739 #else
d337f35e 740 printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr);
2380c486 741 #endif
d337f35e 742- printk("TASK = %p[%d] '%s' THREAD: %p",
2380c486 743- current, task_pid_nr(current), current->comm, task_thread_info(current));
d337f35e 744+ printk("TASK = %p[%d,#%u] '%s' THREAD: %p",
2380c486 745+ current, task_pid_nr(current), current->xid,
d337f35e
JR		 746+ current->comm, task_thread_info(current));
747
748 #ifdef CONFIG_SMP
2380c486 749 printk(" CPU: %d", raw_smp_processor_id());
e03b8c3c 750diff -NurpP --minimal linux-2.6.33/arch/powerpc/kernel/traps.c linux-2.6.33-vs2.3.0.36.30.3/arch/powerpc/kernel/traps.c
2bf5ad28 751--- linux-2.6.33/arch/powerpc/kernel/traps.c 2010-02-25 11:51:31.000000000 +0100
e03b8c3c 752+++ linux-2.6.33-vs2.3.0.36.30.3/arch/powerpc/kernel/traps.c 2010-02-25 12:02:16.000000000 +0100
2bf5ad28 753@@ -918,8 +918,9 @@ void nonrecoverable_exception(struct pt_
d337f35e
JR		 754
755 void trace_syscall(struct pt_regs *regs)
756 {
757- printk("Task: %p(%d), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n",
2380c486 758- current, task_pid_nr(current), regs->nip, regs->link, regs->gpr[0],
d337f35e 759+ printk("Task: %p(%d[#%u]), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n",
2380c486 760+ current, task_pid_nr(current), current->xid,
d337f35e
JR		 761+ regs->nip, regs->link, regs->gpr[0],
762 regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
763 }
764
e03b8c3c 765diff -NurpP --minimal linux-2.6.33/arch/powerpc/kernel/vdso.c linux-2.6.33-vs2.3.0.36.30.3/arch/powerpc/kernel/vdso.c
2bf5ad28 766--- linux-2.6.33/arch/powerpc/kernel/vdso.c 2010-02-25 11:51:31.000000000 +0100
e03b8c3c 767+++ linux-2.6.33-vs2.3.0.36.30.3/arch/powerpc/kernel/vdso.c 2010-02-25 12:02:16.000000000 +0100
7e46296a 768@@ -23,6 +23,7 @@
d337f35e
JR		 769 #include <linux/security.h>
770 #include <linux/bootmem.h>
2380c486 771 #include <linux/lmb.h>
d337f35e
JR		 772+#include <linux/vs_memory.h>
773
774 #include <asm/pgtable.h>
775 #include <asm/system.h>
e03b8c3c 776diff -NurpP --minimal linux-2.6.33/arch/powerpc/mm/fault.c linux-2.6.33-vs2.3.0.36.30.3/arch/powerpc/mm/fault.c
2bf5ad28 777--- linux-2.6.33/arch/powerpc/mm/fault.c 2010-02-25 11:51:31.000000000 +0100
e03b8c3c 778+++ linux-2.6.33-vs2.3.0.36.30.3/arch/powerpc/mm/fault.c 2010-02-25 12:02:16.000000000 +0100
2bf5ad28 779@@ -364,7 +364,8 @@ out_of_memory:
2380c486
JR		 780 down_read(&mm->mmap_sem);
781 goto survive;
782 }
783- printk("VM: killing process %s\n", current->comm);
784+ printk("VM: killing process %s(%d:#%u)\n",
785+ current->comm, current->pid, current->xid);
786 if (user_mode(regs))
787 do_group_exit(SIGKILL);
788 return SIGKILL;
e03b8c3c 789diff -NurpP --minimal linux-2.6.33/arch/s390/include/asm/tlb.h linux-2.6.33-vs2.3.0.36.30.3/arch/s390/include/asm/tlb.h
2bf5ad28 790--- linux-2.6.33/arch/s390/include/asm/tlb.h 2009-09-10 15:25:43.000000000 +0200
e03b8c3c 791+++ linux-2.6.33-vs2.3.0.36.30.3/arch/s390/include/asm/tlb.h 2010-02-25 12:02:16.000000000 +0100
0411181d
AM		 792@@ -23,6 +23,8 @@
793
794 #include <linux/mm.h>
795 #include <linux/swap.h>
796+#include <linux/vs_memory.h>
797+
798 #include <asm/processor.h>
799 #include <asm/pgalloc.h>
800 #include <asm/smp.h>
e03b8c3c 801diff -NurpP --minimal linux-2.6.33/arch/s390/include/asm/unistd.h linux-2.6.33-vs2.3.0.36.30.3/arch/s390/include/asm/unistd.h
2bf5ad28 802--- linux-2.6.33/arch/s390/include/asm/unistd.h 2010-02-25 11:51:32.000000000 +0100
e03b8c3c 803+++ linux-2.6.33-vs2.3.0.36.30.3/arch/s390/include/asm/unistd.h 2010-02-25 12:02:16.000000000 +0100
0411181d
AM		 804@@ -202,7 +202,7 @@
805 #define __NR_clock_gettime (__NR_timer_create+6)
806 #define __NR_clock_getres (__NR_timer_create+7)
807 #define __NR_clock_nanosleep (__NR_timer_create+8)
808-/* Number 263 is reserved for vserver */
809+#define __NR_vserver 263
810 #define __NR_statfs64 265
811 #define __NR_fstatfs64 266
812 #define __NR_remap_file_pages 267
e03b8c3c 813diff -NurpP --minimal linux-2.6.33/arch/s390/Kconfig linux-2.6.33-vs2.3.0.36.30.3/arch/s390/Kconfig
2bf5ad28 814--- linux-2.6.33/arch/s390/Kconfig 2010-02-25 11:51:32.000000000 +0100
e03b8c3c 815+++ linux-2.6.33-vs2.3.0.36.30.3/arch/s390/Kconfig 2010-02-25 12:02:16.000000000 +0100
2bf5ad28 816@@ -629,6 +629,8 @@ source "fs/Kconfig"
d337f35e
JR		 817
818 source "arch/s390/Kconfig.debug"
819
820+source "kernel/vserver/Kconfig"
821+
822 source "security/Kconfig"
823
824 source "crypto/Kconfig"
e03b8c3c 825diff -NurpP --minimal linux-2.6.33/arch/s390/kernel/ptrace.c linux-2.6.33-vs2.3.0.36.30.3/arch/s390/kernel/ptrace.c
2bf5ad28 826--- linux-2.6.33/arch/s390/kernel/ptrace.c 2010-02-25 11:51:32.000000000 +0100
e03b8c3c 827+++ linux-2.6.33-vs2.3.0.36.30.3/arch/s390/kernel/ptrace.c 2010-02-25 12:02:16.000000000 +0100
ec22aa5c 828@@ -36,6 +36,7 @@
2380c486 829 #include <linux/regset.h>
ec22aa5c
AM		 830 #include <linux/tracehook.h>
831 #include <linux/seccomp.h>
d337f35e 832+#include <linux/vs_base.h>
ec22aa5c
AM		 833 #include <trace/syscall.h>
834 #include <asm/compat.h>
d337f35e 835 #include <asm/segment.h>
e03b8c3c 836diff -NurpP --minimal linux-2.6.33/arch/s390/kernel/syscalls.S linux-2.6.33-vs2.3.0.36.30.3/arch/s390/kernel/syscalls.S
2bf5ad28 837--- linux-2.6.33/arch/s390/kernel/syscalls.S 2009-12-03 20:02:03.000000000 +0100
e03b8c3c 838+++ linux-2.6.33-vs2.3.0.36.30.3/arch/s390/kernel/syscalls.S 2010-02-25 12:02:16.000000000 +0100
d337f35e
JR		 839@@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett
840 SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper) /* 260 */
841 SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper)
842 SYSCALL(sys_clock_nanosleep,sys_clock_nanosleep,sys32_clock_nanosleep_wrapper)
843-NI_SYSCALL /* reserved for vserver */
844+SYSCALL(sys_vserver,sys_vserver,sys32_vserver)
2380c486 845 SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper)
d337f35e
JR		 846 SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper)
847 SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper)
e03b8c3c 848diff -NurpP --minimal linux-2.6.33/arch/sh/Kconfig linux-2.6.33-vs2.3.0.36.30.3/arch/sh/Kconfig
2bf5ad28 849--- linux-2.6.33/arch/sh/Kconfig 2010-02-25 11:51:32.000000000 +0100
e03b8c3c 850+++ linux-2.6.33-vs2.3.0.36.30.3/arch/sh/Kconfig 2010-02-25 12:02:16.000000000 +0100
2bf5ad28 851@@ -860,6 +860,8 @@ source "fs/Kconfig"
d337f35e
JR		 852
853 source "arch/sh/Kconfig.debug"
854
855+source "kernel/vserver/Kconfig"
856+
857 source "security/Kconfig"
858
859 source "crypto/Kconfig"
e03b8c3c 860diff -NurpP --minimal linux-2.6.33/arch/sh/kernel/irq.c linux-2.6.33-vs2.3.0.36.30.3/arch/sh/kernel/irq.c
2bf5ad28 861--- linux-2.6.33/arch/sh/kernel/irq.c 2010-02-25 11:51:33.000000000 +0100
e03b8c3c 862+++ linux-2.6.33-vs2.3.0.36.30.3/arch/sh/kernel/irq.c 2010-02-25 12:02:16.000000000 +0100
7e46296a 863@@ -12,6 +12,7 @@
d337f35e
JR		 864 #include <linux/kernel_stat.h>
865 #include <linux/seq_file.h>
7e46296a
AM		 866 #include <linux/ftrace.h>
867+// #include <linux/vs_context.h>
d337f35e 868 #include <asm/processor.h>
2380c486 869 #include <asm/machvec.h>
d337f35e 870 #include <asm/uaccess.h>
e03b8c3c 871diff -NurpP --minimal linux-2.6.33/arch/sh/kernel/vsyscall/vsyscall.c linux-2.6.33-vs2.3.0.36.30.3/arch/sh/kernel/vsyscall/vsyscall.c
2bf5ad28 872--- linux-2.6.33/arch/sh/kernel/vsyscall/vsyscall.c 2009-03-24 14:18:42.000000000 +0100
e03b8c3c 873+++ linux-2.6.33-vs2.3.0.36.30.3/arch/sh/kernel/vsyscall/vsyscall.c 2010-02-25 12:02:16.000000000 +0100
2380c486 874@@ -19,6 +19,7 @@
d337f35e 875 #include <linux/elf.h>
2380c486
JR		 876 #include <linux/sched.h>
877 #include <linux/err.h>
d337f35e
JR		 878+#include <linux/vs_memory.h>
879
880 /*
881 * Should the kernel map a VDSO page into processes and pass its
e03b8c3c 882diff -NurpP --minimal linux-2.6.33/arch/sh/mm/fault_32.c linux-2.6.33-vs2.3.0.36.30.3/arch/sh/mm/fault_32.c
2bf5ad28 883--- linux-2.6.33/arch/sh/mm/fault_32.c 2009-12-03 20:02:14.000000000 +0100
e03b8c3c 884+++ linux-2.6.33-vs2.3.0.36.30.3/arch/sh/mm/fault_32.c 2010-02-25 12:02:16.000000000 +0100
7e46296a 885@@ -292,7 +292,8 @@ out_of_memory:
4a036bed
AM		 886 down_read(&mm->mmap_sem);
887 goto survive;
888 }
889- printk("VM: killing process %s\n", tsk->comm);
890+ printk("VM: killing process %s(%d:#%u)\n",
891+ tsk->comm, task_pid_nr(tsk), tsk->xid);
892 if (user_mode(regs))
893 do_group_exit(SIGKILL);
894 goto no_context;
e03b8c3c 895diff -NurpP --minimal linux-2.6.33/arch/sh/mm/tlbflush_64.c linux-2.6.33-vs2.3.0.36.30.3/arch/sh/mm/tlbflush_64.c
2bf5ad28 896--- linux-2.6.33/arch/sh/mm/tlbflush_64.c 2009-12-03 20:02:14.000000000 +0100
e03b8c3c 897+++ linux-2.6.33-vs2.3.0.36.30.3/arch/sh/mm/tlbflush_64.c 2010-02-25 12:02:16.000000000 +0100
4a036bed
AM		 898@@ -306,7 +306,8 @@ out_of_memory:
899 down_read(&mm->mmap_sem);
900 goto survive;
901 }
902- printk("VM: killing process %s\n", tsk->comm);
903+ printk("VM: killing process %s(%d:#%u)\n",
904+ tsk->comm, task_pid_nr(tsk), tsk->xid);
905 if (user_mode(regs))
906 do_group_exit(SIGKILL);
907 goto no_context;
e03b8c3c 908diff -NurpP --minimal linux-2.6.33/arch/sparc/include/asm/tlb_64.h linux-2.6.33-vs2.3.0.36.30.3/arch/sparc/include/asm/tlb_64.h
2bf5ad28 909--- linux-2.6.33/arch/sparc/include/asm/tlb_64.h 2009-09-10 15:25:45.000000000 +0200
e03b8c3c 910+++ linux-2.6.33-vs2.3.0.36.30.3/arch/sparc/include/asm/tlb_64.h 2010-02-25 12:02:16.000000000 +0100
ec22aa5c
AM		 911@@ -3,6 +3,7 @@
912
913 #include <linux/swap.h>
914 #include <linux/pagemap.h>
915+#include <linux/vs_memory.h>
916 #include <asm/pgalloc.h>
917 #include <asm/tlbflush.h>
918 #include <asm/mmu_context.h>
e03b8c3c 919diff -NurpP --minimal linux-2.6.33/arch/sparc/include/asm/unistd.h linux-2.6.33-vs2.3.0.36.30.3/arch/sparc/include/asm/unistd.h
2bf5ad28 920--- linux-2.6.33/arch/sparc/include/asm/unistd.h 2010-02-25 11:51:34.000000000 +0100
e03b8c3c 921+++ linux-2.6.33-vs2.3.0.36.30.3/arch/sparc/include/asm/unistd.h 2010-02-25 12:02:16.000000000 +0100
ec22aa5c
AM		 922@@ -335,7 +335,7 @@
923 #define __NR_timer_getoverrun 264
924 #define __NR_timer_delete 265
925 #define __NR_timer_create 266
926-/* #define __NR_vserver 267 Reserved for VSERVER */
927+#define __NR_vserver 267
928 #define __NR_io_setup 268
929 #define __NR_io_destroy 269
930 #define __NR_io_submit 270
e03b8c3c 931diff -NurpP --minimal linux-2.6.33/arch/sparc/Kconfig linux-2.6.33-vs2.3.0.36.30.3/arch/sparc/Kconfig
2bf5ad28 932--- linux-2.6.33/arch/sparc/Kconfig 2010-02-25 11:51:33.000000000 +0100
e03b8c3c 933+++ linux-2.6.33-vs2.3.0.36.30.3/arch/sparc/Kconfig 2010-02-25 12:02:16.000000000 +0100
2bf5ad28 934@@ -561,6 +561,8 @@ source "fs/Kconfig"
d337f35e
JR		 935
936 source "arch/sparc/Kconfig.debug"
937
938+source "kernel/vserver/Kconfig"
939+
940 source "security/Kconfig"
941
942 source "crypto/Kconfig"
e03b8c3c 943diff -NurpP --minimal linux-2.6.33/arch/sparc/kernel/systbls_32.S linux-2.6.33-vs2.3.0.36.30.3/arch/sparc/kernel/systbls_32.S
2bf5ad28 944--- linux-2.6.33/arch/sparc/kernel/systbls_32.S 2010-02-25 11:51:34.000000000 +0100
e03b8c3c 945+++ linux-2.6.33-vs2.3.0.36.30.3/arch/sparc/kernel/systbls_32.S 2010-02-25 12:02:16.000000000 +0100
50e68740 946@@ -70,7 +70,7 @@ sys_call_table:
9390b158 947 /*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
50e68740
JR		 948 /*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
949 /*260*/ .long sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
950-/*265*/ .long sys_timer_delete, sys_timer_create, sys_nis_syscall, sys_io_setup, sys_io_destroy
951+/*265*/ .long sys_timer_delete, sys_timer_create, sys_vserver, sys_io_setup, sys_io_destroy
952 /*270*/ .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
953 /*275*/ .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
954 /*280*/ .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
e03b8c3c 955diff -NurpP --minimal linux-2.6.33/arch/sparc/kernel/systbls_64.S linux-2.6.33-vs2.3.0.36.30.3/arch/sparc/kernel/systbls_64.S
2bf5ad28 956--- linux-2.6.33/arch/sparc/kernel/systbls_64.S 2010-02-25 11:51:34.000000000 +0100
e03b8c3c 957+++ linux-2.6.33-vs2.3.0.36.30.3/arch/sparc/kernel/systbls_64.S 2010-02-25 12:02:16.000000000 +0100
50e68740 958@@ -71,7 +71,7 @@ sys_call_table32:
2bf5ad28 959 /*250*/ .word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl
50e68740
JR		 960 .word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
961 /*260*/ .word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, sys32_timer_settime, compat_sys_timer_gettime, sys_timer_getoverrun
962- .word sys_timer_delete, compat_sys_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy
963+ .word sys_timer_delete, compat_sys_timer_create, sys32_vserver, compat_sys_io_setup, sys_io_destroy
964 /*270*/ .word sys32_io_submit, sys_io_cancel, compat_sys_io_getevents, sys32_mq_open, sys_mq_unlink
965 .word compat_sys_mq_timedsend, compat_sys_mq_timedreceive, compat_sys_mq_notify, compat_sys_mq_getsetattr, compat_sys_waitid
966 /*280*/ .word sys32_tee, sys_add_key, sys_request_key, sys_keyctl, compat_sys_openat
ec22aa5c 967@@ -146,7 +146,7 @@ sys_call_table:
50e68740
JR		 968 /*250*/ .word sys_64_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
969 .word sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
970 /*260*/ .word sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
971- .word sys_timer_delete, sys_timer_create, sys_ni_syscall, sys_io_setup, sys_io_destroy
972+ .word sys_timer_delete, sys_timer_create, sys_vserver, sys_io_setup, sys_io_destroy
973 /*270*/ .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
974 .word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
975 /*280*/ .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
e03b8c3c
AM		 976diff -NurpP --minimal linux-2.6.33/arch/um/include/asm/tlb.h linux-2.6.33-vs2.3.0.36.30.3/arch/um/include/asm/tlb.h
977--- linux-2.6.33/arch/um/include/asm/tlb.h 2009-09-10 15:25:46.000000000 +0200
978+++ linux-2.6.33-vs2.3.0.36.30.3/arch/um/include/asm/tlb.h 2010-03-10 20:29:12.000000000 +0100
979@@ -3,6 +3,7 @@
980
981 #include <linux/pagemap.h>
982 #include <linux/swap.h>
983+#include <linux/vs_memory.h>
984 #include <asm/percpu.h>
985 #include <asm/pgalloc.h>
986 #include <asm/tlbflush.h>
987diff -NurpP --minimal linux-2.6.33/arch/um/include/shared/kern_constants.h linux-2.6.33-vs2.3.0.36.30.3/arch/um/include/shared/kern_constants.h
988--- linux-2.6.33/arch/um/include/shared/kern_constants.h 1970-01-01 01:00:00.000000000 +0100
989+++ linux-2.6.33-vs2.3.0.36.30.3/arch/um/include/shared/kern_constants.h 2010-03-10 20:12:12.000000000 +0100
990@@ -0,0 +1 @@
991+#include "../../../../include/generated/asm-offsets.h"
992diff -NurpP --minimal linux-2.6.33/arch/um/include/shared/user_constants.h linux-2.6.33-vs2.3.0.36.30.3/arch/um/include/shared/user_constants.h
993--- linux-2.6.33/arch/um/include/shared/user_constants.h 1970-01-01 01:00:00.000000000 +0100
994+++ linux-2.6.33-vs2.3.0.36.30.3/arch/um/include/shared/user_constants.h 2010-03-10 20:12:12.000000000 +0100
995@@ -0,0 +1,40 @@
996+/*
997+ * DO NOT MODIFY.
998+ *
999+ * This file was generated by arch/um/Makefile
1000+ *
1001+ */
1002+
1003+#define HOST_SC_CR2 176 /* offsetof(struct sigcontext, cr2) # */
1004+#define HOST_SC_ERR 152 /* offsetof(struct sigcontext, err) # */
1005+#define HOST_SC_TRAPNO 160 /* offsetof(struct sigcontext, trapno) # */
1006+#define HOST_FP_SIZE 64 /* sizeof(struct _fpstate) / sizeof(unsigned long) # */
1007+#define HOST_RBX 5 /* RBX # */
1008+#define HOST_RCX 11 /* RCX # */
1009+#define HOST_RDI 14 /* RDI # */
1010+#define HOST_RSI 13 /* RSI # */
1011+#define HOST_RDX 12 /* RDX # */
1012+#define HOST_RBP 4 /* RBP # */
1013+#define HOST_RAX 10 /* RAX # */
1014+#define HOST_R8 9 /* R8 # */
1015+#define HOST_R9 8 /* R9 # */
1016+#define HOST_R10 7 /* R10 # */
1017+#define HOST_R11 6 /* R11 # */
1018+#define HOST_R12 3 /* R12 # */
1019+#define HOST_R13 2 /* R13 # */
1020+#define HOST_R14 1 /* R14 # */
1021+#define HOST_R15 0 /* R15 # */
1022+#define HOST_ORIG_RAX 15 /* ORIG_RAX # */
1023+#define HOST_CS 17 /* CS # */
1024+#define HOST_SS 20 /* SS # */
1025+#define HOST_EFLAGS 18 /* EFLAGS # */
1026+#define HOST_IP 16 /* RIP # */
1027+#define HOST_SP 19 /* RSP # */
1028+#define UM_FRAME_SIZE 216 /* sizeof(struct user_regs_struct) # */
1029+#define UM_POLLIN 1 /* POLLIN # */
1030+#define UM_POLLPRI 2 /* POLLPRI # */
1031+#define UM_POLLOUT 4 /* POLLOUT # */
1032+#define UM_PROT_READ 1 /* PROT_READ # */
1033+#define UM_PROT_WRITE 2 /* PROT_WRITE # */
1034+#define UM_PROT_EXEC 4 /* PROT_EXEC # */
1035+
1036diff -NurpP --minimal linux-2.6.33/arch/um/Kconfig.rest linux-2.6.33-vs2.3.0.36.30.3/arch/um/Kconfig.rest
1037--- linux-2.6.33/arch/um/Kconfig.rest 2009-06-11 17:12:19.000000000 +0200
1038+++ linux-2.6.33-vs2.3.0.36.30.3/arch/um/Kconfig.rest 2010-03-10 20:23:16.000000000 +0100
1039@@ -18,6 +18,8 @@ source "drivers/connector/Kconfig"
1040
1041 source "fs/Kconfig"
1042
1043+source "kernel/vserver/Kconfig"
1044+
1045 source "security/Kconfig"
1046
1047 source "crypto/Kconfig"
1048diff -NurpP --minimal linux-2.6.33/arch/um/kernel/config.c linux-2.6.33-vs2.3.0.36.30.3/arch/um/kernel/config.c
1049--- linux-2.6.33/arch/um/kernel/config.c 1970-01-01 01:00:00.000000000 +0100
1050+++ linux-2.6.33-vs2.3.0.36.30.3/arch/um/kernel/config.c 2010-03-10 20:29:55.000000000 +0100
1051@@ -0,0 +1,417 @@
1052+/*
1053+ * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
1054+ * Licensed under the GPL
1055+ */
1056+
1057+#include <stdio.h>
1058+#include <stdlib.h>
1059+#include "init.h"
1060+
1061+static __initdata const char *config[] = {
1062+
1063+"#\n",
1064+"# Automatically generated make config: don't edit\n",
1065+"# Linux kernel version: 2.6.33-vs2.3.0.36.29.1\n",
1066+"# Wed Mar 10 20:29:46 2010\n",
1067+"#\n",
1068+"CONFIG_DEFCONFIG_LIST=\"arch/$ARCH/defconfig\"\n",
1069+"CONFIG_GENERIC_HARDIRQS=y\n",
1070+"CONFIG_UML=y\n",
1071+"CONFIG_MMU=y\n",
1072+"CONFIG_NO_IOMEM=y\n",
1073+"# CONFIG_TRACE_IRQFLAGS_SUPPORT is not set\n",
1074+"CONFIG_LOCKDEP_SUPPORT=y\n",
1075+"# CONFIG_STACKTRACE_SUPPORT is not set\n",
1076+"CONFIG_GENERIC_CALIBRATE_DELAY=y\n",
1077+"CONFIG_GENERIC_BUG=y\n",
1078+"CONFIG_GENERIC_TIME=y\n",
1079+"CONFIG_GENERIC_CLOCKEVENTS=y\n",
1080+"CONFIG_IRQ_RELEASE_METHOD=y\n",
1081+"CONFIG_HZ=100\n",
1082+"\n",
1083+"#\n",
1084+"# UML-specific options\n",
1085+"#\n",
1086+"\n",
1087+"#\n",
1088+"# Host processor type and features\n",
1089+"#\n",
1090+"# CONFIG_M386 is not set\n",
1091+"# CONFIG_M486 is not set\n",
1092+"# CONFIG_M586 is not set\n",
1093+"# CONFIG_M586TSC is not set\n",
1094+"# CONFIG_M586MMX is not set\n",
1095+"# CONFIG_M686 is not set\n",
1096+"# CONFIG_MPENTIUMII is not set\n",
1097+"# CONFIG_MPENTIUMIII is not set\n",
1098+"# CONFIG_MPENTIUMM is not set\n",
1099+"# CONFIG_MPENTIUM4 is not set\n",
1100+"# CONFIG_MK6 is not set\n",
1101+"# CONFIG_MK7 is not set\n",
1102+"CONFIG_MK8=y\n",
1103+"# CONFIG_MCRUSOE is not set\n",
1104+"# CONFIG_MEFFICEON is not set\n",
1105+"# CONFIG_MWINCHIPC6 is not set\n",
1106+"# CONFIG_MWINCHIP3D is not set\n",
1107+"# CONFIG_MGEODEGX1 is not set\n",
1108+"# CONFIG_MGEODE_LX is not set\n",
1109+"# CONFIG_MCYRIXIII is not set\n",
1110+"# CONFIG_MVIAC3_2 is not set\n",
1111+"# CONFIG_MVIAC7 is not set\n",
1112+"# CONFIG_MPSC is not set\n",
1113+"# CONFIG_MCORE2 is not set\n",
1114+"# CONFIG_MATOM is not set\n",
1115+"# CONFIG_GENERIC_CPU is not set\n",
1116+"CONFIG_X86_CPU=y\n",
1117+"CONFIG_X86_INTERNODE_CACHE_SHIFT=6\n",
1118+"# CONFIG_X86_CMPXCHG is not set\n",
1119+"CONFIG_X86_L1_CACHE_SHIFT=6\n",
1120+"CONFIG_X86_WP_WORKS_OK=y\n",
1121+"CONFIG_X86_INTEL_USERCOPY=y\n",
1122+"CONFIG_X86_USE_PPRO_CHECKSUM=y\n",
1123+"CONFIG_X86_TSC=y\n",
1124+"CONFIG_X86_CMOV=y\n",
1125+"CONFIG_X86_MINIMUM_CPU_FAMILY=3\n",
1126+"CONFIG_CPU_SUP_INTEL=y\n",
1127+"CONFIG_CPU_SUP_AMD=y\n",
1128+"CONFIG_CPU_SUP_CENTAUR=y\n",
1129+"CONFIG_UML_X86=y\n",
1130+"CONFIG_64BIT=y\n",
1131+"# CONFIG_X86_32 is not set\n",
1132+"# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set\n",
1133+"CONFIG_RWSEM_GENERIC_SPINLOCK=y\n",
1134+"# CONFIG_ARCH_HAS_SC_SIGNALS is not set\n",
1135+"# CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA is not set\n",
1136+"CONFIG_SMP_BROKEN=y\n",
1137+"CONFIG_GENERIC_HWEIGHT=y\n",
1138+"# CONFIG_STATIC_LINK is not set\n",
1139+"CONFIG_FLATMEM=y\n",
1140+"CONFIG_FLAT_NODE_MEM_MAP=y\n",
1141+"CONFIG_PAGEFLAGS_EXTENDED=y\n",
1142+"CONFIG_SPLIT_PTLOCK_CPUS=4\n",
1143+"CONFIG_PHYS_ADDR_T_64BIT=y\n",
1144+"CONFIG_ZONE_DMA_FLAG=0\n",
1145+"CONFIG_VIRT_TO_BUS=y\n",
1146+"# CONFIG_KSM is not set\n",
1147+"CONFIG_DEFAULT_MMAP_MIN_ADDR=4096\n",
1148+"# CONFIG_NO_HZ is not set\n",
1149+"# CONFIG_HIGH_RES_TIMERS is not set\n",
1150+"CONFIG_GENERIC_CLOCKEVENTS_BUILD=y\n",
1151+"CONFIG_LD_SCRIPT_DYN=y\n",
1152+"# CONFIG_BINFMT_ELF is not set\n",
1153+"# CONFIG_HAVE_AOUT is not set\n",
1154+"# CONFIG_BINFMT_MISC is not set\n",
1155+"# CONFIG_HOSTFS is not set\n",
1156+"# CONFIG_MCONSOLE is not set\n",
1157+"CONFIG_KERNEL_STACK_ORDER=1\n",
1158+"\n",
1159+"#\n",
1160+"# General setup\n",
1161+"#\n",
1162+"# CONFIG_EXPERIMENTAL is not set\n",
1163+"CONFIG_BROKEN_ON_SMP=y\n",
1164+"CONFIG_INIT_ENV_ARG_LIMIT=128\n",
1165+"CONFIG_LOCALVERSION=\"\"\n",
1166+"# CONFIG_LOCALVERSION_AUTO is not set\n",
1167+"# CONFIG_SWAP is not set\n",
1168+"CONFIG_SYSVIPC=y\n",
1169+"CONFIG_SYSVIPC_SYSCTL=y\n",
1170+"# CONFIG_BSD_PROCESS_ACCT is not set\n",
1171+"\n",
1172+"#\n",
1173+"# RCU Subsystem\n",
1174+"#\n",
1175+"CONFIG_TREE_RCU=y\n",
1176+"# CONFIG_TREE_PREEMPT_RCU is not set\n",
1177+"# CONFIG_TINY_RCU is not set\n",
1178+"# CONFIG_RCU_TRACE is not set\n",
1179+"CONFIG_RCU_FANOUT=64\n",
1180+"# CONFIG_RCU_FANOUT_EXACT is not set\n",
1181+"# CONFIG_TREE_RCU_TRACE is not set\n",
1182+"# CONFIG_IKCONFIG is not set\n",
1183+"CONFIG_LOG_BUF_SHIFT=17\n",
1184+"# CONFIG_CGROUPS is not set\n",
1185+"# CONFIG_SYSFS_DEPRECATED_V2 is not set\n",
1186+"# CONFIG_RELAY is not set\n",
1187+"CONFIG_NAMESPACES=y\n",
1188+"CONFIG_UTS_NS=y\n",
1189+"CONFIG_IPC_NS=y\n",
1190+"CONFIG_USER_NS=y\n",
1191+"# CONFIG_BLK_DEV_INITRD is not set\n",
1192+"# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set\n",
1193+"CONFIG_SYSCTL=y\n",
1194+"CONFIG_ANON_INODES=y\n",
1195+"# CONFIG_EMBEDDED is not set\n",
1196+"CONFIG_UID16=y\n",
1197+"CONFIG_SYSCTL_SYSCALL=y\n",
1198+"CONFIG_KALLSYMS=y\n",
1199+"# CONFIG_KALLSYMS_EXTRA_PASS is not set\n",
1200+"CONFIG_HOTPLUG=y\n",
1201+"CONFIG_PRINTK=y\n",
1202+"CONFIG_BUG=y\n",
1203+"CONFIG_ELF_CORE=y\n",
1204+"CONFIG_BASE_FULL=y\n",
1205+"CONFIG_FUTEX=y\n",
1206+"CONFIG_EPOLL=y\n",
1207+"CONFIG_SIGNALFD=y\n",
1208+"CONFIG_TIMERFD=y\n",
1209+"CONFIG_EVENTFD=y\n",
1210+"CONFIG_SHMEM=y\n",
1211+"CONFIG_AIO=y\n",
1212+"\n",
1213+"#\n",
1214+"# Kernel Performance Events And Counters\n",
1215+"#\n",
1216+"CONFIG_VM_EVENT_COUNTERS=y\n",
1217+"CONFIG_SLUB_DEBUG=y\n",
1218+"# CONFIG_COMPAT_BRK is not set\n",
1219+"# CONFIG_SLAB is not set\n",
1220+"CONFIG_SLUB=y\n",
1221+"# CONFIG_SLOB is not set\n",
1222+"# CONFIG_PROFILING is not set\n",
1223+"\n",
1224+"#\n",
1225+"# GCOV-based kernel profiling\n",
1226+"#\n",
1227+"# CONFIG_SLOW_WORK is not set\n",
1228+"# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set\n",
1229+"CONFIG_SLABINFO=y\n",
1230+"CONFIG_RT_MUTEXES=y\n",
1231+"CONFIG_BASE_SMALL=0\n",
1232+"# CONFIG_MODULES is not set\n",
1233+"CONFIG_BLOCK=y\n",
1234+"# CONFIG_BLK_DEV_BSG is not set\n",
1235+"# CONFIG_BLK_DEV_INTEGRITY is not set\n",
1236+"\n",
1237+"#\n",
1238+"# IO Schedulers\n",
1239+"#\n",
1240+"CONFIG_IOSCHED_NOOP=y\n",
1241+"# CONFIG_IOSCHED_DEADLINE is not set\n",
1242+"# CONFIG_IOSCHED_CFQ is not set\n",
1243+"# CONFIG_DEFAULT_DEADLINE is not set\n",
1244+"# CONFIG_DEFAULT_CFQ is not set\n",
1245+"CONFIG_DEFAULT_NOOP=y\n",
1246+"CONFIG_DEFAULT_IOSCHED=\"noop\"\n",
1247+"# CONFIG_INLINE_SPIN_TRYLOCK is not set\n",
1248+"# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set\n",
1249+"# CONFIG_INLINE_SPIN_LOCK is not set\n",
1250+"# CONFIG_INLINE_SPIN_LOCK_BH is not set\n",
1251+"# CONFIG_INLINE_SPIN_LOCK_IRQ is not set\n",
1252+"# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set\n",
1253+"CONFIG_INLINE_SPIN_UNLOCK=y\n",
1254+"# CONFIG_INLINE_SPIN_UNLOCK_BH is not set\n",
1255+"CONFIG_INLINE_SPIN_UNLOCK_IRQ=y\n",
1256+"# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set\n",
1257+"# CONFIG_INLINE_READ_TRYLOCK is not set\n",
1258+"# CONFIG_INLINE_READ_LOCK is not set\n",
1259+"# CONFIG_INLINE_READ_LOCK_BH is not set\n",
1260+"# CONFIG_INLINE_READ_LOCK_IRQ is not set\n",
1261+"# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set\n",
1262+"CONFIG_INLINE_READ_UNLOCK=y\n",
1263+"# CONFIG_INLINE_READ_UNLOCK_BH is not set\n",
1264+"CONFIG_INLINE_READ_UNLOCK_IRQ=y\n",
1265+"# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set\n",
1266+"# CONFIG_INLINE_WRITE_TRYLOCK is not set\n",
1267+"# CONFIG_INLINE_WRITE_LOCK is not set\n",
1268+"# CONFIG_INLINE_WRITE_LOCK_BH is not set\n",
1269+"# CONFIG_INLINE_WRITE_LOCK_IRQ is not set\n",
1270+"# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set\n",
1271+"CONFIG_INLINE_WRITE_UNLOCK=y\n",
1272+"# CONFIG_INLINE_WRITE_UNLOCK_BH is not set\n",
1273+"CONFIG_INLINE_WRITE_UNLOCK_IRQ=y\n",
1274+"# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set\n",
1275+"# CONFIG_MUTEX_SPIN_ON_OWNER is not set\n",
1276+"# CONFIG_FREEZER is not set\n",
1277+"# CONFIG_BLK_DEV is not set\n",
1278+"\n",
1279+"#\n",
1280+"# Character Devices\n",
1281+"#\n",
1282+"# CONFIG_STDERR_CONSOLE is not set\n",
1283+"CONFIG_STDIO_CONSOLE=y\n",
1284+"# CONFIG_SSL is not set\n",
1285+"# CONFIG_NULL_CHAN is not set\n",
1286+"# CONFIG_PORT_CHAN is not set\n",
1287+"# CONFIG_PTY_CHAN is not set\n",
1288+"# CONFIG_TTY_CHAN is not set\n",
1289+"# CONFIG_XTERM_CHAN is not set\n",
1290+"CONFIG_NOCONFIG_CHAN=y\n",
1291+"CONFIG_CON_ZERO_CHAN=\"fd:0,fd:1\"\n",
1292+"CONFIG_CON_CHAN=\"xterm\"\n",
1293+"CONFIG_SSL_CHAN=\"pty\"\n",
1294+"# CONFIG_UNIX98_PTYS is not set\n",
1295+"# CONFIG_LEGACY_PTYS is not set\n",
1296+"# CONFIG_RAW_DRIVER is not set\n",
1297+"# CONFIG_WATCHDOG is not set\n",
1298+"# CONFIG_UML_SOUND is not set\n",
1299+"# CONFIG_SOUND is not set\n",
1300+"# CONFIG_SOUND_OSS_CORE is not set\n",
1301+"# CONFIG_HOSTAUDIO is not set\n",
1302+"# CONFIG_HW_RANDOM is not set\n",
1303+"# CONFIG_UML_RANDOM is not set\n",
1304+"# CONFIG_MMAPPER is not set\n",
1305+"\n",
1306+"#\n",
1307+"# Generic Driver Options\n",
1308+"#\n",
1309+"CONFIG_UEVENT_HELPER_PATH=\"/sbin/hotplug\"\n",
1310+"CONFIG_STANDALONE=y\n",
1311+"# CONFIG_PREVENT_FIRMWARE_BUILD is not set\n",
1312+"CONFIG_FW_LOADER=y\n",
1313+"# CONFIG_FIRMWARE_IN_KERNEL is not set\n",
1314+"CONFIG_EXTRA_FIRMWARE=\"\"\n",
1315+"# CONFIG_SYS_HYPERVISOR is not set\n",
1316+"# CONFIG_NET is not set\n",
1317+"\n",
1318+"#\n",
1319+"# File systems\n",
1320+"#\n",
1321+"# CONFIG_EXT2_FS is not set\n",
1322+"# CONFIG_EXT3_FS is not set\n",
1323+"# CONFIG_EXT4_FS is not set\n",
1324+"# CONFIG_REISERFS_FS is not set\n",
1325+"# CONFIG_JFS_FS is not set\n",
1326+"# CONFIG_FS_POSIX_ACL is not set\n",
1327+"# CONFIG_XFS_FS is not set\n",
1328+"CONFIG_FILE_LOCKING=y\n",
1329+"# CONFIG_FSNOTIFY is not set\n",
1330+"# CONFIG_DNOTIFY is not set\n",
1331+"# CONFIG_INOTIFY is not set\n",
1332+"# CONFIG_INOTIFY_USER is not set\n",
1333+"# CONFIG_QUOTA is not set\n",
1334+"# CONFIG_AUTOFS_FS is not set\n",
1335+"# CONFIG_AUTOFS4_FS is not set\n",
1336+"# CONFIG_FUSE_FS is not set\n",
1337+"\n",
1338+"#\n",
1339+"# Caches\n",
1340+"#\n",
1341+"\n",
1342+"#\n",
1343+"# CD-ROM/DVD Filesystems\n",
1344+"#\n",
1345+"# CONFIG_ISO9660_FS is not set\n",
1346+"# CONFIG_UDF_FS is not set\n",
1347+"\n",
1348+"#\n",
1349+"# DOS/FAT/NT Filesystems\n",
1350+"#\n",
1351+"# CONFIG_MSDOS_FS is not set\n",
1352+"# CONFIG_VFAT_FS is not set\n",
1353+"# CONFIG_NTFS_FS is not set\n",
1354+"\n",
1355+"#\n",
1356+"# Pseudo filesystems\n",
1357+"#\n",
1358+"CONFIG_PROC_FS=y\n",
1359+"# CONFIG_PROC_KCORE is not set\n",
1360+"CONFIG_PROC_SYSCTL=y\n",
1361+"CONFIG_PROC_PAGE_MONITOR=y\n",
1362+"CONFIG_SYSFS=y\n",
1363+"# CONFIG_TMPFS is not set\n",
1364+"# CONFIG_HUGETLB_PAGE is not set\n",
1365+"# CONFIG_CONFIGFS_FS is not set\n",
1366+"# CONFIG_MISC_FILESYSTEMS is not set\n",
1367+"\n",
1368+"#\n",
1369+"# Partition Types\n",
1370+"#\n",
1371+"# CONFIG_PARTITION_ADVANCED is not set\n",
1372+"CONFIG_MSDOS_PARTITION=y\n",
1373+"# CONFIG_NLS is not set\n",
1374+"\n",
1375+"#\n",
1376+"# Linux VServer\n",
1377+"#\n",
1378+"# CONFIG_VSERVER_AUTO_LBACK is not set\n",
1379+"# CONFIG_VSERVER_COWBL is not set\n",
1380+"# CONFIG_VSERVER_PROC_SECURE is not set\n",
1381+"# CONFIG_VSERVER_HARDCPU is not set\n",
1382+"# CONFIG_TAGGING_NONE is not set\n",
1383+"# CONFIG_TAGGING_UID16 is not set\n",
1384+"# CONFIG_TAGGING_GID16 is not set\n",
1385+"CONFIG_TAGGING_ID24=y\n",
1386+"# CONFIG_TAGGING_INTERN is not set\n",
1387+"# CONFIG_TAG_NFSD is not set\n",
1388+"# CONFIG_VSERVER_PRIVACY is not set\n",
1389+"CONFIG_VSERVER_CONTEXTS=768\n",
1390+"# CONFIG_VSERVER_WARN is not set\n",
1391+"# CONFIG_VSERVER_DEBUG is not set\n",
1392+"CONFIG_VSERVER=y\n",
1393+"\n",
1394+"#\n",
1395+"# Security options\n",
1396+"#\n",
1397+"# CONFIG_KEYS is not set\n",
1398+"# CONFIG_SECURITY is not set\n",
1399+"# CONFIG_SECURITYFS is not set\n",
1400+"# CONFIG_DEFAULT_SECURITY_SELINUX is not set\n",
1401+"# CONFIG_DEFAULT_SECURITY_SMACK is not set\n",
1402+"# CONFIG_DEFAULT_SECURITY_TOMOYO is not set\n",
1403+"CONFIG_DEFAULT_SECURITY_DAC=y\n",
1404+"CONFIG_DEFAULT_SECURITY=\"\"\n",
1405+"# CONFIG_CRYPTO is not set\n",
1406+"# CONFIG_BINARY_PRINTF is not set\n",
1407+"\n",
1408+"#\n",
1409+"# Library routines\n",
1410+"#\n",
1411+"CONFIG_GENERIC_FIND_FIRST_BIT=y\n",
1412+"CONFIG_GENERIC_FIND_NEXT_BIT=y\n",
1413+"CONFIG_GENERIC_FIND_LAST_BIT=y\n",
1414+"# CONFIG_CRC_CCITT is not set\n",
1415+"# CONFIG_CRC16 is not set\n",
1416+"# CONFIG_CRC_T10DIF is not set\n",
1417+"# CONFIG_CRC_ITU_T is not set\n",
1418+"# CONFIG_CRC32 is not set\n",
1419+"# CONFIG_CRC7 is not set\n",
1420+"# CONFIG_LIBCRC32C is not set\n",
1421+"CONFIG_HAS_DMA=y\n",
1422+"\n",
1423+"#\n",
1424+"# SCSI device support\n",
1425+"#\n",
1426+"# CONFIG_RAID_ATTRS is not set\n",
1427+"# CONFIG_SCSI is not set\n",
1428+"# CONFIG_SCSI_DMA is not set\n",
1429+"# CONFIG_SCSI_NETLINK is not set\n",
1430+"# CONFIG_MD is not set\n",
1431+"# CONFIG_NEW_LEDS is not set\n",
1432+"# CONFIG_INPUT is not set\n",
1433+"\n",
1434+"#\n",
1435+"# Kernel hacking\n",
1436+"#\n",
1437+"# CONFIG_PRINTK_TIME is not set\n",
1438+"# CONFIG_ENABLE_WARN_DEPRECATED is not set\n",
1439+"# CONFIG_ENABLE_MUST_CHECK is not set\n",
1440+"CONFIG_FRAME_WARN=2048\n",
1441+"# CONFIG_STRIP_ASM_SYMS is not set\n",
1442+"# CONFIG_UNUSED_SYMBOLS is not set\n",
1443+"# CONFIG_DEBUG_FS is not set\n",
1444+"# CONFIG_DEBUG_KERNEL is not set\n",
1445+"# CONFIG_SLUB_DEBUG_ON is not set\n",
1446+"# CONFIG_SLUB_STATS is not set\n",
1447+"CONFIG_DEBUG_BUGVERBOSE=y\n",
1448+"CONFIG_DEBUG_MEMORY_INIT=y\n",
1449+"# CONFIG_RCU_CPU_STALL_DETECTOR is not set\n",
1450+"# CONFIG_SYSCTL_SYSCALL_CHECK is not set\n",
1451+"# CONFIG_SAMPLES is not set\n",
1452+"# CONFIG_DEBUG_STACK_USAGE is not set\n",
1453+""
1454+};
1455+
1456+static int __init print_config(char *line, int *add)
1457+{
1458+ int i;
1459+ for (i = 0; i < sizeof(config)/sizeof(config[0]); i++)
1460+ printf("%s", config[i]);
1461+ exit(0);
1462+}
1463+
1464+__uml_setup("--showconfig", print_config,
1465+"--showconfig\n"
1466+" Prints the config file that this UML binary was generated from.\n\n"
1467+);
1468+
1469diff -NurpP --minimal linux-2.6.33/arch/um/kernel/config.tmp linux-2.6.33-vs2.3.0.36.30.3/arch/um/kernel/config.tmp
1470--- linux-2.6.33/arch/um/kernel/config.tmp 1970-01-01 01:00:00.000000000 +0100
1471+++ linux-2.6.33-vs2.3.0.36.30.3/arch/um/kernel/config.tmp 2010-03-10 20:29:55.000000000 +0100
1472@@ -0,0 +1,390 @@
1473+"#\n",
1474+"# Automatically generated make config: don't edit\n",
1475+"# Linux kernel version: 2.6.33-vs2.3.0.36.29.1\n",
1476+"# Wed Mar 10 20:29:46 2010\n",
1477+"#\n",
1478+"CONFIG_DEFCONFIG_LIST=\"arch/$ARCH/defconfig\"\n",
1479+"CONFIG_GENERIC_HARDIRQS=y\n",
1480+"CONFIG_UML=y\n",
1481+"CONFIG_MMU=y\n",
1482+"CONFIG_NO_IOMEM=y\n",
1483+"# CONFIG_TRACE_IRQFLAGS_SUPPORT is not set\n",
1484+"CONFIG_LOCKDEP_SUPPORT=y\n",
1485+"# CONFIG_STACKTRACE_SUPPORT is not set\n",
1486+"CONFIG_GENERIC_CALIBRATE_DELAY=y\n",
1487+"CONFIG_GENERIC_BUG=y\n",
1488+"CONFIG_GENERIC_TIME=y\n",
1489+"CONFIG_GENERIC_CLOCKEVENTS=y\n",
1490+"CONFIG_IRQ_RELEASE_METHOD=y\n",
1491+"CONFIG_HZ=100\n",
1492+"\n",
1493+"#\n",
1494+"# UML-specific options\n",
1495+"#\n",
1496+"\n",
1497+"#\n",
1498+"# Host processor type and features\n",
1499+"#\n",
1500+"# CONFIG_M386 is not set\n",
1501+"# CONFIG_M486 is not set\n",
1502+"# CONFIG_M586 is not set\n",
1503+"# CONFIG_M586TSC is not set\n",
1504+"# CONFIG_M586MMX is not set\n",
1505+"# CONFIG_M686 is not set\n",
1506+"# CONFIG_MPENTIUMII is not set\n",
1507+"# CONFIG_MPENTIUMIII is not set\n",
1508+"# CONFIG_MPENTIUMM is not set\n",
1509+"# CONFIG_MPENTIUM4 is not set\n",
1510+"# CONFIG_MK6 is not set\n",
1511+"# CONFIG_MK7 is not set\n",
1512+"CONFIG_MK8=y\n",
1513+"# CONFIG_MCRUSOE is not set\n",
1514+"# CONFIG_MEFFICEON is not set\n",
1515+"# CONFIG_MWINCHIPC6 is not set\n",
1516+"# CONFIG_MWINCHIP3D is not set\n",
1517+"# CONFIG_MGEODEGX1 is not set\n",
1518+"# CONFIG_MGEODE_LX is not set\n",
1519+"# CONFIG_MCYRIXIII is not set\n",
1520+"# CONFIG_MVIAC3_2 is not set\n",
1521+"# CONFIG_MVIAC7 is not set\n",
1522+"# CONFIG_MPSC is not set\n",
1523+"# CONFIG_MCORE2 is not set\n",
1524+"# CONFIG_MATOM is not set\n",
1525+"# CONFIG_GENERIC_CPU is not set\n",
1526+"CONFIG_X86_CPU=y\n",
1527+"CONFIG_X86_INTERNODE_CACHE_SHIFT=6\n",
1528+"# CONFIG_X86_CMPXCHG is not set\n",
1529+"CONFIG_X86_L1_CACHE_SHIFT=6\n",
1530+"CONFIG_X86_WP_WORKS_OK=y\n",
1531+"CONFIG_X86_INTEL_USERCOPY=y\n",
1532+"CONFIG_X86_USE_PPRO_CHECKSUM=y\n",
1533+"CONFIG_X86_TSC=y\n",
1534+"CONFIG_X86_CMOV=y\n",
1535+"CONFIG_X86_MINIMUM_CPU_FAMILY=3\n",
1536+"CONFIG_CPU_SUP_INTEL=y\n",
1537+"CONFIG_CPU_SUP_AMD=y\n",
1538+"CONFIG_CPU_SUP_CENTAUR=y\n",
1539+"CONFIG_UML_X86=y\n",
1540+"CONFIG_64BIT=y\n",
1541+"# CONFIG_X86_32 is not set\n",
1542+"# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set\n",
1543+"CONFIG_RWSEM_GENERIC_SPINLOCK=y\n",
1544+"# CONFIG_ARCH_HAS_SC_SIGNALS is not set\n",
1545+"# CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA is not set\n",
1546+"CONFIG_SMP_BROKEN=y\n",
1547+"CONFIG_GENERIC_HWEIGHT=y\n",
1548+"# CONFIG_STATIC_LINK is not set\n",
1549+"CONFIG_FLATMEM=y\n",
1550+"CONFIG_FLAT_NODE_MEM_MAP=y\n",
1551+"CONFIG_PAGEFLAGS_EXTENDED=y\n",
1552+"CONFIG_SPLIT_PTLOCK_CPUS=4\n",
1553+"CONFIG_PHYS_ADDR_T_64BIT=y\n",
1554+"CONFIG_ZONE_DMA_FLAG=0\n",
1555+"CONFIG_VIRT_TO_BUS=y\n",
1556+"# CONFIG_KSM is not set\n",
1557+"CONFIG_DEFAULT_MMAP_MIN_ADDR=4096\n",
1558+"# CONFIG_NO_HZ is not set\n",
1559+"# CONFIG_HIGH_RES_TIMERS is not set\n",
1560+"CONFIG_GENERIC_CLOCKEVENTS_BUILD=y\n",
1561+"CONFIG_LD_SCRIPT_DYN=y\n",
1562+"# CONFIG_BINFMT_ELF is not set\n",
1563+"# CONFIG_HAVE_AOUT is not set\n",
1564+"# CONFIG_BINFMT_MISC is not set\n",
1565+"# CONFIG_HOSTFS is not set\n",
1566+"# CONFIG_MCONSOLE is not set\n",
1567+"CONFIG_KERNEL_STACK_ORDER=1\n",
1568+"\n",
1569+"#\n",
1570+"# General setup\n",
1571+"#\n",
1572+"# CONFIG_EXPERIMENTAL is not set\n",
1573+"CONFIG_BROKEN_ON_SMP=y\n",
1574+"CONFIG_INIT_ENV_ARG_LIMIT=128\n",
1575+"CONFIG_LOCALVERSION=\"\"\n",
1576+"# CONFIG_LOCALVERSION_AUTO is not set\n",
1577+"# CONFIG_SWAP is not set\n",
1578+"CONFIG_SYSVIPC=y\n",
1579+"CONFIG_SYSVIPC_SYSCTL=y\n",
1580+"# CONFIG_BSD_PROCESS_ACCT is not set\n",
1581+"\n",
1582+"#\n",
1583+"# RCU Subsystem\n",
1584+"#\n",
1585+"CONFIG_TREE_RCU=y\n",
1586+"# CONFIG_TREE_PREEMPT_RCU is not set\n",
1587+"# CONFIG_TINY_RCU is not set\n",
1588+"# CONFIG_RCU_TRACE is not set\n",
1589+"CONFIG_RCU_FANOUT=64\n",
1590+"# CONFIG_RCU_FANOUT_EXACT is not set\n",
1591+"# CONFIG_TREE_RCU_TRACE is not set\n",
1592+"# CONFIG_IKCONFIG is not set\n",
1593+"CONFIG_LOG_BUF_SHIFT=17\n",
1594+"# CONFIG_CGROUPS is not set\n",
1595+"# CONFIG_SYSFS_DEPRECATED_V2 is not set\n",
1596+"# CONFIG_RELAY is not set\n",
1597+"CONFIG_NAMESPACES=y\n",
1598+"CONFIG_UTS_NS=y\n",
1599+"CONFIG_IPC_NS=y\n",
1600+"CONFIG_USER_NS=y\n",
1601+"# CONFIG_BLK_DEV_INITRD is not set\n",
1602+"# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set\n",
1603+"CONFIG_SYSCTL=y\n",
1604+"CONFIG_ANON_INODES=y\n",
1605+"# CONFIG_EMBEDDED is not set\n",
1606+"CONFIG_UID16=y\n",
1607+"CONFIG_SYSCTL_SYSCALL=y\n",
1608+"CONFIG_KALLSYMS=y\n",
1609+"# CONFIG_KALLSYMS_EXTRA_PASS is not set\n",
1610+"CONFIG_HOTPLUG=y\n",
1611+"CONFIG_PRINTK=y\n",
1612+"CONFIG_BUG=y\n",
1613+"CONFIG_ELF_CORE=y\n",
1614+"CONFIG_BASE_FULL=y\n",
1615+"CONFIG_FUTEX=y\n",
1616+"CONFIG_EPOLL=y\n",
1617+"CONFIG_SIGNALFD=y\n",
1618+"CONFIG_TIMERFD=y\n",
1619+"CONFIG_EVENTFD=y\n",
1620+"CONFIG_SHMEM=y\n",
1621+"CONFIG_AIO=y\n",
1622+"\n",
1623+"#\n",
1624+"# Kernel Performance Events And Counters\n",
1625+"#\n",
1626+"CONFIG_VM_EVENT_COUNTERS=y\n",
1627+"CONFIG_SLUB_DEBUG=y\n",
1628+"# CONFIG_COMPAT_BRK is not set\n",
1629+"# CONFIG_SLAB is not set\n",
1630+"CONFIG_SLUB=y\n",
1631+"# CONFIG_SLOB is not set\n",
1632+"# CONFIG_PROFILING is not set\n",
1633+"\n",
1634+"#\n",
1635+"# GCOV-based kernel profiling\n",
1636+"#\n",
1637+"# CONFIG_SLOW_WORK is not set\n",
1638+"# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set\n",
1639+"CONFIG_SLABINFO=y\n",
1640+"CONFIG_RT_MUTEXES=y\n",
1641+"CONFIG_BASE_SMALL=0\n",
1642+"# CONFIG_MODULES is not set\n",
1643+"CONFIG_BLOCK=y\n",
1644+"# CONFIG_BLK_DEV_BSG is not set\n",
1645+"# CONFIG_BLK_DEV_INTEGRITY is not set\n",
1646+"\n",
1647+"#\n",
1648+"# IO Schedulers\n",
1649+"#\n",
1650+"CONFIG_IOSCHED_NOOP=y\n",
1651+"# CONFIG_IOSCHED_DEADLINE is not set\n",
1652+"# CONFIG_IOSCHED_CFQ is not set\n",
1653+"# CONFIG_DEFAULT_DEADLINE is not set\n",
1654+"# CONFIG_DEFAULT_CFQ is not set\n",
1655+"CONFIG_DEFAULT_NOOP=y\n",
1656+"CONFIG_DEFAULT_IOSCHED=\"noop\"\n",
1657+"# CONFIG_INLINE_SPIN_TRYLOCK is not set\n",
1658+"# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set\n",
1659+"# CONFIG_INLINE_SPIN_LOCK is not set\n",
1660+"# CONFIG_INLINE_SPIN_LOCK_BH is not set\n",
1661+"# CONFIG_INLINE_SPIN_LOCK_IRQ is not set\n",
1662+"# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set\n",
1663+"CONFIG_INLINE_SPIN_UNLOCK=y\n",
1664+"# CONFIG_INLINE_SPIN_UNLOCK_BH is not set\n",
1665+"CONFIG_INLINE_SPIN_UNLOCK_IRQ=y\n",
1666+"# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set\n",
1667+"# CONFIG_INLINE_READ_TRYLOCK is not set\n",
1668+"# CONFIG_INLINE_READ_LOCK is not set\n",
1669+"# CONFIG_INLINE_READ_LOCK_BH is not set\n",
1670+"# CONFIG_INLINE_READ_LOCK_IRQ is not set\n",
1671+"# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set\n",
1672+"CONFIG_INLINE_READ_UNLOCK=y\n",
1673+"# CONFIG_INLINE_READ_UNLOCK_BH is not set\n",
1674+"CONFIG_INLINE_READ_UNLOCK_IRQ=y\n",
1675+"# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set\n",
1676+"# CONFIG_INLINE_WRITE_TRYLOCK is not set\n",
1677+"# CONFIG_INLINE_WRITE_LOCK is not set\n",
1678+"# CONFIG_INLINE_WRITE_LOCK_BH is not set\n",
1679+"# CONFIG_INLINE_WRITE_LOCK_IRQ is not set\n",
1680+"# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set\n",
1681+"CONFIG_INLINE_WRITE_UNLOCK=y\n",
1682+"# CONFIG_INLINE_WRITE_UNLOCK_BH is not set\n",
1683+"CONFIG_INLINE_WRITE_UNLOCK_IRQ=y\n",
1684+"# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set\n",
1685+"# CONFIG_MUTEX_SPIN_ON_OWNER is not set\n",
1686+"# CONFIG_FREEZER is not set\n",
1687+"# CONFIG_BLK_DEV is not set\n",
1688+"\n",
1689+"#\n",
1690+"# Character Devices\n",
1691+"#\n",
1692+"# CONFIG_STDERR_CONSOLE is not set\n",
1693+"CONFIG_STDIO_CONSOLE=y\n",
1694+"# CONFIG_SSL is not set\n",
1695+"# CONFIG_NULL_CHAN is not set\n",
1696+"# CONFIG_PORT_CHAN is not set\n",
1697+"# CONFIG_PTY_CHAN is not set\n",
1698+"# CONFIG_TTY_CHAN is not set\n",
1699+"# CONFIG_XTERM_CHAN is not set\n",
1700+"CONFIG_NOCONFIG_CHAN=y\n",
1701+"CONFIG_CON_ZERO_CHAN=\"fd:0,fd:1\"\n",
1702+"CONFIG_CON_CHAN=\"xterm\"\n",
1703+"CONFIG_SSL_CHAN=\"pty\"\n",
1704+"# CONFIG_UNIX98_PTYS is not set\n",
1705+"# CONFIG_LEGACY_PTYS is not set\n",
1706+"# CONFIG_RAW_DRIVER is not set\n",
1707+"# CONFIG_WATCHDOG is not set\n",
1708+"# CONFIG_UML_SOUND is not set\n",
1709+"# CONFIG_SOUND is not set\n",
1710+"# CONFIG_SOUND_OSS_CORE is not set\n",
1711+"# CONFIG_HOSTAUDIO is not set\n",
1712+"# CONFIG_HW_RANDOM is not set\n",
1713+"# CONFIG_UML_RANDOM is not set\n",
1714+"# CONFIG_MMAPPER is not set\n",
1715+"\n",
1716+"#\n",
1717+"# Generic Driver Options\n",
1718+"#\n",
1719+"CONFIG_UEVENT_HELPER_PATH=\"/sbin/hotplug\"\n",
1720+"CONFIG_STANDALONE=y\n",
1721+"# CONFIG_PREVENT_FIRMWARE_BUILD is not set\n",
1722+"CONFIG_FW_LOADER=y\n",
1723+"# CONFIG_FIRMWARE_IN_KERNEL is not set\n",
1724+"CONFIG_EXTRA_FIRMWARE=\"\"\n",
1725+"# CONFIG_SYS_HYPERVISOR is not set\n",
1726+"# CONFIG_NET is not set\n",
1727+"\n",
1728+"#\n",
1729+"# File systems\n",
1730+"#\n",
1731+"# CONFIG_EXT2_FS is not set\n",
1732+"# CONFIG_EXT3_FS is not set\n",
1733+"# CONFIG_EXT4_FS is not set\n",
1734+"# CONFIG_REISERFS_FS is not set\n",
1735+"# CONFIG_JFS_FS is not set\n",
1736+"# CONFIG_FS_POSIX_ACL is not set\n",
1737+"# CONFIG_XFS_FS is not set\n",
1738+"CONFIG_FILE_LOCKING=y\n",
1739+"# CONFIG_FSNOTIFY is not set\n",
1740+"# CONFIG_DNOTIFY is not set\n",
1741+"# CONFIG_INOTIFY is not set\n",
1742+"# CONFIG_INOTIFY_USER is not set\n",
1743+"# CONFIG_QUOTA is not set\n",
1744+"# CONFIG_AUTOFS_FS is not set\n",
1745+"# CONFIG_AUTOFS4_FS is not set\n",
1746+"# CONFIG_FUSE_FS is not set\n",
1747+"\n",
1748+"#\n",
1749+"# Caches\n",
1750+"#\n",
1751+"\n",
1752+"#\n",
1753+"# CD-ROM/DVD Filesystems\n",
1754+"#\n",
1755+"# CONFIG_ISO9660_FS is not set\n",
1756+"# CONFIG_UDF_FS is not set\n",
1757+"\n",
1758+"#\n",
1759+"# DOS/FAT/NT Filesystems\n",
1760+"#\n",
1761+"# CONFIG_MSDOS_FS is not set\n",
1762+"# CONFIG_VFAT_FS is not set\n",
1763+"# CONFIG_NTFS_FS is not set\n",
1764+"\n",
1765+"#\n",
1766+"# Pseudo filesystems\n",
1767+"#\n",
1768+"CONFIG_PROC_FS=y\n",
1769+"# CONFIG_PROC_KCORE is not set\n",
1770+"CONFIG_PROC_SYSCTL=y\n",
1771+"CONFIG_PROC_PAGE_MONITOR=y\n",
1772+"CONFIG_SYSFS=y\n",
1773+"# CONFIG_TMPFS is not set\n",
1774+"# CONFIG_HUGETLB_PAGE is not set\n",
1775+"# CONFIG_CONFIGFS_FS is not set\n",
1776+"# CONFIG_MISC_FILESYSTEMS is not set\n",
1777+"\n",
1778+"#\n",
1779+"# Partition Types\n",
1780+"#\n",
1781+"# CONFIG_PARTITION_ADVANCED is not set\n",
1782+"CONFIG_MSDOS_PARTITION=y\n",
1783+"# CONFIG_NLS is not set\n",
1784+"\n",
1785+"#\n",
1786+"# Linux VServer\n",
1787+"#\n",
1788+"# CONFIG_VSERVER_AUTO_LBACK is not set\n",
1789+"# CONFIG_VSERVER_COWBL is not set\n",
1790+"# CONFIG_VSERVER_PROC_SECURE is not set\n",
1791+"# CONFIG_VSERVER_HARDCPU is not set\n",
1792+"# CONFIG_TAGGING_NONE is not set\n",
1793+"# CONFIG_TAGGING_UID16 is not set\n",
1794+"# CONFIG_TAGGING_GID16 is not set\n",
1795+"CONFIG_TAGGING_ID24=y\n",
1796+"# CONFIG_TAGGING_INTERN is not set\n",
1797+"# CONFIG_TAG_NFSD is not set\n",
1798+"# CONFIG_VSERVER_PRIVACY is not set\n",
1799+"CONFIG_VSERVER_CONTEXTS=768\n",
1800+"# CONFIG_VSERVER_WARN is not set\n",
1801+"# CONFIG_VSERVER_DEBUG is not set\n",
1802+"CONFIG_VSERVER=y\n",
1803+"\n",
1804+"#\n",
1805+"# Security options\n",
1806+"#\n",
1807+"# CONFIG_KEYS is not set\n",
1808+"# CONFIG_SECURITY is not set\n",
1809+"# CONFIG_SECURITYFS is not set\n",
1810+"# CONFIG_DEFAULT_SECURITY_SELINUX is not set\n",
1811+"# CONFIG_DEFAULT_SECURITY_SMACK is not set\n",
1812+"# CONFIG_DEFAULT_SECURITY_TOMOYO is not set\n",
1813+"CONFIG_DEFAULT_SECURITY_DAC=y\n",
1814+"CONFIG_DEFAULT_SECURITY=\"\"\n",
1815+"# CONFIG_CRYPTO is not set\n",
1816+"# CONFIG_BINARY_PRINTF is not set\n",
1817+"\n",
1818+"#\n",
1819+"# Library routines\n",
1820+"#\n",
1821+"CONFIG_GENERIC_FIND_FIRST_BIT=y\n",
1822+"CONFIG_GENERIC_FIND_NEXT_BIT=y\n",
1823+"CONFIG_GENERIC_FIND_LAST_BIT=y\n",
1824+"# CONFIG_CRC_CCITT is not set\n",
1825+"# CONFIG_CRC16 is not set\n",
1826+"# CONFIG_CRC_T10DIF is not set\n",
1827+"# CONFIG_CRC_ITU_T is not set\n",
1828+"# CONFIG_CRC32 is not set\n",
1829+"# CONFIG_CRC7 is not set\n",
1830+"# CONFIG_LIBCRC32C is not set\n",
1831+"CONFIG_HAS_DMA=y\n",
1832+"\n",
1833+"#\n",
1834+"# SCSI device support\n",
1835+"#\n",
1836+"# CONFIG_RAID_ATTRS is not set\n",
1837+"# CONFIG_SCSI is not set\n",
1838+"# CONFIG_SCSI_DMA is not set\n",
1839+"# CONFIG_SCSI_NETLINK is not set\n",
1840+"# CONFIG_MD is not set\n",
1841+"# CONFIG_NEW_LEDS is not set\n",
1842+"# CONFIG_INPUT is not set\n",
1843+"\n",
1844+"#\n",
1845+"# Kernel hacking\n",
1846+"#\n",
1847+"# CONFIG_PRINTK_TIME is not set\n",
1848+"# CONFIG_ENABLE_WARN_DEPRECATED is not set\n",
1849+"# CONFIG_ENABLE_MUST_CHECK is not set\n",
1850+"CONFIG_FRAME_WARN=2048\n",
1851+"# CONFIG_STRIP_ASM_SYMS is not set\n",
1852+"# CONFIG_UNUSED_SYMBOLS is not set\n",
1853+"# CONFIG_DEBUG_FS is not set\n",
1854+"# CONFIG_DEBUG_KERNEL is not set\n",
1855+"# CONFIG_SLUB_DEBUG_ON is not set\n",
1856+"# CONFIG_SLUB_STATS is not set\n",
1857+"CONFIG_DEBUG_BUGVERBOSE=y\n",
1858+"CONFIG_DEBUG_MEMORY_INIT=y\n",
1859+"# CONFIG_RCU_CPU_STALL_DETECTOR is not set\n",
1860+"# CONFIG_SYSCTL_SYSCALL_CHECK is not set\n",
1861+"# CONFIG_SAMPLES is not set\n",
1862+"# CONFIG_DEBUG_STACK_USAGE is not set\n",
1863diff -NurpP --minimal linux-2.6.33/arch/um/kernel/vmlinux.lds linux-2.6.33-vs2.3.0.36.30.3/arch/um/kernel/vmlinux.lds
1864--- linux-2.6.33/arch/um/kernel/vmlinux.lds 1970-01-01 01:00:00.000000000 +0100
1865+++ linux-2.6.33-vs2.3.0.36.30.3/arch/um/kernel/vmlinux.lds 2010-03-10 20:12:32.000000000 +0100
1866@@ -0,0 +1,547 @@
1867+
1868+
1869+/*
1870+ * Automatically generated C config: don't edit
1871+ * Linux kernel version: 2.6.33-vs2.3.0.36.29.1
1872+ * Wed Mar 10 20:12:10 2010
1873+ */
1874+KERNEL_STACK_SIZE = 4096 * (1 << 1);
1875+/*
1876+ * Helper macros to support writing architecture specific
1877+ * linker scripts.
1878+ *
1879+ * A minimal linker scripts has following content:
1880+ * [This is a sample, architectures may have special requiriements]
1881+ *
1882+ * OUTPUT_FORMAT(...)
1883+ * OUTPUT_ARCH(...)
1884+ * ENTRY(...)
1885+ * SECTIONS
1886+ * {
1887+ * . = START;
1888+ * __init_begin = .;
1889+ * HEAD_TEXT_SECTION
1890+ * INIT_TEXT_SECTION(PAGE_SIZE)
1891+ * INIT_DATA_SECTION(...)
1892+ * PERCPU(PAGE_SIZE)
1893+ * __init_end = .;
1894+ *
1895+ * _stext = .;
1896+ * TEXT_SECTION = 0
1897+ * _etext = .;
1898+ *
1899+ * _sdata = .;
1900+ * RO_DATA_SECTION(PAGE_SIZE)
1901+ * RW_DATA_SECTION(...)
1902+ * _edata = .;
1903+ *
1904+ * EXCEPTION_TABLE(...)
1905+ * NOTES
1906+ *
1907+ * BSS_SECTION(0, 0, 0)
1908+ * _end = .;
1909+ *
1910+ * STABS_DEBUG
1911+ * DWARF_DEBUG
1912+ *
1913+ * DISCARDS // must be the last
1914+ * }
1915+ *
1916+ * [__init_begin, __init_end] is the init section that may be freed after init
1917+ * [_stext, _etext] is the text section
1918+ * [_sdata, _edata] is the data section
1919+ *
1920+ * Some of the included output section have their own set of constants.
1921+ * Examples are: [__initramfs_start, __initramfs_end] for initramfs and
1922+ * [__nosave_begin, __nosave_end] for the nosave data
1923+ */
1924+
1925+
1926+
1927+
1928+
1929+
1930+
1931+/* Align . to a 8 byte boundary equals to maximum function alignment. */
1932+
1933+
1934+/* The actual configuration determine if the init/exit sections
1935+ * are handled as text/data or they can be discarded (which
1936+ * often happens at runtime)
1937+ */
1938+/* .data section */
1939+/*
1940+ * Data section helpers
1941+ */
1942+/*
1943+ * Read only Data
1944+ */
1945+/* RODATA & RO_DATA provided for backward compatibility.
1946+ * All archs are supposed to use RO_DATA() */
1947+/* .text section. Map to function alignment to avoid address changes
1948+ * during second ld run in second ld pass when generating System.map */
1949+/* sched.text is aling to function alignment to secure we have same
1950+ * address even at second ld pass when generating System.map */
1951+/* spinlock.text is aling to function alignment to secure we have same
1952+ * address even at second ld pass when generating System.map */
1953+/* Section used for early init (in .S files) */
1954+/*
1955+ * Exception table
1956+ */
1957+/*
1958+ * Init task
1959+ */
1960+/* init and exit section handling */
1961+/*
1962+ * bss (Block Started by Symbol) - uninitialized data
1963+ * zeroed during startup
1964+ */
1965+/*
1966+ * DWARF debug sections.
1967+ * Symbols in the DWARF debugging sections are relative to
1968+ * the beginning of the section so we begin them at 0.
1969+ */
1970+ /* Stabs debugging sections. */
1971+/*
1972+ * Default discarded sections.
1973+ *
1974+ * Some archs want to discard exit text/data at runtime rather than
1975+ * link time due to cross-section references such as alt instructions,
1976+ * bug table, eh_frame, etc. DISCARDS must be the last of output
1977+ * section definitions so that such archs put those in earlier section
1978+ * definitions.
1979+ */
1980+/**
1981+ * PERCPU_VADDR - define output section for percpu area
1982+ * @vaddr: explicit base address (optional)
1983+ * @phdr: destination PHDR (optional)
1984+ *
1985+ * Macro which expands to output section for percpu area. If @vaddr
1986+ * is not blank, it specifies explicit base address and all percpu
1987+ * symbols will be offset from the given address. If blank, @vaddr
1988+ * always equals @laddr + LOAD_OFFSET.
1989+ *
1990+ * @phdr defines the output PHDR to use if not blank. Be warned that
1991+ * output PHDR is sticky. If @phdr is specified, the next output
1992+ * section in the linker script will go there too. @phdr should have
1993+ * a leading colon.
1994+ *
1995+ * Note that this macros defines __per_cpu_load as an absolute symbol.
1996+ * If there is no need to put the percpu section at a predetermined
1997+ * address, use PERCPU().
1998+ */
1999+/**
2000+ * PERCPU - define output section for percpu area, simple version
2001+ * @align: required alignment
2002+ *
2003+ * Align to @align and outputs output section for percpu area. This
2004+ * macro doesn't maniuplate @vaddr or @phdr and __per_cpu_load and
2005+ * __per_cpu_start will be identical.
2006+ *
2007+ * This macro is equivalent to ALIGN(align); PERCPU_VADDR( , ) except
2008+ * that __per_cpu_load is defined as a relative symbol against
2009+ * .data.percpu which is required for relocatable x86_32
2010+ * configuration.
2011+ */
2012+/*
2013+ * Definition of the high level *_SECTION macros
2014+ * They will fit only a subset of the architectures
2015+ */
2016+/*
2017+ * Writeable data.
2018+ * All sections are combined in a single .data section.
2019+ * The sections following CONSTRUCTORS are arranged so their
2020+ * typical alignment matches.
2021+ * A cacheline is typical/always less than a PAGE_SIZE so
2022+ * the sections that has this restriction (or similar)
2023+ * is located before the ones requiring PAGE_SIZE alignment.
2024+ * NOSAVE_DATA starts and ends with a PAGE_SIZE alignment which
2025+ * matches the requirment of PAGE_ALIGNED_DATA.
2026+ *
2027+ * use 0 as page_align if page_aligned data is not used */
2028+/*
2029+ * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
2030+ * Copyright 2003 PathScale, Inc.
2031+ * Licensed under the GPL
2032+ */
2033+/* const.h: Macros for dealing with constants. */
2034+/* Some constant macros are used in both assembler and
2035+ * C code. Therefore we cannot annotate them always with
2036+ * 'UL' and other type specifiers unilaterally. We
2037+ * use the following macros to deal with this.
2038+ *
2039+ * Similarly, _AT() will cast an expression with a type in C, but
2040+ * leave it unchanged in asm.
2041+ */
2042+/* PAGE_SHIFT determines the page size */
2043+OUTPUT_FORMAT(elf64-x86-64)
2044+OUTPUT_ARCH(i386:x86-64)
2045+ENTRY(_start)
2046+jiffies = jiffies_64;
2047+SECTIONS
2048+{
2049+ PROVIDE (__executable_start = 0x60000000);
2050+ . = 0x60000000 + SIZEOF_HEADERS;
2051+ .interp : { *(.interp) }
2052+ __binary_start = .;
2053+ . = ALIGN(4096); /* Init code and data */
2054+ _text = .;
2055+ _stext = .;
2056+ __init_begin = .;
2057+ . = ALIGN((1 << 12)); .init.text : AT(ADDR(.init.text) - 0) { _sinittext = .; *(.init.text) *(.cpuinit.text) *(.meminit.text) _einittext = .; }
2058+ . = ALIGN((1 << 12));
2059+ /* Read-only sections, merged into text segment: */
2060+ .hash : { *(.hash) }
2061+ .gnu.hash : { *(.gnu.hash) }
2062+ .dynsym : { *(.dynsym) }
2063+ .dynstr : { *(.dynstr) }
2064+ .gnu.version : { *(.gnu.version) }
2065+ .gnu.version_d : { *(.gnu.version_d) }
2066+ .gnu.version_r : { *(.gnu.version_r) }
2067+ .rel.init : { *(.rel.init) }
2068+ .rela.init : { *(.rela.init) }
2069+ .rel.text : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) }
2070+ .rela.text : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) }
2071+ .rel.fini : { *(.rel.fini) }
2072+ .rela.fini : { *(.rela.fini) }
2073+ .rel.rodata : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) }
2074+ .rela.rodata : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) }
2075+ .rel.data : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) }
2076+ .rela.data : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) }
2077+ .rel.tdata : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) }
2078+ .rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) }
2079+ .rel.tbss : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) }
2080+ .rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) }
2081+ .rel.ctors : { *(.rel.ctors) }
2082+ .rela.ctors : { *(.rela.ctors) }
2083+ .rel.dtors : { *(.rel.dtors) }
2084+ .rela.dtors : { *(.rela.dtors) }
2085+ .rel.got : { *(.rel.got) }
2086+ .rela.got : { *(.rela.got) }
2087+ .rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
2088+ .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
2089+ .rel.plt : { *(.rel.plt) }
2090+ .rela.plt : { *(.rela.plt) }
2091+ .init : {
2092+ KEEP (*(.init))
2093+ } =0x90909090
2094+ .plt : { *(.plt) }
2095+ .text : {
2096+ . = ALIGN(8); *(.text.hot) *(.text) *(.ref.text) *(.devinit.text) *(.devexit.text) *(.text.unlikely)
2097+ . = ALIGN(8); __sched_text_start = .; *(.sched.text) __sched_text_end = .;
2098+ . = ALIGN(8); __lock_text_start = .; *(.spinlock.text) __lock_text_end = .;
2099+ *(.fixup)
2100+ *(.stub .text.* .gnu.linkonce.t.*)
2101+ /* .gnu.warning sections are handled specially by elf32.em. */
2102+ *(.gnu.warning)
2103+ . = ALIGN((1 << 12));
2104+ } =0x90909090
2105+ . = ALIGN((1 << 12));
2106+ .syscall_stub : {
2107+ __syscall_stub_start = .;
2108+ *(.__syscall_stub*)
2109+ __syscall_stub_end = .;
2110+ }
2111+ .fini : {
2112+ KEEP (*(.fini))
2113+ } =0x90909090
2114+ .kstrtab : { *(.kstrtab) }
2115+/*
2116+ * Helper macros to support writing architecture specific
2117+ * linker scripts.
2118+ *
2119+ * A minimal linker scripts has following content:
2120+ * [This is a sample, architectures may have special requiriements]
2121+ *
2122+ * OUTPUT_FORMAT(...)
2123+ * OUTPUT_ARCH(...)
2124+ * ENTRY(...)
2125+ * SECTIONS
2126+ * {
2127+ * . = START;
2128+ * __init_begin = .;
2129+ * HEAD_TEXT_SECTION
2130+ * INIT_TEXT_SECTION(PAGE_SIZE)
2131+ * INIT_DATA_SECTION(...)
2132+ * PERCPU(PAGE_SIZE)
2133+ * __init_end = .;
2134+ *
2135+ * _stext = .;
2136+ * TEXT_SECTION = 0
2137+ * _etext = .;
2138+ *
2139+ * _sdata = .;
2140+ * RO_DATA_SECTION(PAGE_SIZE)
2141+ * RW_DATA_SECTION(...)
2142+ * _edata = .;
2143+ *
2144+ * EXCEPTION_TABLE(...)
2145+ * NOTES
2146+ *
2147+ * BSS_SECTION(0, 0, 0)
2148+ * _end = .;
2149+ *
2150+ * STABS_DEBUG
2151+ * DWARF_DEBUG
2152+ *
2153+ * DISCARDS // must be the last
2154+ * }
2155+ *
2156+ * [__init_begin, __init_end] is the init section that may be freed after init
2157+ * [_stext, _etext] is the text section
2158+ * [_sdata, _edata] is the data section
2159+ *
2160+ * Some of the included output section have their own set of constants.
2161+ * Examples are: [__initramfs_start, __initramfs_end] for initramfs and
2162+ * [__nosave_begin, __nosave_end] for the nosave data
2163+ */
2164+/* Align . to a 8 byte boundary equals to maximum function alignment. */
2165+/* The actual configuration determine if the init/exit sections
2166+ * are handled as text/data or they can be discarded (which
2167+ * often happens at runtime)
2168+ */
2169+/* .data section */
2170+/*
2171+ * Data section helpers
2172+ */
2173+/*
2174+ * Read only Data
2175+ */
2176+/* RODATA & RO_DATA provided for backward compatibility.
2177+ * All archs are supposed to use RO_DATA() */
2178+/* .text section. Map to function alignment to avoid address changes
2179+ * during second ld run in second ld pass when generating System.map */
2180+/* sched.text is aling to function alignment to secure we have same
2181+ * address even at second ld pass when generating System.map */
2182+/* spinlock.text is aling to function alignment to secure we have same
2183+ * address even at second ld pass when generating System.map */
2184+/* Section used for early init (in .S files) */
2185+/*
2186+ * Exception table
2187+ */
2188+/*
2189+ * Init task
2190+ */
2191+/* init and exit section handling */
2192+/*
2193+ * bss (Block Started by Symbol) - uninitialized data
2194+ * zeroed during startup
2195+ */
2196+/*
2197+ * DWARF debug sections.
2198+ * Symbols in the DWARF debugging sections are relative to
2199+ * the beginning of the section so we begin them at 0.
2200+ */
2201+ /* Stabs debugging sections. */
2202+/*
2203+ * Default discarded sections.
2204+ *
2205+ * Some archs want to discard exit text/data at runtime rather than
2206+ * link time due to cross-section references such as alt instructions,
2207+ * bug table, eh_frame, etc. DISCARDS must be the last of output
2208+ * section definitions so that such archs put those in earlier section
2209+ * definitions.
2210+ */
2211+/**
2212+ * PERCPU_VADDR - define output section for percpu area
2213+ * @vaddr: explicit base address (optional)
2214+ * @phdr: destination PHDR (optional)
2215+ *
2216+ * Macro which expands to output section for percpu area. If @vaddr
2217+ * is not blank, it specifies explicit base address and all percpu
2218+ * symbols will be offset from the given address. If blank, @vaddr
2219+ * always equals @laddr + LOAD_OFFSET.
2220+ *
2221+ * @phdr defines the output PHDR to use if not blank. Be warned that
2222+ * output PHDR is sticky. If @phdr is specified, the next output
2223+ * section in the linker script will go there too. @phdr should have
2224+ * a leading colon.
2225+ *
2226+ * Note that this macros defines __per_cpu_load as an absolute symbol.
2227+ * If there is no need to put the percpu section at a predetermined
2228+ * address, use PERCPU().
2229+ */
2230+/**
2231+ * PERCPU - define output section for percpu area, simple version
2232+ * @align: required alignment
2233+ *
2234+ * Align to @align and outputs output section for percpu area. This
2235+ * macro doesn't maniuplate @vaddr or @phdr and __per_cpu_load and
2236+ * __per_cpu_start will be identical.
2237+ *
2238+ * This macro is equivalent to ALIGN(align); PERCPU_VADDR( , ) except
2239+ * that __per_cpu_load is defined as a relative symbol against
2240+ * .data.percpu which is required for relocatable x86_32
2241+ * configuration.
2242+ */
2243+/*
2244+ * Definition of the high level *_SECTION macros
2245+ * They will fit only a subset of the architectures
2246+ */
2247+/*
2248+ * Writeable data.
2249+ * All sections are combined in a single .data section.
2250+ * The sections following CONSTRUCTORS are arranged so their
2251+ * typical alignment matches.
2252+ * A cacheline is typical/always less than a PAGE_SIZE so
2253+ * the sections that has this restriction (or similar)
2254+ * is located before the ones requiring PAGE_SIZE alignment.
2255+ * NOSAVE_DATA starts and ends with a PAGE_SIZE alignment which
2256+ * matches the requirment of PAGE_ALIGNED_DATA.
2257+ *
2258+ * use 0 as page_align if page_aligned data is not used */
2259+ .fini : { *(.fini) } =0x9090
2260+ _etext = .;
2261+ PROVIDE (etext = .);
2262+ . = ALIGN(4096);
2263+ _sdata = .;
2264+ PROVIDE (sdata = .);
2265+ . = ALIGN((4096)); .rodata : AT(ADDR(.rodata) - 0) { __start_rodata = .; *(.rodata) *(.rodata.*) *(__vermagic) *(__markers_strings) *(__tracepoints_strings) } .rodata1 : AT(ADDR(.rodata1) - 0) { *(.rodata1) } . = ALIGN(8); __bug_table : AT(ADDR(__bug_table) - 0) { __start___bug_table = .; *(__bug_table) __stop___bug_table = .; } .pci_fixup : AT(ADDR(.pci_fixup) - 0) { __start_pci_fixups_early = .; *(.pci_fixup_early) __end_pci_fixups_early = .; __start_pci_fixups_header = .; *(.pci_fixup_header) __end_pci_fixups_header = .; __start_pci_fixups_final = .; *(.pci_fixup_final) __end_pci_fixups_final = .; __start_pci_fixups_enable = .; *(.pci_fixup_enable) __end_pci_fixups_enable = .; __start_pci_fixups_resume = .; *(.pci_fixup_resume) __end_pci_fixups_resume = .; __start_pci_fixups_resume_early = .; *(.pci_fixup_resume_early) __end_pci_fixups_resume_early = .; __start_pci_fixups_suspend = .; *(.pci_fixup_suspend) __end_pci_fixups_suspend = .; } .builtin_fw : AT(ADDR(.builtin_fw) - 0) { __start_builtin_fw = .; *(.builtin_fw) __end_builtin_fw = .; } .rio_route : AT(ADDR(.rio_route) - 0) { __start_rio_route_ops = .; *(.rio_route_ops) __end_rio_route_ops = .; } __ksymtab : AT(ADDR(__ksymtab) - 0) { __start___ksymtab = .; *(__ksymtab) __stop___ksymtab = .; } __ksymtab_gpl : AT(ADDR(__ksymtab_gpl) - 0) { __start___ksymtab_gpl = .; *(__ksymtab_gpl) __stop___ksymtab_gpl = .; } __ksymtab_unused : AT(ADDR(__ksymtab_unused) - 0) { __start___ksymtab_unused = .; *(__ksymtab_unused) __stop___ksymtab_unused = .; } __ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - 0) { __start___ksymtab_unused_gpl = .; *(__ksymtab_unused_gpl) __stop___ksymtab_unused_gpl = .; } __ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - 0) { __start___ksymtab_gpl_future = .; *(__ksymtab_gpl_future) __stop___ksymtab_gpl_future = .; } __kcrctab : AT(ADDR(__kcrctab) - 0) { __start___kcrctab = .; *(__kcrctab) __stop___kcrctab = .; } __kcrctab_gpl : AT(ADDR(__kcrctab_gpl) - 0) { __start___kcrctab_gpl = .; *(__kcrctab_gpl) __stop___kcrctab_gpl = .; } __kcrctab_unused : AT(ADDR(__kcrctab_unused) - 0) { __start___kcrctab_unused = .; *(__kcrctab_unused) __stop___kcrctab_unused = .; } __kcrctab_unused_gpl : AT(ADDR(__kcrctab_unused_gpl) - 0) { __start___kcrctab_unused_gpl = .; *(__kcrctab_unused_gpl) __stop___kcrctab_unused_gpl = .; } __kcrctab_gpl_future : AT(ADDR(__kcrctab_gpl_future) - 0) { __start___kcrctab_gpl_future = .; *(__kcrctab_gpl_future) __stop___kcrctab_gpl_future = .; } __ksymtab_strings : AT(ADDR(__ksymtab_strings) - 0) { *(__ksymtab_strings) } __init_rodata : AT(ADDR(__init_rodata) - 0) { *(.ref.rodata) *(.devinit.rodata) *(.devexit.rodata) } __param : AT(ADDR(__param) - 0) { __start___param = .; *(__param) __stop___param = .; . = ALIGN((4096)); __end_rodata = .; } . = ALIGN((4096));
2266+ .unprotected : { *(.unprotected) }
2267+ . = ALIGN(4096);
2268+ PROVIDE (_unprotected_end = .);
2269+ . = ALIGN(4096);
2270+ .note : { *(.note.*) }
2271+ . = ALIGN(0); __ex_table : AT(ADDR(__ex_table) - 0) { __start___ex_table = .; *(__ex_table) __stop___ex_table = .; }
2272+ . = ALIGN(8); __bug_table : AT(ADDR(__bug_table) - 0) { __start___bug_table = .; *(__bug_table) __stop___bug_table = .; }
2273+ .uml.setup.init : {
2274+ __uml_setup_start = .;
2275+ *(.uml.setup.init)
2276+ __uml_setup_end = .;
2277+ }
2278+ .uml.help.init : {
2279+ __uml_help_start = .;
2280+ *(.uml.help.init)
2281+ __uml_help_end = .;
2282+ }
2283+ .uml.postsetup.init : {
2284+ __uml_postsetup_start = .;
2285+ *(.uml.postsetup.init)
2286+ __uml_postsetup_end = .;
2287+ }
2288+ .init.setup : {
2289+ . = ALIGN(0); __setup_start = .; *(.init.setup) __setup_end = .;
2290+ }
2291+ . = ALIGN(32); .data.percpu : AT(ADDR(.data.percpu) - 0) { __per_cpu_load = .; __per_cpu_start = .; *(.data.percpu.first) *(.data.percpu.page_aligned) *(.data.percpu) *(.data.percpu.shared_aligned) __per_cpu_end = .; }
2292+ .initcall.init : {
2293+ __initcall_start = .; *(.initcallearly.init) __early_initcall_end = .; *(.initcall0.init) *(.initcall0s.init) *(.initcall1.init) *(.initcall1s.init) *(.initcall2.init) *(.initcall2s.init) *(.initcall3.init) *(.initcall3s.init) *(.initcall4.init) *(.initcall4s.init) *(.initcall5.init) *(.initcall5s.init) *(.initcallrootfs.init) *(.initcall6.init) *(.initcall6s.init) *(.initcall7.init) *(.initcall7s.init) __initcall_end = .;
2294+ }
2295+ .con_initcall.init : {
2296+ __con_initcall_start = .; *(.con_initcall.init) __con_initcall_end = .;
2297+ }
2298+ .uml.initcall.init : {
2299+ __uml_initcall_start = .;
2300+ *(.uml.initcall.init)
2301+ __uml_initcall_end = .;
2302+ }
2303+ __init_end = .;
2304+ .security_initcall.init : AT(ADDR(.security_initcall.init) - 0) { __security_initcall_start = .; *(.security_initcall.init) __security_initcall_end = .; }
2305+ .exitcall : {
2306+ __exitcall_begin = .;
2307+ *(.exitcall.exit)
2308+ __exitcall_end = .;
2309+ }
2310+ .uml.exitcall : {
2311+ __uml_exitcall_begin = .;
2312+ *(.uml.exitcall.exit)
2313+ __uml_exitcall_end = .;
2314+ }
2315+ . = ALIGN(4);
2316+ .altinstructions : {
2317+ __alt_instructions = .;
2318+ *(.altinstructions)
2319+ __alt_instructions_end = .;
2320+ }
2321+ .altinstr_replacement : { *(.altinstr_replacement) }
2322+ /* .exit.text is discard at runtime, not link time, to deal with references
2323+ from .altinstructions and .eh_frame */
2324+ .exit.text : { *(.exit.text) }
2325+ .exit.data : { *(.exit.data) }
2326+ .preinit_array : {
2327+ __preinit_array_start = .;
2328+ *(.preinit_array)
2329+ __preinit_array_end = .;
2330+ }
2331+ .init_array : {
2332+ __init_array_start = .;
2333+ *(.init_array)
2334+ __init_array_end = .;
2335+ }
2336+ .fini_array : {
2337+ __fini_array_start = .;
2338+ *(.fini_array)
2339+ __fini_array_end = .;
2340+ }
2341+ . = ALIGN(4096);
2342+ .init.ramfs : {
2343+
2344+ }
2345+ init.data : { *(.init.data) *(.cpuinit.data) *(.meminit.data) *(.init.rodata) *(.cpuinit.rodata) *(.meminit.rodata) }
2346+ /* Ensure the __preinit_array_start label is properly aligned. We
2347+ could instead move the label definition inside the section, but
2348+ the linker would then create the section even if it turns out to
2349+ be empty, which isn't pretty. */
2350+ . = ALIGN(32 / 8);
2351+ .preinit_array : { *(.preinit_array) }
2352+ .init_array : { *(.init_array) }
2353+ .fini_array : { *(.fini_array) }
2354+ .data : {
2355+ . = ALIGN(KERNEL_STACK_SIZE); *(.data.init_task)
2356+ . = ALIGN(KERNEL_STACK_SIZE);
2357+ *(.data.init_irqstack)
2358+ *(.data) *(.ref.data) *(.devinit.data) *(.devexit.data) . = ALIGN(8); __start___markers = .; *(__markers) __stop___markers = .; . = ALIGN(32); __start___tracepoints = .; *(__tracepoints) __stop___tracepoints = .; . = ALIGN(8); __start___verbose = .; *(__verbose) __stop___verbose = .;
2359+ *(.data.* .gnu.linkonce.d.*)
2360+ SORT(CONSTRUCTORS)
2361+ }
2362+ .data1 : { *(.data1) }
2363+ .tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
2364+ .tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
2365+ .eh_frame : { KEEP (*(.eh_frame)) }
2366+ .gcc_except_table : { *(.gcc_except_table) }
2367+ .dynamic : { *(.dynamic) }
2368+ .ctors : {
2369+ /* gcc uses crtbegin.o to find the start of
2370+ the constructors, so we make sure it is
2371+ first. Because this is a wildcard, it
2372+ doesn't matter if the user does not
2373+ actually link against crtbegin.o; the
2374+ linker won't look for a file to match a
2375+ wildcard. The wildcard also means that it
2376+ doesn't matter which directory crtbegin.o
2377+ is in. */
2378+ KEEP (*crtbegin.o(.ctors))
2379+ /* We don't want to include the .ctor section from
2380+ from the crtend.o file until after the sorted ctors.
2381+ The .ctor section from the crtend file contains the
2382+ end of ctors marker and it must be last */
2383+ KEEP (*(EXCLUDE_FILE (*crtend.o ) .ctors))
2384+ KEEP (*(SORT(.ctors.*)))
2385+ KEEP (*(.ctors))
2386+ }
2387+ .dtors : {
2388+ KEEP (*crtbegin.o(.dtors))
2389+ KEEP (*(EXCLUDE_FILE (*crtend.o ) .dtors))
2390+ KEEP (*(SORT(.dtors.*)))
2391+ KEEP (*(.dtors))
2392+ }
2393+ .jcr : { KEEP (*(.jcr)) }
2394+ .got : { *(.got.plt) *(.got) }
2395+ _edata = .;
2396+ PROVIDE (edata = .);
2397+ .bss : {
2398+ __bss_start = .;
2399+ *(.dynbss)
2400+ *(.bss .bss.* .gnu.linkonce.b.*)
2401+ *(COMMON)
2402+ /* Align here to ensure that the .bss section occupies space up to
2403+ _end. Align after .bss to ensure correct alignment even if the
2404+ .bss section disappears because there are no input sections. */
2405+ . = ALIGN(32 / 8);
2406+ . = ALIGN(32 / 8);
2407+ }
2408+ _end = .;
2409+ PROVIDE (end = .);
2410+ .stab 0 : { *(.stab) } .stabstr 0 : { *(.stabstr) } .stab.excl 0 : { *(.stab.excl) } .stab.exclstr 0 : { *(.stab.exclstr) } .stab.index 0 : { *(.stab.index) } .stab.indexstr 0 : { *(.stab.indexstr) } .comment 0 : { *(.comment) }
2411+ .debug 0 : { *(.debug) } .line 0 : { *(.line) } .debug_srcinfo 0 : { *(.debug_srcinfo) } .debug_sfnames 0 : { *(.debug_sfnames) } .debug_aranges 0 : { *(.debug_aranges) } .debug_pubnames 0 : { *(.debug_pubnames) } .debug_info 0 : { *(.debug_info .gnu.linkonce.wi.*) } .debug_abbrev 0 : { *(.debug_abbrev) } .debug_line 0 : { *(.debug_line) } .debug_frame 0 : { *(.debug_frame) } .debug_str 0 : { *(.debug_str) } .debug_loc 0 : { *(.debug_loc) } .debug_macinfo 0 : { *(.debug_macinfo) } .debug_weaknames 0 : { *(.debug_weaknames) } .debug_funcnames 0 : { *(.debug_funcnames) } .debug_typenames 0 : { *(.debug_typenames) } .debug_varnames 0 : { *(.debug_varnames) }
2412+ /DISCARD/ : { *(.exit.text) *(.cpuexit.text) *(.memexit.text) *(.exit.data) *(.cpuexit.data) *(.cpuexit.rodata) *(.memexit.data) *(.memexit.rodata) *(.exitcall.exit) *(.discard) }
2413+}
2414diff -NurpP --minimal linux-2.6.33/arch/x86/ia32/ia32entry.S linux-2.6.33-vs2.3.0.36.30.3/arch/x86/ia32/ia32entry.S
2bf5ad28 2415--- linux-2.6.33/arch/x86/ia32/ia32entry.S 2010-02-25 11:51:34.000000000 +0100
e03b8c3c 2416+++ linux-2.6.33-vs2.3.0.36.30.3/arch/x86/ia32/ia32entry.S 2010-02-25 12:02:16.000000000 +0100
1d9ef1d9 2417@@ -777,7 +777,7 @@ ia32_sys_call_table:
2380c486
JR		 2418 .quad sys_tgkill /* 270 */
2419 .quad compat_sys_utimes
2420 .quad sys32_fadvise64_64
2421- .quad quiet_ni_syscall /* sys_vserver */
2422+ .quad sys32_vserver
2423 .quad sys_mbind
2424 .quad compat_sys_get_mempolicy /* 275 */
2425 .quad sys_set_mempolicy
e03b8c3c 2426diff -NurpP --minimal linux-2.6.33/arch/x86/include/asm/unistd_64.h linux-2.6.33-vs2.3.0.36.30.3/arch/x86/include/asm/unistd_64.h
2bf5ad28 2427--- linux-2.6.33/arch/x86/include/asm/unistd_64.h 2010-02-25 11:51:34.000000000 +0100
e03b8c3c 2428+++ linux-2.6.33-vs2.3.0.36.30.3/arch/x86/include/asm/unistd_64.h 2010-02-25 12:02:16.000000000 +0100
ec22aa5c
AM		 2429@@ -535,7 +535,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill)
2430 #define __NR_utimes 235
2431 __SYSCALL(__NR_utimes, sys_utimes)
2432 #define __NR_vserver 236
2433-__SYSCALL(__NR_vserver, sys_ni_syscall)
2434+__SYSCALL(__NR_vserver, sys_vserver)
2435 #define __NR_mbind 237
2436 __SYSCALL(__NR_mbind, sys_mbind)
2437 #define __NR_set_mempolicy 238
e03b8c3c 2438diff -NurpP --minimal linux-2.6.33/arch/x86/Kconfig linux-2.6.33-vs2.3.0.36.30.3/arch/x86/Kconfig
2bf5ad28 2439--- linux-2.6.33/arch/x86/Kconfig 2010-02-25 11:51:34.000000000 +0100
e03b8c3c 2440+++ linux-2.6.33-vs2.3.0.36.30.3/arch/x86/Kconfig 2010-02-25 12:02:16.000000000 +0100
2bf5ad28 2441@@ -2083,6 +2083,8 @@ source "fs/Kconfig"
d337f35e 2442
2380c486 2443 source "arch/x86/Kconfig.debug"
d337f35e
JR		 2444
2445+source "kernel/vserver/Kconfig"
2446+
2447 source "security/Kconfig"
2448
2449 source "crypto/Kconfig"
e03b8c3c 2450diff -NurpP --minimal linux-2.6.33/arch/x86/kernel/syscall_table_32.S linux-2.6.33-vs2.3.0.36.30.3/arch/x86/kernel/syscall_table_32.S
2bf5ad28 2451--- linux-2.6.33/arch/x86/kernel/syscall_table_32.S 2010-02-25 11:51:35.000000000 +0100
e03b8c3c 2452+++ linux-2.6.33-vs2.3.0.36.30.3/arch/x86/kernel/syscall_table_32.S 2010-02-25 12:02:16.000000000 +0100
2380c486
JR		 2453@@ -272,7 +272,7 @@ ENTRY(sys_call_table)
2454 .long sys_tgkill /* 270 */
2455 .long sys_utimes
2456 .long sys_fadvise64_64
2457- .long sys_ni_syscall /* sys_vserver */
2458+ .long sys_vserver
2459 .long sys_mbind
2460 .long sys_get_mempolicy
2461 .long sys_set_mempolicy
e03b8c3c 2462diff -NurpP --minimal linux-2.6.33/arch/xtensa/mm/fault.c linux-2.6.33-vs2.3.0.36.30.3/arch/xtensa/mm/fault.c
2bf5ad28 2463--- linux-2.6.33/arch/xtensa/mm/fault.c 2009-09-10 15:25:48.000000000 +0200
e03b8c3c 2464+++ linux-2.6.33-vs2.3.0.36.30.3/arch/xtensa/mm/fault.c 2010-02-25 12:02:16.000000000 +0100
4a036bed
AM		 2465@@ -151,7 +151,8 @@ out_of_memory:
2466 down_read(&mm->mmap_sem);
2467 goto survive;
2468 }
2469- printk("VM: killing process %s\n", current->comm);
2470+ printk("VM: killing process %s(%d:#%u)\n",
2471+ current->comm, task_pid_nr(current), current->xid);
2472 if (user_mode(regs))
2473 do_group_exit(SIGKILL);
2474 bad_page_fault(regs, address, SIGKILL);
e03b8c3c 2475diff -NurpP --minimal linux-2.6.33/Documentation/scheduler/sched-cfs-hard-limits.txt linux-2.6.33-vs2.3.0.36.30.3/Documentation/scheduler/sched-cfs-hard-limits.txt
2bf5ad28 2476--- linux-2.6.33/Documentation/scheduler/sched-cfs-hard-limits.txt 1970-01-01 01:00:00.000000000 +0100
e03b8c3c 2477+++ linux-2.6.33-vs2.3.0.36.30.3/Documentation/scheduler/sched-cfs-hard-limits.txt 2010-02-25 16:25:27.000000000 +0100
7e46296a 2478@@ -0,0 +1,48 @@
4a036bed
AM		 2479+CPU HARD LIMITS FOR CFS GROUPS
2480+==============================
2481+
2482+1. Overview
2483+2. Interface
2484+3. Examples
2485+
2486+1. Overview
2487+-----------
2488+
2489+CFS is a proportional share scheduler which tries to divide the CPU time
2490+proportionately between tasks or groups of tasks (task group/cgroup) depending
2491+on the priority/weight of the task or shares assigned to groups of tasks.
2492+In CFS, a task/task group can get more than its share of CPU if there are
2493+enough idle CPU cycles available in the system, due to the work conserving
2494+nature of the scheduler. However in certain scenarios (like pay-per-use),
2495+it is desirable not to provide extra time to a group even in the presence
2496+of idle CPU cycles. This is where hard limiting can be of use.
2497+
2498+Hard limits for task groups can be set by specifying how much CPU runtime a
2499+group can consume within a given period. If the group consumes more CPU time
2500+than the runtime in a given period, it gets throttled. None of the tasks of
2501+the throttled group gets to run until the runtime of the group gets refreshed
2502+at the beginning of the next period.
2503+
2504+2. Interface
2505+------------
2506+
7e46296a 2507+Hard limit feature adds 2 cgroup files for CFS group scheduler:
4a036bed
AM		 2508+
2509+cfs_runtime_us: Hard limit for the group in microseconds.
2510+
2511+cfs_period_us: Time period in microseconds within which hard limits is
2512+enforced.
2513+
7e46296a
AM		 2514+A group gets created with default values for runtime (infinite runtime which
2515+means hard limits disabled) and period (0.5s). Each group can set its own
2516+values for runtime and period independent of other groups in the system.
4a036bed
AM		 2517+
2518+3. Examples
2519+-----------
2520+
2521+# mount -t cgroup -ocpu none /cgroups/
2522+# cd /cgroups
2523+# mkdir 1
2524+# cd 1/
2525+# echo 250000 > cfs_runtime_us /* set a 250ms runtime or limit */
2526+# echo 500000 > cfs_period_us /* set a 500ms period */
e03b8c3c 2527diff -NurpP --minimal linux-2.6.33/Documentation/vserver/debug.txt linux-2.6.33-vs2.3.0.36.30.3/Documentation/vserver/debug.txt
2bf5ad28 2528--- linux-2.6.33/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
e03b8c3c 2529+++ linux-2.6.33-vs2.3.0.36.30.3/Documentation/vserver/debug.txt 2010-02-25 12:02:16.000000000 +0100
2380c486 2530@@ -0,0 +1,154 @@
d337f35e 2531+
2380c486 2532+debug_cvirt:
d337f35e 2533+
2380c486
JR		 2534+ 2 4 "vx_map_tgid: %p/%llx: %d -> %d"
2535+ "vx_rmap_tgid: %p/%llx: %d -> %d"
d337f35e 2536+
2380c486 2537+debug_dlim:
d337f35e 2538+
2380c486
JR		 2539+ 0 1 "ALLOC (%p,#%d)%c inode (%d)"
2540+ "FREE (%p,#%d)%c inode"
2541+ 1 2 "ALLOC (%p,#%d)%c %lld bytes (%d)"
2542+ "FREE (%p,#%d)%c %lld bytes"
2543+ 2 4 "ADJUST: %lld,%lld on %ld,%ld [mult=%d]"
2544+ 3 8 "ext3_has_free_blocks(%p): %lu<%lu+1, %c, %u!=%u r=%d"
2545+ "ext3_has_free_blocks(%p): free=%lu, root=%lu"
2546+ "rcu_free_dl_info(%p)"
2547+ 4 10 "alloc_dl_info(%p,%d) = %p"
2548+ "dealloc_dl_info(%p)"
2549+ "get_dl_info(%p[#%d.%d])"
2550+ "put_dl_info(%p[#%d.%d])"
2551+ 5 20 "alloc_dl_info(%p,%d)*"
2552+ 6 40 "__hash_dl_info: %p[#%d]"
2553+ "__unhash_dl_info: %p[#%d]"
2554+ 7 80 "locate_dl_info(%p,#%d) = %p"
2555+
2556+debug_misc:
2557+
2558+ 0 1 "destroy_dqhash: %p [#0x%08x] c=%d"
2559+ "new_dqhash: %p [#0x%08x]"
2560+ "vroot[%d]_clr_dev: dev=%p[%lu,%d:%d]"
2561+ "vroot[%d]_get_real_bdev: dev=%p[%lu,%d:%d]"
2562+ "vroot[%d]_set_dev: dev=%p[%lu,%d:%d]"
2563+ "vroot_get_real_bdev not set"
2564