diff options
author | Yanmin Zhang <yanmin_zhang@linux.intel.com> | 2011-10-31 20:11:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-31 20:30:53 -0400 |
commit | 134620f7a865b3bc9e3d56d460603592b70ede21 (patch) | |
tree | 82d455ffba5417b731d0283c6593e101dfb625ac | |
parent | 0eca6b7c78fd997e02bd9850e608102382b7822e (diff) |
printk: add console_suspend module parameter
We are enabling some power features on medfield. To test suspend-2-RAM
conveniently, we need turn on/off console_suspend_enabled frequently.
Add a module parameter, so users could change it by:
/sys/module/printk/parameters/console_suspend
Signed-off-by: Yanmin Zhang <yanmin_zhang@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | Documentation/kernel-parameters.txt | 5 | ||||
-rw-r--r-- | kernel/printk.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 106efe1e2ba..c2efe285396 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -1669,6 +1669,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
1669 | debugging driver suspend/resume hooks). This may | 1669 | debugging driver suspend/resume hooks). This may |
1670 | not work reliably with all consoles, but is known | 1670 | not work reliably with all consoles, but is known |
1671 | to work with serial and VGA consoles. | 1671 | to work with serial and VGA consoles. |
1672 | To facilitate more flexible debugging, we also add | ||
1673 | console_suspend, a printk module parameter to control | ||
1674 | it. Users could use console_suspend (usually | ||
1675 | /sys/module/printk/parameters/console_suspend) to | ||
1676 | turn on/off it dynamically. | ||
1672 | 1677 | ||
1673 | noaliencache [MM, NUMA, SLAB] Disables the allocation of alien | 1678 | noaliencache [MM, NUMA, SLAB] Disables the allocation of alien |
1674 | caches in the slab allocator. Saves per-node memory, | 1679 | caches in the slab allocator. Saves per-node memory, |
diff --git a/kernel/printk.c b/kernel/printk.c index e62f949ec14..6d9dedd1145 100644 --- a/kernel/printk.c +++ b/kernel/printk.c | |||
@@ -1111,6 +1111,10 @@ static int __init console_suspend_disable(char *str) | |||
1111 | return 1; | 1111 | return 1; |
1112 | } | 1112 | } |
1113 | __setup("no_console_suspend", console_suspend_disable); | 1113 | __setup("no_console_suspend", console_suspend_disable); |
1114 | module_param_named(console_suspend, console_suspend_enabled, | ||
1115 | bool, S_IRUGO | S_IWUSR); | ||
1116 | MODULE_PARM_DESC(console_suspend, "suspend console during suspend" | ||
1117 | " and hibernate operations"); | ||
1114 | 1118 | ||
1115 | /** | 1119 | /** |
1116 | * suspend_console - suspend the console subsystem | 1120 | * suspend_console - suspend the console subsystem |