From: Daniel Thompson Date: Fri, 28 Mar 2014 11:41:38 +0000 (+0000) Subject: serial: mux: Align SUPPORT_SYSRQ behaviour with other drivers. X-Git-Tag: firefly_0821_release~176^2~3465^2~38^2~81 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=22766ed8a235f3c9043678c7c594afe683b2372f;p=firefly-linux-kernel-4.4.55.git serial: mux: Align SUPPORT_SYSRQ behaviour with other drivers. The mux driver is anomalous among all the serial drivers that can define SUPPORT_SYSRQ because it can, with some configs, set SUPPORT_SYSRQ when SERIAL_CORE_CONSOLE is not set. Not only does this impose a pointless (but tiny) runtime overhead for such configs but, more significantly, it adds needless complexity when doing a code review to check for unexpected side effects of any changes to the serial core. This is (cross-)compile tested only because I do not have any PA-RISC hardware. Signed-off-by: Daniel Thompson Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/serial/mux.c b/drivers/tty/serial/mux.c index 7fd6aaaacd8e..9b27d34ad49e 100644 --- a/drivers/tty/serial/mux.c +++ b/drivers/tty/serial/mux.c @@ -29,7 +29,7 @@ #include #include -#ifdef CONFIG_MAGIC_SYSRQ +#if defined(CONFIG_SERIAL_MUX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) #include #define SUPPORT_SYSRQ #endif