diff options
Diffstat (limited to 'include/linux/console.h')
| -rw-r--r-- | include/linux/console.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/console.h b/include/linux/console.h index 08734e660d41..76a1807726eb 100644 --- a/include/linux/console.h +++ b/include/linux/console.h | |||
| @@ -63,9 +63,11 @@ extern const struct consw vga_con; /* VGA text console */ | |||
| 63 | extern const struct consw newport_con; /* SGI Newport console */ | 63 | extern const struct consw newport_con; /* SGI Newport console */ |
| 64 | extern const struct consw prom_con; /* SPARC PROM console */ | 64 | extern const struct consw prom_con; /* SPARC PROM console */ |
| 65 | 65 | ||
| 66 | int con_is_bound(const struct consw *csw); | ||
| 67 | int register_con_driver(const struct consw *csw, int first, int last); | ||
| 68 | int unregister_con_driver(const struct consw *csw); | ||
| 66 | int take_over_console(const struct consw *sw, int first, int last, int deflt); | 69 | int take_over_console(const struct consw *sw, int first, int last, int deflt); |
| 67 | void give_up_console(const struct consw *sw); | 70 | void give_up_console(const struct consw *sw); |
| 68 | |||
| 69 | /* scroll */ | 71 | /* scroll */ |
| 70 | #define SM_UP (1) | 72 | #define SM_UP (1) |
| 71 | #define SM_DOWN (2) | 73 | #define SM_DOWN (2) |
| @@ -87,6 +89,7 @@ void give_up_console(const struct consw *sw); | |||
| 87 | #define CON_CONSDEV (2) /* Last on the command line */ | 89 | #define CON_CONSDEV (2) /* Last on the command line */ |
| 88 | #define CON_ENABLED (4) | 90 | #define CON_ENABLED (4) |
| 89 | #define CON_BOOT (8) | 91 | #define CON_BOOT (8) |
| 92 | #define CON_ANYTIME (16) /* Safe to call when cpu is offline */ | ||
| 90 | 93 | ||
| 91 | struct console | 94 | struct console |
| 92 | { | 95 | { |
| @@ -117,9 +120,14 @@ extern void console_stop(struct console *); | |||
| 117 | extern void console_start(struct console *); | 120 | extern void console_start(struct console *); |
| 118 | extern int is_console_locked(void); | 121 | extern int is_console_locked(void); |
| 119 | 122 | ||
| 123 | #ifndef CONFIG_DISABLE_CONSOLE_SUSPEND | ||
| 120 | /* Suspend and resume console messages over PM events */ | 124 | /* Suspend and resume console messages over PM events */ |
| 121 | extern void suspend_console(void); | 125 | extern void suspend_console(void); |
| 122 | extern void resume_console(void); | 126 | extern void resume_console(void); |
| 127 | #else | ||
| 128 | static inline void suspend_console(void) {} | ||
| 129 | static inline void resume_console(void) {} | ||
| 130 | #endif /* CONFIG_DISABLE_CONSOLE_SUSPEND */ | ||
| 123 | 131 | ||
| 124 | /* Some debug stub to catch some of the obvious races in the VT code */ | 132 | /* Some debug stub to catch some of the obvious races in the VT code */ |
| 125 | #if 1 | 133 | #if 1 |
