diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-01 15:45:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-01 15:45:14 -0700 |
| commit | 160729afc83c0053cb3c574b85e84574ad892bd7 (patch) | |
| tree | afc8e08dfeb5541cb0f2fe9ef1aff1809f36ae70 /arch/x86/Kconfig | |
| parent | e0f4c59dc4d39b3e9fa61ceb4cf2384787bcd09d (diff) | |
| parent | f96b4675839b66168f5a07bf964dde6c2f1c4885 (diff) | |
Merge tag 'x86_misc_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull misc x86 changes from Borislav Petkov:
- Use the proper interface for the job: get_unaligned() instead of
memcpy() in the insn decoder
- A randconfig build fix
* tag 'x86_misc_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/insn: Use get_unaligned() instead of memcpy()
x86/Kconfig: Fix an unused variable error in dell-smm-hwmon
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 5b7030cc5ea4..5ddfbbe5c51e 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1266,7 +1266,8 @@ config TOSHIBA config I8K tristate "Dell i8k legacy laptop support" - select HWMON + depends on HWMON + depends on PROC_FS select SENSORS_DELL_SMM help This option enables legacy /proc/i8k userspace interface in hwmon |