Commit 9326b047 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman

TTY: 8250, deprecated 8250_core.* options

They were introduced by mistake in 3.7. Let's deprecate them now. For
the reasons, see the text in Kconfig below.
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Josh Boyer <jwboyer@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9196d8ac
...@@ -3418,6 +3418,7 @@ MODULE_PARM_DESC(probe_rsa, "Probe I/O ports for RSA"); ...@@ -3418,6 +3418,7 @@ MODULE_PARM_DESC(probe_rsa, "Probe I/O ports for RSA");
#endif #endif
MODULE_ALIAS_CHARDEV_MAJOR(TTY_MAJOR); MODULE_ALIAS_CHARDEV_MAJOR(TTY_MAJOR);
#ifdef CONFIG_SERIAL_8250_DEPRECATED_OPTIONS
#ifndef MODULE #ifndef MODULE
/* This module was renamed to 8250_core in 3.7. Keep the old "8250" name /* This module was renamed to 8250_core in 3.7. Keep the old "8250" name
* working as well for the module options so we don't break people. We * working as well for the module options so we don't break people. We
...@@ -3446,3 +3447,4 @@ static void __used s8250_options(void) ...@@ -3446,3 +3447,4 @@ static void __used s8250_options(void)
#else #else
MODULE_ALIAS("8250_core"); MODULE_ALIAS("8250_core");
#endif #endif
#endif
...@@ -33,6 +33,23 @@ config SERIAL_8250 ...@@ -33,6 +33,23 @@ config SERIAL_8250
Most people will say Y or M here, so that they can use serial mice, Most people will say Y or M here, so that they can use serial mice,
modems and similar devices connecting to the standard serial ports. modems and similar devices connecting to the standard serial ports.
config SERIAL_8250_DEPRECATED_OPTIONS
bool "Support 8250_core.* kernel options (DEPRECATED)"
depends on SERIAL_8250
default y
---help---
In 3.7 we renamed 8250 to 8250_core by mistake, so now we have to
accept kernel parameters in both forms like 8250_core.nr_uarts=4 and
8250.nr_uarts=4. We now renamed the module back to 8250, but if
anybody noticed in 3.7 and changed their userspace we still have to
keep the 8350_core.* options around until they revert the changes
they already did.
If 8250 is built as a module, this adds 8250_core alias instead.
If you did not notice yet and/or you have userspace from pre-3.7, it
is safe (and recommended) to say N here.
config SERIAL_8250_PNP config SERIAL_8250_PNP
bool "8250/16550 PNP device support" if EXPERT bool "8250/16550 PNP device support" if EXPERT
depends on SERIAL_8250 && PNP depends on SERIAL_8250 && PNP
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment