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