aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2009-04-03 05:30:53 -0400
committerEric W. Biederman <ebiederm@xmission.com>2009-11-11 03:42:56 -0500
commit6fce56ec91b502ba6fcbbc2a6d25a8c2c7f77934 (patch)
tree1927e3a9441b2be066d7cb5dad7efa95802ca2e0 /kernel/sysctl.c
parent83ac201b4f06eb8aeb7ac93cf162651ba30e0b28 (diff)
sysctl: Remove references to ctl_name and strategy from the generic sysctl table
Now that sys_sysctl is a generic wrapper around /proc/sys .ctl_name and .strategy members of sysctl tables are dead code. Remove them. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r--kernel/sysctl.c195
1 files changed, 7 insertions, 188 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index f82e955875c9..f6dacc383c16 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -205,31 +205,26 @@ extern int lock_stat;
205 205
206static struct ctl_table root_table[] = { 206static struct ctl_table root_table[] = {
207 { 207 {
208 .ctl_name = CTL_KERN,
209 .procname = "kernel", 208 .procname = "kernel",
210 .mode = 0555, 209 .mode = 0555,
211 .child = kern_table, 210 .child = kern_table,
212 }, 211 },
213 { 212 {
214 .ctl_name = CTL_VM,
215 .procname = "vm", 213 .procname = "vm",
216 .mode = 0555, 214 .mode = 0555,
217 .child = vm_table, 215 .child = vm_table,
218 }, 216 },
219 { 217 {
220 .ctl_name = CTL_FS,
221 .procname = "fs", 218 .procname = "fs",
222 .mode = 0555, 219 .mode = 0555,
223 .child = fs_table, 220 .child = fs_table,
224 }, 221 },
225 { 222 {
226 .ctl_name = CTL_DEBUG,
227 .procname = "debug", 223 .procname = "debug",
228 .mode = 0555, 224 .mode = 0555,
229 .child = debug_table, 225 .child = debug_table,
230 }, 226 },
231 { 227 {
232 .ctl_name = CTL_DEV,
233 .procname = "dev", 228 .procname = "dev",
234 .mode = 0555, 229 .mode = 0555,
235 .child = dev_table, 230 .child = dev_table,
@@ -238,7 +233,7 @@ static struct ctl_table root_table[] = {
238 * NOTE: do not add new entries to this table unless you have read 233 * NOTE: do not add new entries to this table unless you have read
239 * Documentation/sysctl/ctl_unnumbered.txt 234 * Documentation/sysctl/ctl_unnumbered.txt
240 */ 235 */
241 { .ctl_name = 0 } 236 { }
242}; 237};
243 238
244#ifdef CONFIG_SCHED_DEBUG 239#ifdef CONFIG_SCHED_DEBUG
@@ -250,7 +245,6 @@ static int max_wakeup_granularity_ns = NSEC_PER_SEC; /* 1 second */
250 245
251static struct ctl_table kern_table[] = { 246static struct ctl_table kern_table[] = {
252 { 247 {
253 .ctl_name = CTL_UNNUMBERED,
254 .procname = "sched_child_runs_first", 248 .procname = "sched_child_runs_first",
255 .data = &sysctl_sched_child_runs_first, 249 .data = &sysctl_sched_child_runs_first,
256 .maxlen = sizeof(unsigned int), 250 .maxlen = sizeof(unsigned int),
@@ -259,40 +253,33 @@ static struct ctl_table kern_table[] = {
259 }, 253 },
260#ifdef CONFIG_SCHED_DEBUG 254#ifdef CONFIG_SCHED_DEBUG
261 { 255 {
262 .ctl_name = CTL_UNNUMBERED,
263 .procname = "sched_min_granularity_ns", 256 .procname = "sched_min_granularity_ns",
264 .data = &sysctl_sched_min_granularity, 257 .data = &sysctl_sched_min_granularity,
265 .maxlen = sizeof(unsigned int), 258 .maxlen = sizeof(unsigned int),
266 .mode = 0644, 259 .mode = 0644,
267 .proc_handler = &sched_nr_latency_handler, 260 .proc_handler = &sched_nr_latency_handler,
268 .strategy = &sysctl_intvec,
269 .extra1 = &min_sched_granularity_ns, 261 .extra1 = &min_sched_granularity_ns,
270 .extra2 = &max_sched_granularity_ns, 262 .extra2 = &max_sched_granularity_ns,
271 }, 263 },
272 { 264 {
273 .ctl_name = CTL_UNNUMBERED,
274 .procname = "sched_latency_ns", 265 .procname = "sched_latency_ns",
275 .data = &sysctl_sched_latency, 266 .data = &sysctl_sched_latency,
276 .maxlen = sizeof(unsigned int), 267 .maxlen = sizeof(unsigned int),
277 .mode = 0644, 268 .mode = 0644,
278 .proc_handler = &sched_nr_latency_handler, 269 .proc_handler = &sched_nr_latency_handler,
279 .strategy = &sysctl_intvec,
280 .extra1 = &min_sched_granularity_ns, 270 .extra1 = &min_sched_granularity_ns,
281 .extra2 = &max_sched_granularity_ns, 271 .extra2 = &max_sched_granularity_ns,
282 }, 272 },
283 { 273 {
284 .ctl_name = CTL_UNNUMBERED,
285 .procname = "sched_wakeup_granularity_ns", 274 .procname = "sched_wakeup_granularity_ns",
286 .data = &sysctl_sched_wakeup_granularity, 275 .data = &sysctl_sched_wakeup_granularity,
287 .maxlen = sizeof(unsigned int), 276 .maxlen = sizeof(unsigned int),
288 .mode = 0644, 277 .mode = 0644,
289 .proc_handler = &proc_dointvec_minmax, 278 .proc_handler = &proc_dointvec_minmax,
290 .strategy = &sysctl_intvec,
291 .extra1 = &min_wakeup_granularity_ns, 279 .extra1 = &min_wakeup_granularity_ns,
292 .extra2 = &max_wakeup_granularity_ns, 280 .extra2 = &max_wakeup_granularity_ns,
293 }, 281 },
294 { 282 {
295 .ctl_name = CTL_UNNUMBERED,
296 .procname = "sched_shares_ratelimit", 283 .procname = "sched_shares_ratelimit",
297 .data = &sysctl_sched_shares_ratelimit, 284 .data = &sysctl_sched_shares_ratelimit,
298 .maxlen = sizeof(unsigned int), 285 .maxlen = sizeof(unsigned int),
@@ -300,17 +287,14 @@ static struct ctl_table kern_table[] = {
300 .proc_handler = &proc_dointvec, 287 .proc_handler = &proc_dointvec,
301 }, 288 },
302 { 289 {
303 .ctl_name = CTL_UNNUMBERED,
304 .procname = "sched_shares_thresh", 290 .procname = "sched_shares_thresh",
305 .data = &sysctl_sched_shares_thresh, 291 .data = &sysctl_sched_shares_thresh,
306 .maxlen = sizeof(unsigned int), 292 .maxlen = sizeof(unsigned int),
307 .mode = 0644, 293 .mode = 0644,
308 .proc_handler = &proc_dointvec_minmax, 294 .proc_handler = &proc_dointvec_minmax,
309 .strategy = &sysctl_intvec,
310 .extra1 = &zero, 295 .extra1 = &zero,
311 }, 296 },
312 { 297 {
313 .ctl_name = CTL_UNNUMBERED,
314 .procname = "sched_features", 298 .procname = "sched_features",
315 .data = &sysctl_sched_features, 299 .data = &sysctl_sched_features,
316 .maxlen = sizeof(unsigned int), 300 .maxlen = sizeof(unsigned int),
@@ -318,7 +302,6 @@ static struct ctl_table kern_table[] = {
318 .proc_handler = &proc_dointvec, 302 .proc_handler = &proc_dointvec,
319 }, 303 },
320 { 304 {
321 .ctl_name = CTL_UNNUMBERED,
322 .procname = "sched_migration_cost", 305 .procname = "sched_migration_cost",
323 .data = &sysctl_sched_migration_cost, 306 .data = &sysctl_sched_migration_cost,
324 .maxlen = sizeof(unsigned int), 307 .maxlen = sizeof(unsigned int),
@@ -326,7 +309,6 @@ static struct ctl_table kern_table[] = {
326 .proc_handler = &proc_dointvec, 309 .proc_handler = &proc_dointvec,
327 }, 310 },
328 { 311 {
329 .ctl_name = CTL_UNNUMBERED,
330 .procname = "sched_nr_migrate", 312 .procname = "sched_nr_migrate",
331 .data = &sysctl_sched_nr_migrate, 313 .data = &sysctl_sched_nr_migrate,
332 .maxlen = sizeof(unsigned int), 314 .maxlen = sizeof(unsigned int),
@@ -334,7 +316,6 @@ static struct ctl_table kern_table[] = {
334 .proc_handler = &proc_dointvec, 316 .proc_handler = &proc_dointvec,
335 }, 317 },
336 { 318 {
337 .ctl_name = CTL_UNNUMBERED,
338 .procname = "sched_time_avg", 319 .procname = "sched_time_avg",
339 .data = &sysctl_sched_time_avg, 320 .data = &sysctl_sched_time_avg,
340 .maxlen = sizeof(unsigned int), 321 .maxlen = sizeof(unsigned int),
@@ -342,19 +323,16 @@ static struct ctl_table kern_table[] = {
342 .proc_handler = &proc_dointvec, 323 .proc_handler = &proc_dointvec,
343 }, 324 },
344 { 325 {
345 .ctl_name = CTL_UNNUMBERED,
346 .procname = "timer_migration", 326 .procname = "timer_migration",
347 .data = &sysctl_timer_migration, 327 .data = &sysctl_timer_migration,
348 .maxlen = sizeof(unsigned int), 328 .maxlen = sizeof(unsigned int),
349 .mode = 0644, 329 .mode = 0644,
350 .proc_handler = &proc_dointvec_minmax, 330 .proc_handler = &proc_dointvec_minmax,
351 .strategy = &sysctl_intvec,
352 .extra1 = &zero, 331 .extra1 = &zero,
353 .extra2 = &one, 332 .extra2 = &one,
354 }, 333 },
355#endif 334#endif
356 { 335 {
357 .ctl_name = CTL_UNNUMBERED,
358 .procname = "sched_rt_period_us", 336 .procname = "sched_rt_period_us",
359 .data = &sysctl_sched_rt_period, 337 .data = &sysctl_sched_rt_period,
360 .maxlen = sizeof(unsigned int), 338 .maxlen = sizeof(unsigned int),
@@ -362,7 +340,6 @@ static struct ctl_table kern_table[] = {
362 .proc_handler = &sched_rt_handler, 340 .proc_handler = &sched_rt_handler,
363 }, 341 },
364 { 342 {
365 .ctl_name = CTL_UNNUMBERED,
366 .procname = "sched_rt_runtime_us", 343 .procname = "sched_rt_runtime_us",
367 .data = &sysctl_sched_rt_runtime, 344 .data = &sysctl_sched_rt_runtime,
368 .maxlen = sizeof(int), 345 .maxlen = sizeof(int),
@@ -370,7 +347,6 @@ static struct ctl_table kern_table[] = {
370 .proc_handler = &sched_rt_handler, 347 .proc_handler = &sched_rt_handler,
371 }, 348 },
372 { 349 {
373 .ctl_name = CTL_UNNUMBERED,
374 .procname = "sched_compat_yield", 350 .procname = "sched_compat_yield",
375 .data = &sysctl_sched_compat_yield, 351 .data = &sysctl_sched_compat_yield,
376 .maxlen = sizeof(unsigned int), 352 .maxlen = sizeof(unsigned int),
@@ -379,7 +355,6 @@ static struct ctl_table kern_table[] = {
379 }, 355 },
380#ifdef CONFIG_PROVE_LOCKING 356#ifdef CONFIG_PROVE_LOCKING
381 { 357 {
382 .ctl_name = CTL_UNNUMBERED,
383 .procname = "prove_locking", 358 .procname = "prove_locking",
384 .data = &prove_locking, 359 .data = &prove_locking,
385 .maxlen = sizeof(int), 360 .maxlen = sizeof(int),
@@ -389,7 +364,6 @@ static struct ctl_table kern_table[] = {
389#endif 364#endif
390#ifdef CONFIG_LOCK_STAT 365#ifdef CONFIG_LOCK_STAT
391 { 366 {
392 .ctl_name = CTL_UNNUMBERED,
393 .procname = "lock_stat", 367 .procname = "lock_stat",
394 .data = &lock_stat, 368 .data = &lock_stat,
395 .maxlen = sizeof(int), 369 .maxlen = sizeof(int),
@@ -398,7 +372,6 @@ static struct ctl_table kern_table[] = {
398 }, 372 },
399#endif 373#endif
400 { 374 {
401 .ctl_name = KERN_PANIC,
402 .procname = "panic", 375 .procname = "panic",
403 .data = &panic_timeout, 376 .data = &panic_timeout,
404 .maxlen = sizeof(int), 377 .maxlen = sizeof(int),
@@ -406,7 +379,6 @@ static struct ctl_table kern_table[] = {
406 .proc_handler = &proc_dointvec, 379 .proc_handler = &proc_dointvec,
407 }, 380 },
408 { 381 {
409 .ctl_name = KERN_CORE_USES_PID,
410 .procname = "core_uses_pid", 382 .procname = "core_uses_pid",
411 .data = &core_uses_pid, 383 .data = &core_uses_pid,
412 .maxlen = sizeof(int), 384 .maxlen = sizeof(int),
@@ -414,16 +386,13 @@ static struct ctl_table kern_table[] = {
414 .proc_handler = &proc_dointvec, 386 .proc_handler = &proc_dointvec,
415 }, 387 },
416 { 388 {
417 .ctl_name = KERN_CORE_PATTERN,
418 .procname = "core_pattern", 389 .procname = "core_pattern",
419 .data = core_pattern, 390 .data = core_pattern,
420 .maxlen = CORENAME_MAX_SIZE, 391 .maxlen = CORENAME_MAX_SIZE,
421 .mode = 0644, 392 .mode = 0644,
422 .proc_handler = &proc_dostring, 393 .proc_handler = &proc_dostring,
423 .strategy = &sysctl_string,
424 }, 394 },
425 { 395 {
426 .ctl_name = CTL_UNNUMBERED,
427 .procname = "core_pipe_limit", 396 .procname = "core_pipe_limit",
428 .data = &core_pipe_limit, 397 .data = &core_pipe_limit,
429 .maxlen = sizeof(unsigned int), 398 .maxlen = sizeof(unsigned int),
@@ -449,7 +418,6 @@ static struct ctl_table kern_table[] = {
449#endif 418#endif
450#ifdef CONFIG_BLK_DEV_INITRD 419#ifdef CONFIG_BLK_DEV_INITRD
451 { 420 {
452 .ctl_name = KERN_REALROOTDEV,
453 .procname = "real-root-dev", 421 .procname = "real-root-dev",
454 .data = &real_root_dev, 422 .data = &real_root_dev,
455 .maxlen = sizeof(int), 423 .maxlen = sizeof(int),
@@ -458,7 +426,6 @@ static struct ctl_table kern_table[] = {
458 }, 426 },
459#endif 427#endif
460 { 428 {
461 .ctl_name = CTL_UNNUMBERED,
462 .procname = "print-fatal-signals", 429 .procname = "print-fatal-signals",
463 .data = &print_fatal_signals, 430 .data = &print_fatal_signals,
464 .maxlen = sizeof(int), 431 .maxlen = sizeof(int),
@@ -467,16 +434,13 @@ static struct ctl_table kern_table[] = {
467 }, 434 },
468#ifdef CONFIG_SPARC 435#ifdef CONFIG_SPARC
469 { 436 {
470 .ctl_name = KERN_SPARC_REBOOT,
471 .procname = "reboot-cmd", 437 .procname = "reboot-cmd",
472 .data = reboot_command, 438 .data = reboot_command,
473 .maxlen = 256, 439 .maxlen = 256,
474 .mode = 0644, 440 .mode = 0644,
475 .proc_handler = &proc_dostring, 441 .proc_handler = &proc_dostring,
476 .strategy = &sysctl_string,
477 }, 442 },
478 { 443 {
479 .ctl_name = KERN_SPARC_STOP_A,
480 .procname = "stop-a", 444 .procname = "stop-a",
481 .data = &stop_a_enabled, 445 .data = &stop_a_enabled,
482 .maxlen = sizeof (int), 446 .maxlen = sizeof (int),
@@ -484,7 +448,6 @@ static struct ctl_table kern_table[] = {
484 .proc_handler = &proc_dointvec, 448 .proc_handler = &proc_dointvec,
485 }, 449 },
486 { 450 {
487 .ctl_name = KERN_SPARC_SCONS_PWROFF,
488 .procname = "scons-poweroff", 451 .procname = "scons-poweroff",
489 .data = &scons_pwroff, 452 .data = &scons_pwroff,
490 .maxlen = sizeof (int), 453 .maxlen = sizeof (int),
@@ -494,7 +457,6 @@ static struct ctl_table kern_table[] = {
494#endif 457#endif
495#ifdef CONFIG_SPARC64 458#ifdef CONFIG_SPARC64
496 { 459 {
497 .ctl_name = CTL_UNNUMBERED,
498 .procname = "tsb-ratio", 460 .procname = "tsb-ratio",
499 .data = &sysctl_tsb_ratio, 461 .data = &sysctl_tsb_ratio,
500 .maxlen = sizeof (int), 462 .maxlen = sizeof (int),
@@ -504,7 +466,6 @@ static struct ctl_table kern_table[] = {
504#endif 466#endif
505#ifdef __hppa__ 467#ifdef __hppa__
506 { 468 {
507 .ctl_name = KERN_HPPA_PWRSW,
508 .procname = "soft-power", 469 .procname = "soft-power",
509 .data = &pwrsw_enabled, 470 .data = &pwrsw_enabled,
510 .maxlen = sizeof (int), 471 .maxlen = sizeof (int),
@@ -512,7 +473,6 @@ static struct ctl_table kern_table[] = {
512 .proc_handler = &proc_dointvec, 473 .proc_handler = &proc_dointvec,
513 }, 474 },
514 { 475 {
515 .ctl_name = KERN_HPPA_UNALIGNED,
516 .procname = "unaligned-trap", 476 .procname = "unaligned-trap",
517 .data = &unaligned_enabled, 477 .data = &unaligned_enabled,
518 .maxlen = sizeof (int), 478 .maxlen = sizeof (int),
@@ -521,7 +481,6 @@ static struct ctl_table kern_table[] = {
521 }, 481 },
522#endif 482#endif
523 { 483 {
524 .ctl_name = KERN_CTLALTDEL,
525 .procname = "ctrl-alt-del", 484 .procname = "ctrl-alt-del",
526 .data = &C_A_D, 485 .data = &C_A_D,
527 .maxlen = sizeof(int), 486 .maxlen = sizeof(int),
@@ -530,7 +489,6 @@ static struct ctl_table kern_table[] = {
530 }, 489 },
531#ifdef CONFIG_FUNCTION_TRACER 490#ifdef CONFIG_FUNCTION_TRACER
532 { 491 {
533 .ctl_name = CTL_UNNUMBERED,
534 .procname = "ftrace_enabled", 492 .procname = "ftrace_enabled",
535 .data = &ftrace_enabled, 493 .data = &ftrace_enabled,
536 .maxlen = sizeof(int), 494 .maxlen = sizeof(int),
@@ -540,7 +498,6 @@ static struct ctl_table kern_table[] = {
540#endif 498#endif
541#ifdef CONFIG_STACK_TRACER 499#ifdef CONFIG_STACK_TRACER
542 { 500 {
543 .ctl_name = CTL_UNNUMBERED,
544 .procname = "stack_tracer_enabled", 501 .procname = "stack_tracer_enabled",
545 .data = &stack_tracer_enabled, 502 .data = &stack_tracer_enabled,
546 .maxlen = sizeof(int), 503 .maxlen = sizeof(int),
@@ -550,7 +507,6 @@ static struct ctl_table kern_table[] = {
550#endif 507#endif
551#ifdef CONFIG_TRACING 508#ifdef CONFIG_TRACING
552 { 509 {
553 .ctl_name = CTL_UNNUMBERED,
554 .procname = "ftrace_dump_on_oops", 510 .procname = "ftrace_dump_on_oops",
555 .data = &ftrace_dump_on_oops, 511 .data = &ftrace_dump_on_oops,
556 .maxlen = sizeof(int), 512 .maxlen = sizeof(int),
@@ -560,16 +516,13 @@ static struct ctl_table kern_table[] = {
560#endif 516#endif
561#ifdef CONFIG_MODULES 517#ifdef CONFIG_MODULES
562 { 518 {
563 .ctl_name = KERN_MODPROBE,
564 .procname = "modprobe", 519 .procname = "modprobe",
565 .data = &modprobe_path, 520 .data = &modprobe_path,
566 .maxlen = KMOD_PATH_LEN, 521 .maxlen = KMOD_PATH_LEN,
567 .mode = 0644, 522 .mode = 0644,
568 .proc_handler = &proc_dostring, 523 .proc_handler = &proc_dostring,
569 .strategy = &sysctl_string,
570 }, 524 },
571 { 525 {
572 .ctl_name = CTL_UNNUMBERED,
573 .procname = "modules_disabled", 526 .procname = "modules_disabled",
574 .data = &modules_disabled, 527 .data = &modules_disabled,
575 .maxlen = sizeof(int), 528 .maxlen = sizeof(int),
@@ -582,18 +535,15 @@ static struct ctl_table kern_table[] = {
582#endif 535#endif
583#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET) 536#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
584 { 537 {
585 .ctl_name = KERN_HOTPLUG,
586 .procname = "hotplug", 538 .procname = "hotplug",
587 .data = &uevent_helper, 539 .data = &uevent_helper,
588 .maxlen = UEVENT_HELPER_PATH_LEN, 540 .maxlen = UEVENT_HELPER_PATH_LEN,
589 .mode = 0644, 541 .mode = 0644,
590 .proc_handler = &proc_dostring, 542 .proc_handler = &proc_dostring,
591 .strategy = &sysctl_string,
592 }, 543 },
593#endif 544#endif
594#ifdef CONFIG_CHR_DEV_SG 545#ifdef CONFIG_CHR_DEV_SG
595 { 546 {
596 .ctl_name = KERN_SG_BIG_BUFF,
597 .procname = "sg-big-buff", 547 .procname = "sg-big-buff",
598 .data = &sg_big_buff, 548 .data = &sg_big_buff,
599 .maxlen = sizeof (int), 549 .maxlen = sizeof (int),
@@ -603,7 +553,6 @@ static struct ctl_table kern_table[] = {
603#endif 553#endif
604#ifdef CONFIG_BSD_PROCESS_ACCT 554#ifdef CONFIG_BSD_PROCESS_ACCT
605 { 555 {
606 .ctl_name = KERN_ACCT,
607 .procname = "acct", 556 .procname = "acct",
608 .data = &acct_parm, 557 .data = &acct_parm,
609 .maxlen = 3*sizeof(int), 558 .maxlen = 3*sizeof(int),
@@ -613,7 +562,6 @@ static struct ctl_table kern_table[] = {
613#endif 562#endif
614#ifdef CONFIG_MAGIC_SYSRQ 563#ifdef CONFIG_MAGIC_SYSRQ
615 { 564 {
616 .ctl_name = KERN_SYSRQ,
617 .procname = "sysrq", 565 .procname = "sysrq",
618 .data = &__sysrq_enabled, 566 .data = &__sysrq_enabled,
619 .maxlen = sizeof (int), 567 .maxlen = sizeof (int),
@@ -631,7 +579,6 @@ static struct ctl_table kern_table[] = {
631 }, 579 },
632#endif 580#endif
633 { 581 {
634 .ctl_name = KERN_MAX_THREADS,
635 .procname = "threads-max", 582 .procname = "threads-max",
636 .data = &max_threads, 583 .data = &max_threads,
637 .maxlen = sizeof(int), 584 .maxlen = sizeof(int),
@@ -639,37 +586,31 @@ static struct ctl_table kern_table[] = {
639 .proc_handler = &proc_dointvec, 586 .proc_handler = &proc_dointvec,
640 }, 587 },
641 { 588 {
642 .ctl_name = KERN_RANDOM,
643 .procname = "random", 589 .procname = "random",
644 .mode = 0555, 590 .mode = 0555,
645 .child = random_table, 591 .child = random_table,
646 }, 592 },
647 { 593 {
648 .ctl_name = KERN_OVERFLOWUID,
649 .procname = "overflowuid", 594 .procname = "overflowuid",
650 .data = &overflowuid, 595 .data = &overflowuid,
651 .maxlen = sizeof(int), 596 .maxlen = sizeof(int),
652 .mode = 0644, 597 .mode = 0644,
653 .proc_handler = &proc_dointvec_minmax, 598 .proc_handler = &proc_dointvec_minmax,
654 .strategy = &sysctl_intvec,
655 .extra1 = &minolduid, 599 .extra1 = &minolduid,
656 .extra2 = &maxolduid, 600 .extra2 = &maxolduid,
657 }, 601 },
658 { 602 {
659 .ctl_name = KERN_OVERFLOWGID,
660 .procname = "overflowgid", 603 .procname = "overflowgid",
661 .data = &overflowgid, 604 .data = &overflowgid,
662 .maxlen = sizeof(int), 605 .maxlen = sizeof(int),
663 .mode = 0644, 606 .mode = 0644,
664 .proc_handler = &proc_dointvec_minmax, 607 .proc_handler = &proc_dointvec_minmax,
665 .strategy = &sysctl_intvec,
666 .extra1 = &minolduid, 608 .extra1 = &minolduid,
667 .extra2 = &maxolduid, 609 .extra2 = &maxolduid,
668 }, 610 },
669#ifdef CONFIG_S390 611#ifdef CONFIG_S390
670#ifdef CONFIG_MATHEMU 612#ifdef CONFIG_MATHEMU
671 { 613 {
672 .ctl_name = KERN_IEEE_EMULATION_WARNINGS,
673 .procname = "ieee_emulation_warnings", 614 .procname = "ieee_emulation_warnings",
674 .data = &sysctl_ieee_emulation_warnings, 615 .data = &sysctl_ieee_emulation_warnings,
675 .maxlen = sizeof(int), 616 .maxlen = sizeof(int),
@@ -678,7 +619,6 @@ static struct ctl_table kern_table[] = {
678 }, 619 },
679#endif 620#endif
680 { 621 {
681 .ctl_name = KERN_S390_USER_DEBUG_LOGGING,
682 .procname = "userprocess_debug", 622 .procname = "userprocess_debug",
683 .data = &sysctl_userprocess_debug, 623 .data = &sysctl_userprocess_debug,
684 .maxlen = sizeof(int), 624 .maxlen = sizeof(int),
@@ -687,18 +627,15 @@ static struct ctl_table kern_table[] = {
687 }, 627 },
688#endif 628#endif
689 { 629 {
690 .ctl_name = KERN_PIDMAX,
691 .procname = "pid_max", 630 .procname = "pid_max",
692 .data = &pid_max, 631 .data = &pid_max,
693 .maxlen = sizeof (int), 632 .maxlen = sizeof (int),
694 .mode = 0644, 633 .mode = 0644,
695 .proc_handler = &proc_dointvec_minmax, 634 .proc_handler = &proc_dointvec_minmax,
696 .strategy = sysctl_intvec,
697 .extra1 = &pid_max_min, 635 .extra1 = &pid_max_min,
698 .extra2 = &pid_max_max, 636 .extra2 = &pid_max_max,
699 }, 637 },
700 { 638 {
701 .ctl_name = KERN_PANIC_ON_OOPS,
702 .procname = "panic_on_oops", 639 .procname = "panic_on_oops",
703 .data = &panic_on_oops, 640 .data = &panic_on_oops,
704 .maxlen = sizeof(int), 641 .maxlen = sizeof(int),
@@ -707,7 +644,6 @@ static struct ctl_table kern_table[] = {
707 }, 644 },
708#if defined CONFIG_PRINTK 645#if defined CONFIG_PRINTK
709 { 646 {
710 .ctl_name = KERN_PRINTK,
711 .procname = "printk", 647 .procname = "printk",
712 .data = &console_loglevel, 648 .data = &console_loglevel,
713 .maxlen = 4*sizeof(int), 649 .maxlen = 4*sizeof(int),
@@ -715,16 +651,13 @@ static struct ctl_table kern_table[] = {
715 .proc_handler = &proc_dointvec, 651 .proc_handler = &proc_dointvec,
716 }, 652 },
717 { 653 {
718 .ctl_name = KERN_PRINTK_RATELIMIT,
719 .procname = "printk_ratelimit", 654 .procname = "printk_ratelimit",
720 .data = &printk_ratelimit_state.interval, 655 .data = &printk_ratelimit_state.interval,
721 .maxlen = sizeof(int), 656 .maxlen = sizeof(int),
722 .mode = 0644, 657 .mode = 0644,
723 .proc_handler = &proc_dointvec_jiffies, 658 .proc_handler = &proc_dointvec_jiffies,
724 .strategy = &sysctl_jiffies,
725 }, 659 },
726 { 660 {
727 .ctl_name = KERN_PRINTK_RATELIMIT_BURST,
728 .procname = "printk_ratelimit_burst", 661 .procname = "printk_ratelimit_burst",
729 .data = &printk_ratelimit_state.burst, 662 .data = &printk_ratelimit_state.burst,
730 .maxlen = sizeof(int), 663 .maxlen = sizeof(int),
@@ -732,19 +665,16 @@ static struct ctl_table kern_table[] = {
732 .proc_handler = &proc_dointvec, 665 .proc_handler = &proc_dointvec,
733 }, 666 },
734 { 667 {
735 .ctl_name = CTL_UNNUMBERED,
736 .procname = "printk_delay", 668 .procname = "printk_delay",
737 .data = &printk_delay_msec, 669 .data = &printk_delay_msec,
738 .maxlen = sizeof(int), 670 .maxlen = sizeof(int),
739 .mode = 0644, 671 .mode = 0644,
740 .proc_handler = &proc_dointvec_minmax, 672 .proc_handler = &proc_dointvec_minmax,
741 .strategy = &sysctl_intvec,
742 .extra1 = &zero, 673 .extra1 = &zero,
743 .extra2 = &ten_thousand, 674 .extra2 = &ten_thousand,
744 }, 675 },
745#endif 676#endif
746 { 677 {
747 .ctl_name = KERN_NGROUPS_MAX,
748 .procname = "ngroups_max", 678 .procname = "ngroups_max",
749 .data = &ngroups_max, 679 .data = &ngroups_max,
750 .maxlen = sizeof (int), 680 .maxlen = sizeof (int),
@@ -753,7 +683,6 @@ static struct ctl_table kern_table[] = {
753 }, 683 },
754#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86) 684#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86)
755 { 685 {
756 .ctl_name = KERN_UNKNOWN_NMI_PANIC,
757 .procname = "unknown_nmi_panic", 686 .procname = "unknown_nmi_panic",
758 .data = &unknown_nmi_panic, 687 .data = &unknown_nmi_panic,
759 .maxlen = sizeof (int), 688 .maxlen = sizeof (int),
@@ -770,7 +699,6 @@ static struct ctl_table kern_table[] = {
770#endif 699#endif
771#if defined(CONFIG_X86) 700#if defined(CONFIG_X86)
772 { 701 {
773 .ctl_name = KERN_PANIC_ON_NMI,
774 .procname = "panic_on_unrecovered_nmi", 702 .procname = "panic_on_unrecovered_nmi",
775 .data = &panic_on_unrecovered_nmi, 703 .data = &panic_on_unrecovered_nmi,
776 .maxlen = sizeof(int), 704 .maxlen = sizeof(int),
@@ -778,7 +706,6 @@ static struct ctl_table kern_table[] = {
778 .proc_handler = &proc_dointvec, 706 .proc_handler = &proc_dointvec,
779 }, 707 },
780 { 708 {
781 .ctl_name = CTL_UNNUMBERED,
782 .procname = "panic_on_io_nmi", 709 .procname = "panic_on_io_nmi",
783 .data = &panic_on_io_nmi, 710 .data = &panic_on_io_nmi,
784 .maxlen = sizeof(int), 711 .maxlen = sizeof(int),
@@ -786,7 +713,6 @@ static struct ctl_table kern_table[] = {
786 .proc_handler = &proc_dointvec, 713 .proc_handler = &proc_dointvec,
787 }, 714 },
788 { 715 {
789 .ctl_name = KERN_BOOTLOADER_TYPE,
790 .procname = "bootloader_type", 716 .procname = "bootloader_type",
791 .data = &bootloader_type, 717 .data = &bootloader_type,
792 .maxlen = sizeof (int), 718 .maxlen = sizeof (int),
@@ -794,7 +720,6 @@ static struct ctl_table kern_table[] = {
794 .proc_handler = &proc_dointvec, 720 .proc_handler = &proc_dointvec,
795 }, 721 },
796 { 722 {
797 .ctl_name = CTL_UNNUMBERED,
798 .procname = "bootloader_version", 723 .procname = "bootloader_version",
799 .data = &bootloader_version, 724 .data = &bootloader_version,
800 .maxlen = sizeof (int), 725 .maxlen = sizeof (int),
@@ -802,7 +727,6 @@ static struct ctl_table kern_table[] = {
802 .proc_handler = &proc_dointvec, 727 .proc_handler = &proc_dointvec,
803 }, 728 },
804 { 729 {
805 .ctl_name = CTL_UNNUMBERED,
806 .procname = "kstack_depth_to_print", 730 .procname = "kstack_depth_to_print",
807 .data = &kstack_depth_to_print, 731 .data = &kstack_depth_to_print,
808 .maxlen = sizeof(int), 732 .maxlen = sizeof(int),
@@ -810,7 +734,6 @@ static struct ctl_table kern_table[] = {
810 .proc_handler = &proc_dointvec, 734 .proc_handler = &proc_dointvec,
811 }, 735 },
812 { 736 {
813 .ctl_name = CTL_UNNUMBERED,
814 .procname = "io_delay_type", 737 .procname = "io_delay_type",
815 .data = &io_delay_type, 738 .data = &io_delay_type,
816 .maxlen = sizeof(int), 739 .maxlen = sizeof(int),
@@ -820,7 +743,6 @@ static struct ctl_table kern_table[] = {
820#endif 743#endif
821#if defined(CONFIG_MMU) 744#if defined(CONFIG_MMU)
822 { 745 {
823 .ctl_name = KERN_RANDOMIZE,
824 .procname = "randomize_va_space", 746 .procname = "randomize_va_space",
825 .data = &randomize_va_space, 747 .data = &randomize_va_space,
826 .maxlen = sizeof(int), 748 .maxlen = sizeof(int),
@@ -830,7 +752,6 @@ static struct ctl_table kern_table[] = {
830#endif 752#endif
831#if defined(CONFIG_S390) && defined(CONFIG_SMP) 753#if defined(CONFIG_S390) && defined(CONFIG_SMP)
832 { 754 {
833 .ctl_name = KERN_SPIN_RETRY,
834 .procname = "spin_retry", 755 .procname = "spin_retry",
835 .data = &spin_retry, 756 .data = &spin_retry,
836 .maxlen = sizeof (int), 757 .maxlen = sizeof (int),
@@ -849,7 +770,6 @@ static struct ctl_table kern_table[] = {
849#endif 770#endif
850#ifdef CONFIG_IA64 771#ifdef CONFIG_IA64
851 { 772 {
852 .ctl_name = KERN_IA64_UNALIGNED,
853 .procname = "ignore-unaligned-usertrap", 773 .procname = "ignore-unaligned-usertrap",
854 .data = &no_unaligned_warning, 774 .data = &no_unaligned_warning,
855 .maxlen = sizeof (int), 775 .maxlen = sizeof (int),
@@ -857,7 +777,6 @@ static struct ctl_table kern_table[] = {
857 .proc_handler = &proc_dointvec, 777 .proc_handler = &proc_dointvec,
858 }, 778 },
859 { 779 {
860 .ctl_name = CTL_UNNUMBERED,
861 .procname = "unaligned-dump-stack", 780 .procname = "unaligned-dump-stack",
862 .data = &unaligned_dump_stack, 781 .data = &unaligned_dump_stack,
863 .maxlen = sizeof (int), 782 .maxlen = sizeof (int),
@@ -867,71 +786,58 @@ static struct ctl_table kern_table[] = {
867#endif 786#endif
868#ifdef CONFIG_DETECT_SOFTLOCKUP 787#ifdef CONFIG_DETECT_SOFTLOCKUP
869 { 788 {
870 .ctl_name = CTL_UNNUMBERED,
871 .procname = "softlockup_panic", 789 .procname = "softlockup_panic",
872 .data = &softlockup_panic, 790 .data = &softlockup_panic,
873 .maxlen = sizeof(int), 791 .maxlen = sizeof(int),
874 .mode = 0644, 792 .mode = 0644,
875 .proc_handler = &proc_dointvec_minmax, 793 .proc_handler = &proc_dointvec_minmax,
876 .strategy = &sysctl_intvec,
877 .extra1 = &zero, 794 .extra1 = &zero,
878 .extra2 = &one, 795 .extra2 = &one,
879 }, 796 },
880 { 797 {
881 .ctl_name = CTL_UNNUMBERED,
882 .procname = "softlockup_thresh", 798 .procname = "softlockup_thresh",
883 .data = &softlockup_thresh, 799 .data = &softlockup_thresh,
884 .maxlen = sizeof(int), 800 .maxlen = sizeof(int),
885 .mode = 0644, 801 .mode = 0644,
886 .proc_handler = &proc_dosoftlockup_thresh, 802 .proc_handler = &proc_dosoftlockup_thresh,
887 .strategy = &sysctl_intvec,
888 .extra1 = &neg_one, 803 .extra1 = &neg_one,
889 .extra2 = &sixty, 804 .extra2 = &sixty,
890 }, 805 },
891#endif 806#endif
892#ifdef CONFIG_DETECT_HUNG_TASK 807#ifdef CONFIG_DETECT_HUNG_TASK
893 { 808 {
894 .ctl_name = CTL_UNNUMBERED,
895 .procname = "hung_task_panic", 809 .procname = "hung_task_panic",
896 .data = &sysctl_hung_task_panic, 810 .data = &sysctl_hung_task_panic,
897 .maxlen = sizeof(int), 811 .maxlen = sizeof(int),
898 .mode = 0644, 812 .mode = 0644,
899 .proc_handler = &proc_dointvec_minmax, 813 .proc_handler = &proc_dointvec_minmax,
900 .strategy = &sysctl_intvec,
901 .extra1 = &zero, 814 .extra1 = &zero,
902 .extra2 = &one, 815 .extra2 = &one,
903 }, 816 },
904 { 817 {
905 .ctl_name = CTL_UNNUMBERED,
906 .procname = "hung_task_check_count", 818 .procname = "hung_task_check_count",
907 .data = &sysctl_hung_task_check_count, 819 .data = &sysctl_hung_task_check_count,
908 .maxlen = sizeof(unsigned long), 820 .maxlen = sizeof(unsigned long),
909 .mode = 0644, 821 .mode = 0644,
910 .proc_handler = &proc_doulongvec_minmax, 822 .proc_handler = &proc_doulongvec_minmax,
911 .strategy = &sysctl_intvec,
912 }, 823 },
913 { 824 {
914 .ctl_name = CTL_UNNUMBERED,
915 .procname = "hung_task_timeout_secs", 825 .procname = "hung_task_timeout_secs",
916 .data = &sysctl_hung_task_timeout_secs, 826 .data = &sysctl_hung_task_timeout_secs,
917 .maxlen = sizeof(unsigned long), 827 .maxlen = sizeof(unsigned long),
918 .mode = 0644, 828 .mode = 0644,
919 .proc_handler = &proc_dohung_task_timeout_secs, 829 .proc_handler = &proc_dohung_task_timeout_secs,
920 .strategy = &sysctl_intvec,
921 }, 830 },
922 { 831 {
923 .ctl_name = CTL_UNNUMBERED,
924 .procname = "hung_task_warnings", 832 .procname = "hung_task_warnings",
925 .data = &sysctl_hung_task_warnings, 833 .data = &sysctl_hung_task_warnings,
926 .maxlen = sizeof(unsigned long), 834 .maxlen = sizeof(unsigned long),
927 .mode = 0644, 835 .mode = 0644,
928 .proc_handler = &proc_doulongvec_minmax, 836 .proc_handler = &proc_doulongvec_minmax,
929 .strategy = &sysctl_intvec,
930 }, 837 },
931#endif 838#endif
932#ifdef CONFIG_COMPAT 839#ifdef CONFIG_COMPAT
933 { 840 {
934 .ctl_name = KERN_COMPAT_LOG,
935 .procname = "compat-log", 841 .procname = "compat-log",
936 .data = &compat_log, 842 .data = &compat_log,
937 .maxlen = sizeof (int), 843 .maxlen = sizeof (int),
@@ -941,7 +847,6 @@ static struct ctl_table kern_table[] = {
941#endif 847#endif
942#ifdef CONFIG_RT_MUTEXES 848#ifdef CONFIG_RT_MUTEXES
943 { 849 {
944 .ctl_name = KERN_MAX_LOCK_DEPTH,
945 .procname = "max_lock_depth", 850 .procname = "max_lock_depth",
946 .data = &max_lock_depth, 851 .data = &max_lock_depth,
947 .maxlen = sizeof(int), 852 .maxlen = sizeof(int),
@@ -950,17 +855,14 @@ static struct ctl_table kern_table[] = {
950 }, 855 },
951#endif 856#endif
952 { 857 {
953 .ctl_name = CTL_UNNUMBERED,
954 .procname = "poweroff_cmd", 858 .procname = "poweroff_cmd",
955 .data = &poweroff_cmd, 859 .data = &poweroff_cmd,
956 .maxlen = POWEROFF_CMD_PATH_LEN, 860 .maxlen = POWEROFF_CMD_PATH_LEN,
957 .mode = 0644, 861 .mode = 0644,
958 .proc_handler = &proc_dostring, 862 .proc_handler = &proc_dostring,
959 .strategy = &sysctl_string,
960 }, 863 },
961#ifdef CONFIG_KEYS 864#ifdef CONFIG_KEYS
962 { 865 {
963 .ctl_name = CTL_UNNUMBERED,
964 .procname = "keys", 866 .procname = "keys",
965 .mode = 0555, 867 .mode = 0555,
966 .child = key_sysctls, 868 .child = key_sysctls,
@@ -968,7 +870,6 @@ static struct ctl_table kern_table[] = {
968#endif 870#endif
969#ifdef CONFIG_RCU_TORTURE_TEST 871#ifdef CONFIG_RCU_TORTURE_TEST
970 { 872 {
971 .ctl_name = CTL_UNNUMBERED,
972 .procname = "rcutorture_runnable", 873 .procname = "rcutorture_runnable",
973 .data = &rcutorture_runnable, 874 .data = &rcutorture_runnable,
974 .maxlen = sizeof(int), 875 .maxlen = sizeof(int),
@@ -978,7 +879,6 @@ static struct ctl_table kern_table[] = {
978#endif 879#endif
979#ifdef CONFIG_SLOW_WORK 880#ifdef CONFIG_SLOW_WORK
980 { 881 {
981 .ctl_name = CTL_UNNUMBERED,
982 .procname = "slow-work", 882 .procname = "slow-work",
983 .mode = 0555, 883 .mode = 0555,
984 .child = slow_work_sysctls, 884 .child = slow_work_sysctls,
@@ -986,7 +886,6 @@ static struct ctl_table kern_table[] = {
986#endif 886#endif
987#ifdef CONFIG_PERF_EVENTS 887#ifdef CONFIG_PERF_EVENTS
988 { 888 {
989 .ctl_name = CTL_UNNUMBERED,
990 .procname = "perf_event_paranoid", 889 .procname = "perf_event_paranoid",
991 .data = &sysctl_perf_event_paranoid, 890 .data = &sysctl_perf_event_paranoid,
992 .maxlen = sizeof(sysctl_perf_event_paranoid), 891 .maxlen = sizeof(sysctl_perf_event_paranoid),
@@ -994,7 +893,6 @@ static struct ctl_table kern_table[] = {
994 .proc_handler = &proc_dointvec, 893 .proc_handler = &proc_dointvec,
995 }, 894 },
996 { 895 {
997 .ctl_name = CTL_UNNUMBERED,
998 .procname = "perf_event_mlock_kb", 896 .procname = "perf_event_mlock_kb",
999 .data = &sysctl_perf_event_mlock, 897 .data = &sysctl_perf_event_mlock,
1000 .maxlen = sizeof(sysctl_perf_event_mlock), 898 .maxlen = sizeof(sysctl_perf_event_mlock),
@@ -1002,7 +900,6 @@ static struct ctl_table kern_table[] = {
1002 .proc_handler = &proc_dointvec, 900 .proc_handler = &proc_dointvec,
1003 }, 901 },
1004 { 902 {
1005 .ctl_name = CTL_UNNUMBERED,
1006 .procname = "perf_event_max_sample_rate", 903 .procname = "perf_event_max_sample_rate",
1007 .data = &sysctl_perf_event_sample_rate, 904 .data = &sysctl_perf_event_sample_rate,
1008 .maxlen = sizeof(sysctl_perf_event_sample_rate), 905 .maxlen = sizeof(sysctl_perf_event_sample_rate),
@@ -1012,7 +909,6 @@ static struct ctl_table kern_table[] = {
1012#endif 909#endif
1013#ifdef CONFIG_KMEMCHECK 910#ifdef CONFIG_KMEMCHECK
1014 { 911 {
1015 .ctl_name = CTL_UNNUMBERED,
1016 .procname = "kmemcheck", 912 .procname = "kmemcheck",
1017 .data = &kmemcheck_enabled, 913 .data = &kmemcheck_enabled,
1018 .maxlen = sizeof(int), 914 .maxlen = sizeof(int),
@@ -1022,7 +918,6 @@ static struct ctl_table kern_table[] = {
1022#endif 918#endif
1023#ifdef CONFIG_BLOCK 919#ifdef CONFIG_BLOCK
1024 { 920 {
1025 .ctl_name = CTL_UNNUMBERED,
1026 .procname = "blk_iopoll", 921 .procname = "blk_iopoll",
1027 .data = &blk_iopoll_enabled, 922 .data = &blk_iopoll_enabled,
1028 .maxlen = sizeof(int), 923 .maxlen = sizeof(int),
@@ -1034,12 +929,11 @@ static struct ctl_table kern_table[] = {
1034 * NOTE: do not add new entries to this table unless you have read 929 * NOTE: do not add new entries to this table unless you have read
1035 * Documentation/sysctl/ctl_unnumbered.txt 930 * Documentation/sysctl/ctl_unnumbered.txt
1036 */ 931 */
1037 { .ctl_name = 0 } 932 { }
1038}; 933};
1039 934
1040static struct ctl_table vm_table[] = { 935static struct ctl_table vm_table[] = {
1041 { 936 {
1042 .ctl_name = VM_OVERCOMMIT_MEMORY,
1043 .procname = "overcommit_memory", 937 .procname = "overcommit_memory",
1044 .data = &sysctl_overcommit_memory, 938 .data = &sysctl_overcommit_memory,
1045 .maxlen = sizeof(sysctl_overcommit_memory), 939 .maxlen = sizeof(sysctl_overcommit_memory),
@@ -1047,7 +941,6 @@ static struct ctl_table vm_table[] = {
1047 .proc_handler = &proc_dointvec, 941 .proc_handler = &proc_dointvec,
1048 }, 942 },
1049 { 943 {
1050 .ctl_name = VM_PANIC_ON_OOM,
1051 .procname = "panic_on_oom", 944 .procname = "panic_on_oom",
1052 .data = &sysctl_panic_on_oom, 945 .data = &sysctl_panic_on_oom,
1053 .maxlen = sizeof(sysctl_panic_on_oom), 946 .maxlen = sizeof(sysctl_panic_on_oom),
@@ -1055,7 +948,6 @@ static struct ctl_table vm_table[] = {
1055 .proc_handler = &proc_dointvec, 948 .proc_handler = &proc_dointvec,
1056 }, 949 },
1057 { 950 {
1058 .ctl_name = CTL_UNNUMBERED,
1059 .procname = "oom_kill_allocating_task", 951 .procname = "oom_kill_allocating_task",
1060 .data = &sysctl_oom_kill_allocating_task, 952 .data = &sysctl_oom_kill_allocating_task,
1061 .maxlen = sizeof(sysctl_oom_kill_allocating_task), 953 .maxlen = sizeof(sysctl_oom_kill_allocating_task),
@@ -1063,7 +955,6 @@ static struct ctl_table vm_table[] = {
1063 .proc_handler = &proc_dointvec, 955 .proc_handler = &proc_dointvec,
1064 }, 956 },
1065 { 957 {
1066 .ctl_name = CTL_UNNUMBERED,
1067 .procname = "oom_dump_tasks", 958 .procname = "oom_dump_tasks",
1068 .data = &sysctl_oom_dump_tasks, 959 .data = &sysctl_oom_dump_tasks,
1069 .maxlen = sizeof(sysctl_oom_dump_tasks), 960 .maxlen = sizeof(sysctl_oom_dump_tasks),
@@ -1071,7 +962,6 @@ static struct ctl_table vm_table[] = {
1071 .proc_handler = &proc_dointvec, 962 .proc_handler = &proc_dointvec,
1072 }, 963 },
1073 { 964 {
1074 .ctl_name = VM_OVERCOMMIT_RATIO,
1075 .procname = "overcommit_ratio", 965 .procname = "overcommit_ratio",
1076 .data = &sysctl_overcommit_ratio, 966 .data = &sysctl_overcommit_ratio,
1077 .maxlen = sizeof(sysctl_overcommit_ratio), 967 .maxlen = sizeof(sysctl_overcommit_ratio),
@@ -1079,7 +969,6 @@ static struct ctl_table vm_table[] = {
1079 .proc_handler = &proc_dointvec, 969 .proc_handler = &proc_dointvec,
1080 }, 970 },
1081 { 971 {
1082 .ctl_name = VM_PAGE_CLUSTER,
1083 .procname = "page-cluster", 972 .procname = "page-cluster",
1084 .data = &page_cluster, 973 .data = &page_cluster,
1085 .maxlen = sizeof(int), 974 .maxlen = sizeof(int),
@@ -1087,45 +976,37 @@ static struct ctl_table vm_table[] = {
1087 .proc_handler = &proc_dointvec, 976 .proc_handler = &proc_dointvec,
1088 }, 977 },
1089 { 978 {
1090 .ctl_name = VM_DIRTY_BACKGROUND,
1091 .procname = "dirty_background_ratio", 979 .procname = "dirty_background_ratio",
1092 .data = &dirty_background_ratio, 980 .data = &dirty_background_ratio,
1093 .maxlen = sizeof(dirty_background_ratio), 981 .maxlen = sizeof(dirty_background_ratio),
1094 .mode = 0644, 982 .mode = 0644,
1095 .proc_handler = &dirty_background_ratio_handler, 983 .proc_handler = &dirty_background_ratio_handler,
1096 .strategy = &sysctl_intvec,
1097 .extra1 = &zero, 984 .extra1 = &zero,
1098 .extra2 = &one_hundred, 985 .extra2 = &one_hundred,
1099 }, 986 },
1100 { 987 {
1101 .ctl_name = CTL_UNNUMBERED,
1102 .procname = "dirty_background_bytes", 988 .procname = "dirty_background_bytes",
1103 .data = &dirty_background_bytes, 989 .data = &dirty_background_bytes,
1104 .maxlen = sizeof(dirty_background_bytes), 990 .maxlen = sizeof(dirty_background_bytes),
1105 .mode = 0644, 991 .mode = 0644,
1106 .proc_handler = &dirty_background_bytes_handler, 992 .proc_handler = &dirty_background_bytes_handler,
1107 .strategy = &sysctl_intvec,
1108 .extra1 = &one_ul, 993 .extra1 = &one_ul,
1109 }, 994 },
1110 { 995 {
1111 .ctl_name = VM_DIRTY_RATIO,
1112 .procname = "dirty_ratio", 996 .procname = "dirty_ratio",
1113 .data = &vm_dirty_ratio, 997 .data = &vm_dirty_ratio,
1114 .maxlen = sizeof(vm_dirty_ratio), 998 .maxlen = sizeof(vm_dirty_ratio),
1115 .mode = 0644, 999 .mode = 0644,
1116 .proc_handler = &dirty_ratio_handler, 1000 .proc_handler = &dirty_ratio_handler,
1117 .strategy = &sysctl_intvec,
1118 .extra1 = &zero, 1001 .extra1 = &zero,
1119 .extra2 = &one_hundred, 1002 .extra2 = &one_hundred,
1120 }, 1003 },
1121 { 1004 {
1122 .ctl_name = CTL_UNNUMBERED,
1123 .procname = "dirty_bytes", 1005 .procname = "dirty_bytes",
1124 .data = &vm_dirty_bytes, 1006 .data = &vm_dirty_bytes,
1125 .maxlen = sizeof(vm_dirty_bytes), 1007 .maxlen = sizeof(vm_dirty_bytes),
1126 .mode = 0644, 1008 .mode = 0644,
1127 .proc_handler = &dirty_bytes_handler, 1009 .proc_handler = &dirty_bytes_handler,
1128 .strategy = &sysctl_intvec,
1129 .extra1 = &dirty_bytes_min, 1010 .extra1 = &dirty_bytes_min,
1130 }, 1011 },
1131 { 1012 {
@@ -1143,7 +1024,6 @@ static struct ctl_table vm_table[] = {
1143 .proc_handler = &proc_dointvec, 1024 .proc_handler = &proc_dointvec,
1144 }, 1025 },
1145 { 1026 {
1146 .ctl_name = VM_NR_PDFLUSH_THREADS,
1147 .procname = "nr_pdflush_threads", 1027 .procname = "nr_pdflush_threads",
1148 .data = &nr_pdflush_threads, 1028 .data = &nr_pdflush_threads,
1149 .maxlen = sizeof nr_pdflush_threads, 1029 .maxlen = sizeof nr_pdflush_threads,
@@ -1151,13 +1031,11 @@ static struct ctl_table vm_table[] = {
1151 .proc_handler = &proc_dointvec, 1031 .proc_handler = &proc_dointvec,
1152 }, 1032 },
1153 { 1033 {
1154 .ctl_name = VM_SWAPPINESS,
1155 .procname = "swappiness", 1034 .procname = "swappiness",
1156 .data = &vm_swappiness, 1035 .data = &vm_swappiness,
1157 .maxlen = sizeof(vm_swappiness), 1036 .maxlen = sizeof(vm_swappiness),
1158 .mode = 0644, 1037 .mode = 0644,
1159 .proc_handler = &proc_dointvec_minmax, 1038 .proc_handler = &proc_dointvec_minmax,
1160 .strategy = &sysctl_intvec,
1161 .extra1 = &zero, 1039 .extra1 = &zero,
1162 .extra2 = &one_hundred, 1040 .extra2 = &one_hundred,
1163 }, 1041 },
@@ -1172,7 +1050,6 @@ static struct ctl_table vm_table[] = {
1172 .extra2 = (void *)&hugetlb_infinity, 1050 .extra2 = (void *)&hugetlb_infinity,
1173 }, 1051 },
1174 { 1052 {
1175 .ctl_name = VM_HUGETLB_GROUP,
1176 .procname = "hugetlb_shm_group", 1053 .procname = "hugetlb_shm_group",
1177 .data = &sysctl_hugetlb_shm_group, 1054 .data = &sysctl_hugetlb_shm_group,
1178 .maxlen = sizeof(gid_t), 1055 .maxlen = sizeof(gid_t),
@@ -1180,7 +1057,6 @@ static struct ctl_table vm_table[] = {
1180 .proc_handler = &proc_dointvec, 1057 .proc_handler = &proc_dointvec,
1181 }, 1058 },
1182 { 1059 {
1183 .ctl_name = CTL_UNNUMBERED,
1184 .procname = "hugepages_treat_as_movable", 1060 .procname = "hugepages_treat_as_movable",
1185 .data = &hugepages_treat_as_movable, 1061 .data = &hugepages_treat_as_movable,
1186 .maxlen = sizeof(int), 1062 .maxlen = sizeof(int),
@@ -1188,7 +1064,6 @@ static struct ctl_table vm_table[] = {
1188 .proc_handler = &hugetlb_treat_movable_handler, 1064 .proc_handler = &hugetlb_treat_movable_handler,
1189 }, 1065 },
1190 { 1066 {
1191 .ctl_name = CTL_UNNUMBERED,
1192 .procname = "nr_overcommit_hugepages", 1067 .procname = "nr_overcommit_hugepages",
1193 .data = NULL, 1068 .data = NULL,
1194 .maxlen = sizeof(unsigned long), 1069 .maxlen = sizeof(unsigned long),
@@ -1199,46 +1074,37 @@ static struct ctl_table vm_table[] = {
1199 }, 1074 },
1200#endif 1075#endif
1201 { 1076 {
1202 .ctl_name = VM_LOWMEM_RESERVE_RATIO,
1203 .procname = "lowmem_reserve_ratio", 1077 .procname = "lowmem_reserve_ratio",
1204 .data = &sysctl_lowmem_reserve_ratio, 1078 .data = &sysctl_lowmem_reserve_ratio,
1205 .maxlen = sizeof(sysctl_lowmem_reserve_ratio), 1079 .maxlen = sizeof(sysctl_lowmem_reserve_ratio),
1206 .mode = 0644, 1080 .mode = 0644,
1207 .proc_handler = &lowmem_reserve_ratio_sysctl_handler, 1081 .proc_handler = &lowmem_reserve_ratio_sysctl_handler,
1208 .strategy = &sysctl_intvec,
1209 }, 1082 },
1210 { 1083 {
1211 .ctl_name = VM_DROP_PAGECACHE,
1212 .procname = "drop_caches", 1084 .procname = "drop_caches",
1213 .data = &sysctl_drop_caches, 1085 .data = &sysctl_drop_caches,
1214 .maxlen = sizeof(int), 1086 .maxlen = sizeof(int),
1215 .mode = 0644, 1087 .mode = 0644,
1216 .proc_handler = drop_caches_sysctl_handler, 1088 .proc_handler = drop_caches_sysctl_handler,
1217 .strategy = &sysctl_intvec,
1218 }, 1089 },
1219 { 1090 {
1220 .ctl_name = VM_MIN_FREE_KBYTES,
1221 .procname = "min_free_kbytes", 1091 .procname = "min_free_kbytes",
1222 .data = &min_free_kbytes, 1092 .data = &min_free_kbytes,
1223 .maxlen = sizeof(min_free_kbytes), 1093 .maxlen = sizeof(min_free_kbytes),
1224 .mode = 0644, 1094 .mode = 0644,
1225 .proc_handler = &min_free_kbytes_sysctl_handler, 1095 .proc_handler = &min_free_kbytes_sysctl_handler,
1226 .strategy = &sysctl_intvec,
1227 .extra1 = &zero, 1096 .extra1 = &zero,
1228 }, 1097 },
1229 { 1098 {
1230 .ctl_name = VM_PERCPU_PAGELIST_FRACTION,
1231 .procname = "percpu_pagelist_fraction", 1099 .procname = "percpu_pagelist_fraction",
1232 .data = &percpu_pagelist_fraction, 1100 .data = &percpu_pagelist_fraction,
1233 .maxlen = sizeof(percpu_pagelist_fraction), 1101 .maxlen = sizeof(percpu_pagelist_fraction),
1234 .mode = 0644, 1102 .mode = 0644,
1235 .proc_handler = &percpu_pagelist_fraction_sysctl_handler, 1103 .proc_handler = &percpu_pagelist_fraction_sysctl_handler,
1236 .strategy = &sysctl_intvec,
1237 .extra1 = &min_percpu_pagelist_fract, 1104 .extra1 = &min_percpu_pagelist_fract,
1238 }, 1105 },
1239#ifdef CONFIG_MMU 1106#ifdef CONFIG_MMU
1240 { 1107 {
1241 .ctl_name = VM_MAX_MAP_COUNT,
1242 .procname = "max_map_count", 1108 .procname = "max_map_count",
1243 .data = &sysctl_max_map_count, 1109 .data = &sysctl_max_map_count,
1244 .maxlen = sizeof(sysctl_max_map_count), 1110 .maxlen = sizeof(sysctl_max_map_count),
@@ -1247,104 +1113,85 @@ static struct ctl_table vm_table[] = {
1247 }, 1113 },
1248#else 1114#else
1249 { 1115 {
1250 .ctl_name = CTL_UNNUMBERED,
1251 .procname = "nr_trim_pages", 1116 .procname = "nr_trim_pages",
1252 .data = &sysctl_nr_trim_pages, 1117 .data = &sysctl_nr_trim_pages,
1253 .maxlen = sizeof(sysctl_nr_trim_pages), 1118 .maxlen = sizeof(sysctl_nr_trim_pages),
1254 .mode = 0644, 1119 .mode = 0644,
1255 .proc_handler = &proc_dointvec_minmax, 1120 .proc_handler = &proc_dointvec_minmax,
1256 .strategy = &sysctl_intvec,
1257 .extra1 = &zero, 1121 .extra1 = &zero,
1258 }, 1122 },
1259#endif 1123#endif
1260 { 1124 {
1261 .ctl_name = VM_LAPTOP_MODE,
1262 .procname = "laptop_mode", 1125 .procname = "laptop_mode",
1263 .data = &laptop_mode, 1126 .data = &laptop_mode,
1264 .maxlen = sizeof(laptop_mode), 1127 .maxlen = sizeof(laptop_mode),
1265 .mode = 0644, 1128 .mode = 0644,
1266 .proc_handler = &proc_dointvec_jiffies, 1129 .proc_handler = &proc_dointvec_jiffies,
1267 .strategy = &sysctl_jiffies,
1268 }, 1130 },
1269 { 1131 {
1270 .ctl_name = VM_BLOCK_DUMP,
1271 .procname = "block_dump", 1132 .procname = "block_dump",
1272 .data = &block_dump, 1133 .data = &block_dump,
1273 .maxlen = sizeof(block_dump), 1134 .maxlen = sizeof(block_dump),
1274 .mode = 0644, 1135 .mode = 0644,
1275 .proc_handler = &proc_dointvec, 1136 .proc_handler = &proc_dointvec,
1276 .strategy = &sysctl_intvec,
1277 .extra1 = &zero, 1137 .extra1 = &zero,
1278 }, 1138 },
1279 { 1139 {
1280 .ctl_name = VM_VFS_CACHE_PRESSURE,
1281 .procname = "vfs_cache_pressure", 1140 .procname = "vfs_cache_pressure",
1282 .data = &sysctl_vfs_cache_pressure, 1141 .data = &sysctl_vfs_cache_pressure,
1283 .maxlen = sizeof(sysctl_vfs_cache_pressure), 1142 .maxlen = sizeof(sysctl_vfs_cache_pressure),
1284 .mode = 0644, 1143 .mode = 0644,
1285 .proc_handler = &proc_dointvec, 1144 .proc_handler = &proc_dointvec,
1286 .strategy = &sysctl_intvec,
1287 .extra1 = &zero, 1145 .extra1 = &zero,
1288 }, 1146 },
1289#ifdef HAVE_ARCH_PICK_MMAP_LAYOUT 1147#ifdef HAVE_ARCH_PICK_MMAP_LAYOUT
1290 { 1148 {
1291 .ctl_name = VM_LEGACY_VA_LAYOUT,
1292 .procname = "legacy_va_layout", 1149 .procname = "legacy_va_layout",
1293 .data = &sysctl_legacy_va_layout, 1150 .data = &sysctl_legacy_va_layout,
1294 .maxlen = sizeof(sysctl_legacy_va_layout), 1151 .maxlen = sizeof(sysctl_legacy_va_layout),
1295 .mode = 0644, 1152 .mode = 0644,
1296 .proc_handler = &proc_dointvec, 1153 .proc_handler = &proc_dointvec,
1297 .strategy = &sysctl_intvec,
1298 .extra1 = &zero, 1154 .extra1 = &zero,
1299 }, 1155 },
1300#endif 1156#endif
1301#ifdef CONFIG_NUMA 1157#ifdef CONFIG_NUMA
1302 { 1158 {
1303 .ctl_name = VM_ZONE_RECLAIM_MODE,
1304 .procname = "zone_reclaim_mode", 1159 .procname = "zone_reclaim_mode",
1305 .data = &zone_reclaim_mode, 1160 .data = &zone_reclaim_mode,
1306 .maxlen = sizeof(zone_reclaim_mode), 1161 .maxlen = sizeof(zone_reclaim_mode),
1307 .mode = 0644, 1162 .mode = 0644,
1308 .proc_handler = &proc_dointvec, 1163 .proc_handler = &proc_dointvec,
1309 .strategy = &sysctl_intvec,
1310 .extra1 = &zero, 1164 .extra1 = &zero,
1311 }, 1165 },
1312 { 1166 {
1313 .ctl_name = VM_MIN_UNMAPPED,
1314 .procname = "min_unmapped_ratio", 1167 .procname = "min_unmapped_ratio",
1315 .data = &sysctl_min_unmapped_ratio, 1168 .data = &sysctl_min_unmapped_ratio,
1316 .maxlen = sizeof(sysctl_min_unmapped_ratio), 1169 .maxlen = sizeof(sysctl_min_unmapped_ratio),
1317 .mode = 0644, 1170 .mode = 0644,
1318 .proc_handler = &sysctl_min_unmapped_ratio_sysctl_handler, 1171 .proc_handler = &sysctl_min_unmapped_ratio_sysctl_handler,
1319 .strategy = &sysctl_intvec,
1320 .extra1 = &zero, 1172 .extra1 = &zero,
1321 .extra2 = &one_hundred, 1173 .extra2 = &one_hundred,
1322 }, 1174 },
1323 { 1175 {
1324 .ctl_name = VM_MIN_SLAB,
1325 .procname = "min_slab_ratio", 1176 .procname = "min_slab_ratio",
1326 .data = &sysctl_min_slab_ratio, 1177 .data = &sysctl_min_slab_ratio,
1327 .maxlen = sizeof(sysctl_min_slab_ratio), 1178 .maxlen = sizeof(sysctl_min_slab_ratio),
1328 .mode = 0644, 1179 .mode = 0644,
1329 .proc_handler = &sysctl_min_slab_ratio_sysctl_handler, 1180 .proc_handler = &sysctl_min_slab_ratio_sysctl_handler,
1330 .strategy = &sysctl_intvec,
1331 .extra1 = &zero, 1181 .extra1 = &zero,
1332 .extra2 = &one_hundred, 1182 .extra2 = &one_hundred,
1333 }, 1183 },
1334#endif 1184#endif
1335#ifdef CONFIG_SMP 1185#ifdef CONFIG_SMP
1336 { 1186 {
1337 .ctl_name = CTL_UNNUMBERED,
1338 .procname = "stat_interval", 1187 .procname = "stat_interval",
1339 .data = &sysctl_stat_interval, 1188 .data = &sysctl_stat_interval,
1340 .maxlen = sizeof(sysctl_stat_interval), 1189 .maxlen = sizeof(sysctl_stat_interval),
1341 .mode = 0644, 1190 .mode = 0644,
1342 .proc_handler = &proc_dointvec_jiffies, 1191 .proc_handler = &proc_dointvec_jiffies,
1343 .strategy = &sysctl_jiffies,
1344 }, 1192 },
1345#endif 1193#endif
1346 { 1194 {
1347 .ctl_name = CTL_UNNUMBERED,
1348 .procname = "mmap_min_addr", 1195 .procname = "mmap_min_addr",
1349 .data = &dac_mmap_min_addr, 1196 .data = &dac_mmap_min_addr,
1350 .maxlen = sizeof(unsigned long), 1197 .maxlen = sizeof(unsigned long),
@@ -1353,43 +1200,36 @@ static struct ctl_table vm_table[] = {
1353 }, 1200 },
1354#ifdef CONFIG_NUMA 1201#ifdef CONFIG_NUMA
1355 { 1202 {
1356 .ctl_name = CTL_UNNUMBERED,
1357 .procname = "numa_zonelist_order", 1203 .procname = "numa_zonelist_order",
1358 .data = &numa_zonelist_order, 1204 .data = &numa_zonelist_order,
1359 .maxlen = NUMA_ZONELIST_ORDER_LEN, 1205 .maxlen = NUMA_ZONELIST_ORDER_LEN,
1360 .mode = 0644, 1206 .mode = 0644,
1361 .proc_handler = &numa_zonelist_order_handler, 1207 .proc_handler = &numa_zonelist_order_handler,
1362 .strategy = &sysctl_string,
1363 }, 1208 },
1364#endif 1209#endif
1365#if (defined(CONFIG_X86_32) && !defined(CONFIG_UML))|| \ 1210#if (defined(CONFIG_X86_32) && !defined(CONFIG_UML))|| \
1366 (defined(CONFIG_SUPERH) && defined(CONFIG_VSYSCALL)) 1211 (defined(CONFIG_SUPERH) && defined(CONFIG_VSYSCALL))
1367 { 1212 {
1368 .ctl_name = VM_VDSO_ENABLED,
1369 .procname = "vdso_enabled", 1213 .procname = "vdso_enabled",
1370 .data = &vdso_enabled, 1214 .data = &vdso_enabled,
1371 .maxlen = sizeof(vdso_enabled), 1215 .maxlen = sizeof(vdso_enabled),
1372 .mode = 0644, 1216 .mode = 0644,
1373 .proc_handler = &proc_dointvec, 1217 .proc_handler = &proc_dointvec,
1374 .strategy = &sysctl_intvec,
1375 .extra1 = &zero, 1218 .extra1 = &zero,
1376 }, 1219 },
1377#endif 1220#endif
1378#ifdef CONFIG_HIGHMEM 1221#ifdef CONFIG_HIGHMEM
1379 { 1222 {
1380 .ctl_name = CTL_UNNUMBERED,
1381 .procname = "highmem_is_dirtyable", 1223 .procname = "highmem_is_dirtyable",
1382 .data = &vm_highmem_is_dirtyable, 1224 .data = &vm_highmem_is_dirtyable,
1383 .maxlen = sizeof(vm_highmem_is_dirtyable), 1225 .maxlen = sizeof(vm_highmem_is_dirtyable),
1384 .mode = 0644, 1226 .mode = 0644,
1385 .proc_handler = &proc_dointvec_minmax, 1227 .proc_handler = &proc_dointvec_minmax,
1386 .strategy = &sysctl_intvec,
1387 .extra1 = &zero, 1228 .extra1 = &zero,
1388 .extra2 = &one, 1229 .extra2 = &one,
1389 }, 1230 },
1390#endif 1231#endif
1391 { 1232 {
1392 .ctl_name = CTL_UNNUMBERED,
1393 .procname = "scan_unevictable_pages", 1233 .procname = "scan_unevictable_pages",
1394 .data = &scan_unevictable_pages, 1234 .data = &scan_unevictable_pages,
1395 .maxlen = sizeof(scan_unevictable_pages), 1235 .maxlen = sizeof(scan_unevictable_pages),
@@ -1398,24 +1238,20 @@ static struct ctl_table vm_table[] = {
1398 }, 1238 },
1399#ifdef CONFIG_MEMORY_FAILURE 1239#ifdef CONFIG_MEMORY_FAILURE
1400 { 1240 {
1401 .ctl_name = CTL_UNNUMBERED,
1402 .procname = "memory_failure_early_kill", 1241 .procname = "memory_failure_early_kill",
1403 .data = &sysctl_memory_failure_early_kill, 1242 .data = &sysctl_memory_failure_early_kill,
1404 .maxlen = sizeof(sysctl_memory_failure_early_kill), 1243 .maxlen = sizeof(sysctl_memory_failure_early_kill),
1405 .mode = 0644, 1244 .mode = 0644,
1406 .proc_handler = &proc_dointvec_minmax, 1245 .proc_handler = &proc_dointvec_minmax,
1407 .strategy = &sysctl_intvec,
1408 .extra1 = &zero, 1246 .extra1 = &zero,
1409 .extra2 = &one, 1247 .extra2 = &one,
1410 }, 1248 },
1411 { 1249 {
1412 .ctl_name = CTL_UNNUMBERED,
1413 .procname = "memory_failure_recovery", 1250 .procname = "memory_failure_recovery",
1414 .data = &sysctl_memory_failure_recovery, 1251 .data = &sysctl_memory_failure_recovery,
1415 .maxlen = sizeof(sysctl_memory_failure_recovery), 1252 .maxlen = sizeof(sysctl_memory_failure_recovery),
1416 .mode = 0644, 1253 .mode = 0644,
1417 .proc_handler = &proc_dointvec_minmax, 1254 .proc_handler = &proc_dointvec_minmax,
1418 .strategy = &sysctl_intvec,
1419 .extra1 = &zero, 1255 .extra1 = &zero,
1420 .extra2 = &one, 1256 .extra2 = &one,
1421 }, 1257 },
@@ -1425,18 +1261,17 @@ static struct ctl_table vm_table[] = {
1425 * NOTE: do not add new entries to this table unless you have read 1261 * NOTE: do not add new entries to this table unless you have read
1426 * Documentation/sysctl/ctl_unnumbered.txt 1262 * Documentation/sysctl/ctl_unnumbered.txt
1427 */ 1263 */
1428 { .ctl_name = 0 } 1264 { }
1429}; 1265};
1430 1266
1431#if defined(CONFIG_BINFMT_MISC) || defined(CONFIG_BINFMT_MISC_MODULE) 1267#if defined(CONFIG_BINFMT_MISC) || defined(CONFIG_BINFMT_MISC_MODULE)
1432static struct ctl_table binfmt_misc_table[] = { 1268static struct ctl_table binfmt_misc_table[] = {
1433 { .ctl_name = 0 } 1269 { }
1434}; 1270};
1435#endif 1271#endif
1436 1272
1437static struct ctl_table fs_table[] = { 1273static struct ctl_table fs_table[] = {
1438 { 1274 {
1439 .ctl_name = FS_NRINODE,
1440 .procname = "inode-nr", 1275 .procname = "inode-nr",
1441 .data = &inodes_stat, 1276 .data = &inodes_stat,
1442 .maxlen = 2*sizeof(int), 1277 .maxlen = 2*sizeof(int),
@@ -1444,7 +1279,6 @@ static struct ctl_table fs_table[] = {
1444 .proc_handler = &proc_dointvec, 1279 .proc_handler = &proc_dointvec,
1445 }, 1280 },
1446 { 1281 {
1447 .ctl_name = FS_STATINODE,
1448 .procname = "inode-state", 1282 .procname = "inode-state",
1449 .data = &inodes_stat, 1283 .data = &inodes_stat,
1450 .maxlen = 7*sizeof(int), 1284 .maxlen = 7*sizeof(int),
@@ -1459,7 +1293,6 @@ static struct ctl_table fs_table[] = {
1459 .proc_handler = &proc_nr_files, 1293 .proc_handler = &proc_nr_files,
1460 }, 1294 },
1461 { 1295 {
1462 .ctl_name = FS_MAXFILE,
1463 .procname = "file-max", 1296 .procname = "file-max",
1464 .data = &files_stat.max_files, 1297 .data = &files_stat.max_files,
1465 .maxlen = sizeof(int), 1298 .maxlen = sizeof(int),
@@ -1467,7 +1300,6 @@ static struct ctl_table fs_table[] = {
1467 .proc_handler = &proc_dointvec, 1300 .proc_handler = &proc_dointvec,
1468 }, 1301 },
1469 { 1302 {
1470 .ctl_name = CTL_UNNUMBERED,
1471 .procname = "nr_open", 1303 .procname = "nr_open",
1472 .data = &sysctl_nr_open, 1304 .data = &sysctl_nr_open,
1473 .maxlen = sizeof(int), 1305 .maxlen = sizeof(int),
@@ -1477,7 +1309,6 @@ static struct ctl_table fs_table[] = {
1477 .extra2 = &sysctl_nr_open_max, 1309 .extra2 = &sysctl_nr_open_max,
1478 }, 1310 },
1479 { 1311 {
1480 .ctl_name = FS_DENTRY,
1481 .procname = "dentry-state", 1312 .procname = "dentry-state",
1482 .data = &dentry_stat, 1313 .data = &dentry_stat,
1483 .maxlen = 6*sizeof(int), 1314 .maxlen = 6*sizeof(int),
@@ -1485,30 +1316,25 @@ static struct ctl_table fs_table[] = {
1485 .proc_handler = &proc_dointvec, 1316 .proc_handler = &proc_dointvec,
1486 }, 1317 },
1487 { 1318 {
1488 .ctl_name = FS_OVERFLOWUID,
1489 .procname = "overflowuid", 1319 .procname = "overflowuid",
1490 .data = &fs_overflowuid, 1320 .data = &fs_overflowuid,
1491 .maxlen = sizeof(int), 1321 .maxlen = sizeof(int),
1492 .mode = 0644, 1322 .mode = 0644,
1493 .proc_handler = &proc_dointvec_minmax, 1323 .proc_handler = &proc_dointvec_minmax,
1494 .strategy = &sysctl_intvec,
1495 .extra1 = &minolduid, 1324 .extra1 = &minolduid,
1496 .extra2 = &maxolduid, 1325 .extra2 = &maxolduid,
1497 }, 1326 },
1498 { 1327 {
1499 .ctl_name = FS_OVERFLOWGID,
1500 .procname = "overflowgid", 1328 .procname = "overflowgid",
1501 .data = &fs_overflowgid, 1329 .data = &fs_overflowgid,
1502 .maxlen = sizeof(int), 1330 .maxlen = sizeof(int),
1503 .mode = 0644, 1331 .mode = 0644,
1504 .proc_handler = &proc_dointvec_minmax, 1332 .proc_handler = &proc_dointvec_minmax,
1505 .strategy = &sysctl_intvec,
1506 .extra1 = &minolduid, 1333 .extra1 = &minolduid,
1507 .extra2 = &maxolduid, 1334 .extra2 = &maxolduid,
1508 }, 1335 },
1509#ifdef CONFIG_FILE_LOCKING 1336#ifdef CONFIG_FILE_LOCKING
1510 { 1337 {
1511 .ctl_name = FS_LEASES,
1512 .procname = "leases-enable", 1338 .procname = "leases-enable",
1513 .data = &leases_enable, 1339 .data = &leases_enable,
1514 .maxlen = sizeof(int), 1340 .maxlen = sizeof(int),
@@ -1518,7 +1344,6 @@ static struct ctl_table fs_table[] = {
1518#endif 1344#endif
1519#ifdef CONFIG_DNOTIFY 1345#ifdef CONFIG_DNOTIFY
1520 { 1346 {
1521 .ctl_name = FS_DIR_NOTIFY,
1522 .procname = "dir-notify-enable", 1347 .procname = "dir-notify-enable",
1523 .data = &dir_notify_enable, 1348 .data = &dir_notify_enable,
1524 .maxlen = sizeof(int), 1349 .maxlen = sizeof(int),
@@ -1529,7 +1354,6 @@ static struct ctl_table fs_table[] = {
1529#ifdef CONFIG_MMU 1354#ifdef CONFIG_MMU
1530#ifdef CONFIG_FILE_LOCKING 1355#ifdef CONFIG_FILE_LOCKING
1531 { 1356 {
1532 .ctl_name = FS_LEASE_TIME,
1533 .procname = "lease-break-time", 1357 .procname = "lease-break-time",
1534 .data = &lease_break_time, 1358 .data = &lease_break_time,
1535 .maxlen = sizeof(int), 1359 .maxlen = sizeof(int),
@@ -1555,7 +1379,6 @@ static struct ctl_table fs_table[] = {
1555#endif /* CONFIG_AIO */ 1379#endif /* CONFIG_AIO */
1556#ifdef CONFIG_INOTIFY_USER 1380#ifdef CONFIG_INOTIFY_USER
1557 { 1381 {
1558 .ctl_name = FS_INOTIFY,
1559 .procname = "inotify", 1382 .procname = "inotify",
1560 .mode = 0555, 1383 .mode = 0555,
1561 .child = inotify_table, 1384 .child = inotify_table,
@@ -1570,19 +1393,16 @@ static struct ctl_table fs_table[] = {
1570#endif 1393#endif
1571#endif 1394#endif
1572 { 1395 {
1573 .ctl_name = KERN_SETUID_DUMPABLE,
1574 .procname = "suid_dumpable", 1396 .procname = "suid_dumpable",
1575 .data = &suid_dumpable, 1397 .data = &suid_dumpable,
1576 .maxlen = sizeof(int), 1398 .maxlen = sizeof(int),
1577 .mode = 0644, 1399 .mode = 0644,
1578 .proc_handler = &proc_dointvec_minmax, 1400 .proc_handler = &proc_dointvec_minmax,
1579 .strategy = &sysctl_intvec,
1580 .extra1 = &zero, 1401 .extra1 = &zero,
1581 .extra2 = &two, 1402 .extra2 = &two,
1582 }, 1403 },
1583#if defined(CONFIG_BINFMT_MISC) || defined(CONFIG_BINFMT_MISC_MODULE) 1404#if defined(CONFIG_BINFMT_MISC) || defined(CONFIG_BINFMT_MISC_MODULE)
1584 { 1405 {
1585 .ctl_name = CTL_UNNUMBERED,
1586 .procname = "binfmt_misc", 1406 .procname = "binfmt_misc",
1587 .mode = 0555, 1407 .mode = 0555,
1588 .child = binfmt_misc_table, 1408 .child = binfmt_misc_table,
@@ -1592,13 +1412,12 @@ static struct ctl_table fs_table[] = {
1592 * NOTE: do not add new entries to this table unless you have read 1412 * NOTE: do not add new entries to this table unless you have read
1593 * Documentation/sysctl/ctl_unnumbered.txt 1413 * Documentation/sysctl/ctl_unnumbered.txt
1594 */ 1414 */
1595 { .ctl_name = 0 } 1415 { }
1596}; 1416};
1597 1417
1598static struct ctl_table debug_table[] = { 1418static struct ctl_table debug_table[] = {
1599#if defined(CONFIG_X86) || defined(CONFIG_PPC) 1419#if defined(CONFIG_X86) || defined(CONFIG_PPC)
1600 { 1420 {
1601 .ctl_name = CTL_UNNUMBERED,
1602 .procname = "exception-trace", 1421 .procname = "exception-trace",
1603 .data = &show_unhandled_signals, 1422 .data = &show_unhandled_signals,
1604 .maxlen = sizeof(int), 1423 .maxlen = sizeof(int),
@@ -1606,11 +1425,11 @@ static struct ctl_table debug_table[] = {
1606 .proc_handler = proc_dointvec 1425 .proc_handler = proc_dointvec
1607 }, 1426 },
1608#endif 1427#endif
1609 { .ctl_name = 0 } 1428 { }
1610}; 1429};
1611 1430
1612static struct ctl_table dev_table[] = { 1431static struct ctl_table dev_table[] = {
1613 { .ctl_name = 0 } 1432 { }
1614}; 1433};
1615 1434
1616static DEFINE_SPINLOCK(sysctl_lock); 1435static DEFINE_SPINLOCK(sysctl_lock);
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-11 02:16:44 -0500