1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
|
Index: vserver-sources-2.0.2_2.6.16/drivers/block/vroot.c
===================================================================
--- vserver-sources-2.0.2_2.6.16.orig/drivers/block/vroot.c
+++ vserver-sources-2.0.2_2.6.16/drivers/block/vroot.c
@@ -12,7 +12,6 @@
*
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/file.h>
Index: vserver-sources-2.0.2_2.6.16/include/linux/vs_memory.h
===================================================================
--- vserver-sources-2.0.2_2.6.16.orig/include/linux/vs_memory.h
+++ vserver-sources-2.0.2_2.6.16/include/linux/vs_memory.h
@@ -1,7 +1,6 @@
#ifndef _VX_VS_MEMORY_H
#define _VX_VS_MEMORY_H
-#include <linux/config.h>
#include "vserver/limit.h"
#include "vserver/debug.h"
#include "vserver/limit_int.h"
Index: vserver-sources-2.0.2_2.6.16/include/linux/vs_sched.h
===================================================================
--- vserver-sources-2.0.2_2.6.16.orig/include/linux/vs_sched.h
+++ vserver-sources-2.0.2_2.6.16/include/linux/vs_sched.h
@@ -1,7 +1,6 @@
#ifndef _VX_VS_SCHED_H
#define _VX_VS_SCHED_H
-#include <linux/config.h>
#include "vserver/sched.h"
Index: vserver-sources-2.0.2_2.6.16/include/linux/vserver/context.h
===================================================================
--- vserver-sources-2.0.2_2.6.16.orig/include/linux/vserver/context.h
+++ vserver-sources-2.0.2_2.6.16/include/linux/vserver/context.h
@@ -1,7 +1,6 @@
#ifndef _VX_CONTEXT_H
#define _VX_CONTEXT_H
-#include <linux/config.h>
#include <linux/types.h>
Index: vserver-sources-2.0.2_2.6.16/include/linux/vserver/cvirt_def.h
===================================================================
--- vserver-sources-2.0.2_2.6.16.orig/include/linux/vserver/cvirt_def.h
+++ vserver-sources-2.0.2_2.6.16/include/linux/vserver/cvirt_def.h
@@ -1,7 +1,6 @@
#ifndef _VX_CVIRT_DEF_H
#define _VX_CVIRT_DEF_H
-#include <linux/config.h>
#include <linux/jiffies.h>
#include <linux/utsname.h>
#include <linux/spinlock.h>
Index: vserver-sources-2.0.2_2.6.16/include/linux/vserver/debug.h
===================================================================
--- vserver-sources-2.0.2_2.6.16.orig/include/linux/vserver/debug.h
+++ vserver-sources-2.0.2_2.6.16/include/linux/vserver/debug.h
@@ -1,8 +1,6 @@
#ifndef _VX_DEBUG_H
#define _VX_DEBUG_H
-#include <linux/config.h>
-
#define VXD_CBIT(n,m) (vx_debug_ ## n & (1 << (m)))
#define VXD_CMIN(n,m) (vx_debug_ ## n > (m))
Index: vserver-sources-2.0.2_2.6.16/include/linux/vserver/dlimit_cmd.h
===================================================================
--- vserver-sources-2.0.2_2.6.16.orig/include/linux/vserver/dlimit_cmd.h
+++ vserver-sources-2.0.2_2.6.16/include/linux/vserver/dlimit_cmd.h
@@ -1,8 +1,6 @@
#ifndef _VX_DLIMIT_CMD_H
#define _VX_DLIMIT_CMD_H
-#include <linux/config.h>
-
/* dlimit vserver commands */
Index: vserver-sources-2.0.2_2.6.16/include/linux/vserver/inode.h
===================================================================
--- vserver-sources-2.0.2_2.6.16.orig/include/linux/vserver/inode.h
+++ vserver-sources-2.0.2_2.6.16/include/linux/vserver/inode.h
@@ -15,8 +15,6 @@
#ifdef __KERNEL__
-#include <linux/config.h>
-
#ifdef CONFIG_VSERVER_PROC_SECURE
#define IATTR_PROC_DEFAULT ( IATTR_ADMIN | IATTR_HIDE )
Index: vserver-sources-2.0.2_2.6.16/include/linux/vserver/inode_cmd.h
===================================================================
--- vserver-sources-2.0.2_2.6.16.orig/include/linux/vserver/inode_cmd.h
+++ vserver-sources-2.0.2_2.6.16/include/linux/vserver/inode_cmd.h
@@ -28,8 +28,6 @@ struct vcmd_ctx_iattr_v1 {
#ifdef __KERNEL__
-#include <linux/config.h>
-
#ifdef CONFIG_COMPAT
Index: vserver-sources-2.0.2_2.6.16/include/linux/vserver/limit_def.h
===================================================================
--- vserver-sources-2.0.2_2.6.16.orig/include/linux/vserver/limit_def.h
+++ vserver-sources-2.0.2_2.6.16/include/linux/vserver/limit_def.h
@@ -1,7 +1,6 @@
#ifndef _VX_LIMIT_DEF_H
#define _VX_LIMIT_DEF_H
-#include <linux/config.h>
#include <asm/atomic.h>
#include <asm/resource.h>
Index: vserver-sources-2.0.2_2.6.16/include/linux/vserver/sched_def.h
===================================================================
--- vserver-sources-2.0.2_2.6.16.orig/include/linux/vserver/sched_def.h
+++ vserver-sources-2.0.2_2.6.16/include/linux/vserver/sched_def.h
@@ -1,7 +1,6 @@
#ifndef _VX_SCHED_DEF_H
#define _VX_SCHED_DEF_H
-#include <linux/config.h>
#include <linux/spinlock.h>
#include <linux/jiffies.h>
#include <linux/cpumask.h>
Index: vserver-sources-2.0.2_2.6.16/kernel/vserver/Kconfig
===================================================================
--- vserver-sources-2.0.2_2.6.16.orig/kernel/vserver/Kconfig
+++ vserver-sources-2.0.2_2.6.16/kernel/vserver/Kconfig
@@ -2,21 +2,6 @@
# Linux VServer configuration
#
-config VSERVER
- bool
- default y
-
-config VSERVER_SECURITY
- bool
- depends on SECURITY
- default y
- select SECURITY_CAPABILITIES
-
-config VSERVER_LEGACYNET
- bool
- depends on !VSERVER_NGNET
- default y
-
menu "Linux VServer"
config VSERVER_LEGACY
@@ -177,3 +162,19 @@ config VSERVER_HISTORY_SIZE
endmenu
+
+config VSERVER
+ bool
+ default y
+
+config VSERVER_SECURITY
+ bool
+ depends on SECURITY
+ default y
+ select SECURITY_CAPABILITIES
+
+config VSERVER_LEGACYNET
+ bool
+ depends on !VSERVER_NGNET
+ default y
+
Index: vserver-sources-2.0.2_2.6.16/kernel/vserver/context.c
===================================================================
--- vserver-sources-2.0.2_2.6.16.orig/kernel/vserver/context.c
+++ vserver-sources-2.0.2_2.6.16/kernel/vserver/context.c
@@ -19,7 +19,6 @@
*
*/
-#include <linux/config.h>
#include <linux/slab.h>
#include <linux/types.h>
#include <linux/namespace.h>
Index: vserver-sources-2.0.2_2.6.16/kernel/vserver/cvirt_init.h
===================================================================
--- vserver-sources-2.0.2_2.6.16.orig/kernel/vserver/cvirt_init.h
+++ vserver-sources-2.0.2_2.6.16/kernel/vserver/cvirt_init.h
@@ -1,6 +1,4 @@
-#include <linux/config.h>
-
#include <linux/config.h>
Index: vserver-sources-2.0.2_2.6.16/kernel/vserver/dlimit.c
===================================================================
--- vserver-sources-2.0.2_2.6.16.orig/kernel/vserver/dlimit.c
+++ vserver-sources-2.0.2_2.6.16/kernel/vserver/dlimit.c
@@ -10,7 +10,6 @@
*
*/
-#include <linux/config.h>
#include <linux/fs.h>
#include <linux/namespace.h>
#include <linux/namei.h>
Index: vserver-sources-2.0.2_2.6.16/kernel/vserver/helper.c
===================================================================
--- vserver-sources-2.0.2_2.6.16.orig/kernel/vserver/helper.c
+++ vserver-sources-2.0.2_2.6.16/kernel/vserver/helper.c
@@ -9,7 +9,6 @@
*
*/
-#include <linux/config.h>
#include <linux/errno.h>
#include <linux/kmod.h>
#include <linux/sched.h>
Index: vserver-sources-2.0.2_2.6.16/kernel/vserver/history.c
===================================================================
--- vserver-sources-2.0.2_2.6.16.orig/kernel/vserver/history.c
+++ vserver-sources-2.0.2_2.6.16/kernel/vserver/history.c
@@ -11,7 +11,6 @@
*
*/
-#include <linux/config.h>
#include <linux/errno.h>
#include <linux/module.h>
#include <linux/types.h>
Index: vserver-sources-2.0.2_2.6.16/kernel/vserver/init.c
===================================================================
--- vserver-sources-2.0.2_2.6.16.orig/kernel/vserver/init.c
+++ vserver-sources-2.0.2_2.6.16/kernel/vserver/init.c
@@ -9,7 +9,6 @@
*
*/
-#include <linux/config.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/module.h>
Index: vserver-sources-2.0.2_2.6.16/kernel/vserver/inode.c
===================================================================
--- vserver-sources-2.0.2_2.6.16.orig/kernel/vserver/inode.c
+++ vserver-sources-2.0.2_2.6.16/kernel/vserver/inode.c
@@ -9,7 +9,6 @@
*
*/
-#include <linux/config.h>
#include <linux/sched.h>
#include <linux/vs_context.h>
#include <linux/proc_fs.h>
Index: vserver-sources-2.0.2_2.6.16/kernel/vserver/limit_init.h
===================================================================
--- vserver-sources-2.0.2_2.6.16.orig/kernel/vserver/limit_init.h
+++ vserver-sources-2.0.2_2.6.16/kernel/vserver/limit_init.h
@@ -1,6 +1,4 @@
-#include <linux/config.h>
-
#include <linux/config.h>
Index: vserver-sources-2.0.2_2.6.16/kernel/vserver/network.c
===================================================================
--- vserver-sources-2.0.2_2.6.16.orig/kernel/vserver/network.c
+++ vserver-sources-2.0.2_2.6.16/kernel/vserver/network.c
@@ -13,7 +13,6 @@
*
*/
-#include <linux/config.h>
#include <linux/slab.h>
#include <linux/vserver/network_cmd.h>
#include <linux/rcupdate.h>
Index: vserver-sources-2.0.2_2.6.16/kernel/vserver/sched.c
===================================================================
--- vserver-sources-2.0.2_2.6.16.orig/kernel/vserver/sched.c
+++ vserver-sources-2.0.2_2.6.16/kernel/vserver/sched.c
@@ -10,7 +10,6 @@
*
*/
-#include <linux/config.h>
#include <linux/sched.h>
#include <linux/vs_context.h>
#include <linux/vs_sched.h>
Index: vserver-sources-2.0.2_2.6.16/kernel/vserver/switch.c
===================================================================
--- vserver-sources-2.0.2_2.6.16.orig/kernel/vserver/switch.c
+++ vserver-sources-2.0.2_2.6.16/kernel/vserver/switch.c
@@ -14,7 +14,6 @@
*
*/
-#include <linux/config.h>
#include <linux/linkage.h>
#include <linux/sched.h>
#include <linux/compat.h>
Index: vserver-sources-2.0.2_2.6.16/kernel/vserver/vci_config.h
===================================================================
--- vserver-sources-2.0.2_2.6.16.orig/kernel/vserver/vci_config.h
+++ vserver-sources-2.0.2_2.6.16/kernel/vserver/vci_config.h
@@ -1,7 +1,4 @@
-#include <linux/config.h>
-
-
enum {
VCI_KCBIT_LEGACY = 1,
VCI_KCBIT_LEGACYNET,
|
GitWeb