diff options
| author | Auke Kok <auke-jan.h.kok@intel.com> | 2006-06-21 16:43:50 -0400 |
|---|---|---|
| committer | Auke-jan Kok <ahkok@gitlost.site> | 2006-06-21 16:43:50 -0400 |
| commit | 0d204094d15dac2e8a439b993f71eda385b4dccd (patch) | |
| tree | 647f0ddec94d0fb4aaf74fa55bcad75946030f8a /include/linux/console.h | |
| parent | a487a8f7b6947f6445e5a1aa876522916785d5ec (diff) | |
| parent | 612eff0e3715a6faff5ba1b74873b99e036c59fe (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'include/linux/console.h')
| -rw-r--r-- | include/linux/console.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/console.h b/include/linux/console.h index 721371382ae5..08734e660d41 100644 --- a/include/linux/console.h +++ b/include/linux/console.h | |||
| @@ -117,6 +117,10 @@ extern void console_stop(struct console *); | |||
| 117 | extern void console_start(struct console *); | 117 | extern void console_start(struct console *); |
| 118 | extern int is_console_locked(void); | 118 | extern int is_console_locked(void); |
| 119 | 119 | ||
| 120 | /* Suspend and resume console messages over PM events */ | ||
| 121 | extern void suspend_console(void); | ||
| 122 | extern void resume_console(void); | ||
| 123 | |||
| 120 | /* Some debug stub to catch some of the obvious races in the VT code */ | 124 | /* Some debug stub to catch some of the obvious races in the VT code */ |
| 121 | #if 1 | 125 | #if 1 |
| 122 | #define WARN_CONSOLE_UNLOCKED() WARN_ON(!is_console_locked() && !oops_in_progress) | 126 | #define WARN_CONSOLE_UNLOCKED() WARN_ON(!is_console_locked() && !oops_in_progress) |