git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
V4L/DVB (6503): pvrusb2: Fix associativity logic error
[safe/jmp/linux-2.6]
/
kernel
/
printk.c
diff --git
a/kernel/printk.c
b/kernel/printk.c
index
5249347
..
a30fe33
100644
(file)
--- a/
kernel/printk.c
+++ b/
kernel/printk.c
@@
-862,7
+862,16
@@
int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, cha
return -1;
}
return -1;
}
-#ifndef CONFIG_DISABLE_CONSOLE_SUSPEND
+int console_suspend_enabled = 1;
+EXPORT_SYMBOL(console_suspend_enabled);
+
+static int __init console_suspend_disable(char *str)
+{
+ console_suspend_enabled = 0;
+ return 1;
+}
+__setup("no_console_suspend", console_suspend_disable);
+
/**
* suspend_console - suspend the console subsystem
*
/**
* suspend_console - suspend the console subsystem
*
@@
-870,6
+879,8
@@
int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, cha
*/
void suspend_console(void)
{
*/
void suspend_console(void)
{
+ if (!console_suspend_enabled)
+ return;
printk("Suspending console(s)\n");
acquire_console_sem();
console_suspended = 1;
printk("Suspending console(s)\n");
acquire_console_sem();
console_suspended = 1;
@@
-877,10
+888,11
@@
void suspend_console(void)
void resume_console(void)
{
void resume_console(void)
{
+ if (!console_suspend_enabled)
+ return;
console_suspended = 0;
release_console_sem();
}
console_suspended = 0;
release_console_sem();
}
-#endif /* CONFIG_DISABLE_CONSOLE_SUSPEND */
/**
* acquire_console_sem - lock the console system for exclusive use.
/**
* acquire_console_sem - lock the console system for exclusive use.