Patch "Input: wistron_btns - disable on UML" has been added to the 5.15-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    Input: wistron_btns - disable on UML

to the 5.15-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     input-wistron_btns-disable-on-uml.patch
and it can be found in the queue-5.15 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 13850451d59e160408c00740b41528eb68340980
Author: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Date:   Wed Nov 30 15:01:07 2022 -0800

    Input: wistron_btns - disable on UML
    
    [ Upstream commit b2b80d9dd14cb5b70dc254bddbc4eea932694791 ]
    
    The wistron_btns driver calls rtc_cmos_read(), which isn't
    available with UML builds, so disable this driver on UML.
    
    Prevents this build error:
    
    ld: drivers/input/misc/wistron_btns.o: in function `poll_bios':
    wistron_btns.c:(.text+0x4be): undefined reference to `rtc_cmos_read'
    
    Fixes: 0bbadafdc49d ("um: allow disabling NO_IOMEM") # v5.14+
    Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20221130161604.1879-1-rdunlap@xxxxxxxxxxxxx
    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index dd5227cf8696..b5b8ddb536be 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -330,7 +330,7 @@ config INPUT_CPCAP_PWRBUTTON
 
 config INPUT_WISTRON_BTNS
 	tristate "x86 Wistron laptop button interface"
-	depends on X86_32
+	depends on X86_32 && !UML
 	select INPUT_SPARSEKMAP
 	select NEW_LEDS
 	select LEDS_CLASS



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux