From: Greg Kroah-Hartman Date: Mon, 9 Dec 2013 00:27:00 +0000 (-0800) Subject: 3.4-stable patches X-Git-Tag: v3.4.74~19 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=974029db66b3e57c67012685151e8f95da36d05e;p=thirdparty%2Fkernel%2Fstable-queue.git 3.4-stable patches added patches: input-allow-deselecting-serio-drivers-even-without-config_expert.patch input-mousedev-allow-disabling-even-without-config_expert.patch --- diff --git a/queue-3.4/input-allow-deselecting-serio-drivers-even-without-config_expert.patch b/queue-3.4/input-allow-deselecting-serio-drivers-even-without-config_expert.patch new file mode 100644 index 00000000000..2ff95e12dfe --- /dev/null +++ b/queue-3.4/input-allow-deselecting-serio-drivers-even-without-config_expert.patch @@ -0,0 +1,79 @@ +From bcd2623073e98f69f84720308db0b142c4da0bd6 Mon Sep 17 00:00:00 2001 +From: Tom Gundersen +Date: Thu, 31 Oct 2013 00:38:30 -0700 +Subject: Input: allow deselecting serio drivers even without CONFIG_EXPERT + +From: Tom Gundersen + +commit bcd2623073e98f69f84720308db0b142c4da0bd6 upstream. + +There is plenty of consumer hardware (e.g., mac books) that does not use AT +keyboards or PS/2 mice. It therefore makes sense for distro kernels to +build the related drivers as modules to avoid loading them on hardware that +does not need them. As such, these options should no longer be protected by +EXPERT. + +Moreover, building these drivers as modules gets rid of the following ugly +error during boot: + +[ 2.337745] i8042: PNP: No PS/2 controller found. Probing ports directly. +[ 3.439537] i8042: No controller found + +Signed-off-by: Tom Gundersen +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/input/keyboard/Kconfig | 4 ++-- + drivers/input/serio/Kconfig | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +--- a/drivers/input/keyboard/Kconfig ++++ b/drivers/input/keyboard/Kconfig +@@ -2,7 +2,7 @@ + # Input core configuration + # + menuconfig INPUT_KEYBOARD +- bool "Keyboards" if EXPERT || !X86 ++ bool "Keyboards" + default y + help + Say Y here, and a list of supported keyboards will be displayed. +@@ -67,7 +67,7 @@ config KEYBOARD_ATARI + module will be called atakbd. + + config KEYBOARD_ATKBD +- tristate "AT keyboard" if EXPERT || !X86 ++ tristate "AT keyboard" + default y + select SERIO + select SERIO_LIBPS2 +--- a/drivers/input/serio/Kconfig ++++ b/drivers/input/serio/Kconfig +@@ -2,7 +2,7 @@ + # Input core configuration + # + config SERIO +- tristate "Serial I/O support" if EXPERT || !X86 ++ tristate "Serial I/O support" + default y + help + Say Yes here if you have any input device that uses serial I/O to +@@ -19,7 +19,7 @@ config SERIO + if SERIO + + config SERIO_I8042 +- tristate "i8042 PC Keyboard controller" if EXPERT || !X86 ++ tristate "i8042 PC Keyboard controller" + default y + depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \ + (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN +@@ -168,7 +168,7 @@ config SERIO_MACEPS2 + module will be called maceps2. + + config SERIO_LIBPS2 +- tristate "PS/2 driver library" if EXPERT ++ tristate "PS/2 driver library" + depends on SERIO_I8042 || SERIO_I8042=n + help + Say Y here if you are using a driver for device connected diff --git a/queue-3.4/input-mousedev-allow-disabling-even-without-config_expert.patch b/queue-3.4/input-mousedev-allow-disabling-even-without-config_expert.patch new file mode 100644 index 00000000000..23c5b9bac12 --- /dev/null +++ b/queue-3.4/input-mousedev-allow-disabling-even-without-config_expert.patch @@ -0,0 +1,33 @@ +From dfaaed08ecc01bd513248ba7999daf50ce028352 Mon Sep 17 00:00:00 2001 +From: Tom Gundersen +Date: Thu, 31 Oct 2013 00:44:49 -0700 +Subject: Input: mousedev - allow disabling even without CONFIG_EXPERT + +From: Tom Gundersen + +commit dfaaed08ecc01bd513248ba7999daf50ce028352 upstream. + +Moust (if not all) modern software, including X, uses /dev/eventX rather than +the legacy /dev/mouseX devices. It therefore makes sense for general-purpose +(distro) kernels to use MOUSEDV=m (or even n), so let's drop the EXPERT=y +requirement. + +Signed-off-by: Tom Gundersen +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/input/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/input/Kconfig ++++ b/drivers/input/Kconfig +@@ -71,7 +71,7 @@ config INPUT_SPARSEKMAP + comment "Userland interfaces" + + config INPUT_MOUSEDEV +- tristate "Mouse interface" if EXPERT ++ tristate "Mouse interface" + default y + help + Say Y here if you want your mouse to be accessible as char devices diff --git a/queue-3.4/series b/queue-3.4/series index d55b216e7f0..17c5c4b7bf6 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -12,3 +12,5 @@ nfsv4-update-list-of-irrecoverable-errors-on-delegreturn.patch powerpc-gpio-fix-the-wrong-gpio-input-data-on-mpc8572-mpc8536.patch irq-enable-all-irqs-unconditionally-in-irq_resume.patch net-update-consumers-of-msg_more-to-recognize-msg_sendpage_notlast.patch +input-allow-deselecting-serio-drivers-even-without-config_expert.patch +input-mousedev-allow-disabling-even-without-config_expert.patch