diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-12 16:20:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-12 16:20:31 -0700 |
| commit | ced3a9eb3cd0d07462cdbaa8a0f3d46e5aaeadec (patch) | |
| tree | 9689b5ffcb4b1834f5a4abcf848ab6770f8885c0 /arch/ia64/Kconfig | |
| parent | 2646fb032f511862312ec8eb7f774aaededf310d (diff) | |
| parent | c331649e637152788b0ca1c857d0c2eaf34fcbc3 (diff) | |
Merge tag 'ia64_for_5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 updates from Tony Luck:
"Cleanups by Christoph:
- Switch to libata instead of legacy ide driver
- Drop ia64 perfmon (it's been broken for a while)"
* tag 'ia64_for_5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
ia64: Use libata instead of the legacy ide driver in defconfigs
ia64: Remove perfmon
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 9d0f1e13c918..996c410f2152 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -363,15 +363,6 @@ config ARCH_PROC_KCORE_TEXT config IA64_MCA_RECOVERY tristate "MCA recovery from errors other than TLB." -config PERFMON - bool "Performance monitor support" - depends on BROKEN - help - Selects whether support for the IA-64 performance monitor hardware - is included in the kernel. This makes some kernel data-structures a - little bigger and slows down execution a bit, but it is generally - a good idea to turn this on. If you're unsure, say Y. - config IA64_PALINFO tristate "/proc/pal support" help |