Commit f8ba95c5 authored by Andrew Morton's avatar Andrew Morton Committed by James Toy

Cc: Dave Young <hidave.darkstar@gmail.com>

Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 0b479289
...@@ -163,7 +163,6 @@ enum ...@@ -163,7 +163,6 @@ enum
KERN_MAX_LOCK_DEPTH=74, KERN_MAX_LOCK_DEPTH=74,
KERN_NMI_WATCHDOG=75, /* int: enable/disable nmi watchdog */ KERN_NMI_WATCHDOG=75, /* int: enable/disable nmi watchdog */
KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
KERN_PRINTK_DELAY = 77, /* int: tune printk delay*/
}; };
......
...@@ -105,7 +105,9 @@ static int __maybe_unused one = 1; ...@@ -105,7 +105,9 @@ static int __maybe_unused one = 1;
static int __maybe_unused two = 2; static int __maybe_unused two = 2;
static unsigned long one_ul = 1; static unsigned long one_ul = 1;
static int one_hundred = 100; static int one_hundred = 100;
#ifdef CONFIG_PRINTK
static int ten_thousand = 10000; static int ten_thousand = 10000;
#endif
/* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */ /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
static unsigned long dirty_bytes_min = 2 * PAGE_SIZE; static unsigned long dirty_bytes_min = 2 * PAGE_SIZE;
...@@ -715,7 +717,7 @@ static struct ctl_table kern_table[] = { ...@@ -715,7 +717,7 @@ static struct ctl_table kern_table[] = {
.proc_handler = &proc_dointvec, .proc_handler = &proc_dointvec,
}, },
{ {
.ctl_name = KERN_PRINTK_DELAY, .ctl_name = CTL_UNNUMBERED,
.procname = "printk_delay", .procname = "printk_delay",
.data = &printk_delay_msec, .data = &printk_delay_msec,
.maxlen = sizeof(int), .maxlen = sizeof(int),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment