diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2015-03-09 16:27:12 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-26 16:16:20 +0100 |
| commit | c7cef0a84912cab3c9df8949b034e4aa62982ec9 (patch) | |
| tree | 5e3d7761af96a243ac7460cbbd4e6b20f4eb00c2 /include/linux/console.h | |
| parent | e13cb72beeada6f6ac12058b9129334e3bb5ce85 (diff) | |
| download | linux-stable-c7cef0a84912cab3c9df8949b034e4aa62982ec9.tar.gz linux-stable-c7cef0a84912cab3c9df8949b034e4aa62982ec9.tar.bz2 linux-stable-c7cef0a84912cab3c9df8949b034e4aa62982ec9.zip | |
console: Add extensible console matching
Add match() method to struct console which allows the console to
perform console command line matching instead of (or in addition to)
default console matching (ie., by fixed name and index).
The match() method returns 0 to indicate a successful match; normal
console matching occurs if no match() method is defined or the
match() method returns non-zero. The match() method is expected to set
the console index if required.
Re-implement earlycon-to-console-handoff with direct matching of
"console=uart|uart8250,..." to the 8250 ttyS console.
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/console.h')
| -rw-r--r-- | include/linux/console.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/console.h b/include/linux/console.h index 7571a16bd653..9f50fb413c11 100644 --- a/include/linux/console.h +++ b/include/linux/console.h @@ -123,7 +123,7 @@ struct console { struct tty_driver *(*device)(struct console *, int *); void (*unblank)(void); int (*setup)(struct console *, char *); - int (*early_setup)(void); + int (*match)(struct console *, char *name, int idx, char *options); short flags; short index; int cflag; @@ -141,7 +141,6 @@ extern int console_set_on_cmdline; extern struct console *early_console; extern int add_preferred_console(char *name, int idx, char *options); -extern int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, char *options); extern void register_console(struct console *); extern int unregister_console(struct console *); extern struct console *console_drivers; |