Commit ced3a9eb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2646fb03 c331649e

arch/ia64/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -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

arch/ia64/configs/bigsur_defconfig

+3 −5
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ CONFIG_SMP=y 
CONFIG_NR_CPUS=2

CONFIG_PREEMPT=y

# CONFIG_VIRTUAL_MEM_MAP is not set

CONFIG_PERFMON=y

CONFIG_IA64_PALINFO=y

CONFIG_EFI_VARS=y

CONFIG_BINFMT_MISC=m
@@ -27,10 +26,9 @@ CONFIG_BLK_DEV_LOOP=m 
CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=m

CONFIG_IDE=m

CONFIG_BLK_DEV_IDECD=m

CONFIG_BLK_DEV_GENERIC=m

CONFIG_BLK_DEV_PIIX=m

CONFIG_ATA=m

CONFIG_ATA_GENERIC=m

CONFIG_ATA_PIIX=m

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_SCSI_CONSTANTS=y

arch/ia64/configs/generic_defconfig

+4 −6
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ CONFIG_IA64_CYCLONE=y 
CONFIG_SMP=y

CONFIG_HOTPLUG_CPU=y

CONFIG_IA64_MCA_RECOVERY=y

CONFIG_PERFMON=y

CONFIG_IA64_PALINFO=y

CONFIG_KEXEC=y

CONFIG_CRASH_DUMP=y
@@ -45,11 +44,10 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m 
CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_SGI_XP=m

CONFIG_IDE=y

CONFIG_BLK_DEV_IDECD=y

CONFIG_BLK_DEV_GENERIC=y

CONFIG_BLK_DEV_CMD64X=y

CONFIG_BLK_DEV_PIIX=y

CONFIG_ATA=y

CONFIG_ATA_GENERIC=y

CONFIG_PATA_CMD64X=y

CONFIG_ATA_PIIX=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=m

CONFIG_BLK_DEV_SR=m

arch/ia64/configs/gensparse_defconfig

+4 −6
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ CONFIG_NR_CPUS=512 
CONFIG_HOTPLUG_CPU=y

CONFIG_SPARSEMEM_MANUAL=y

CONFIG_IA64_MCA_RECOVERY=y

CONFIG_PERFMON=y

CONFIG_IA64_PALINFO=y

CONFIG_EFI_VARS=y

CONFIG_BINFMT_MISC=m
@@ -36,12 +35,11 @@ CONFIG_BLK_DEV_LOOP=m 
CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_IDE=y

CONFIG_ATA=y

CONFIG_BLK_DEV_IDECD=y

CONFIG_IDE_GENERIC=y

CONFIG_BLK_DEV_GENERIC=y

CONFIG_BLK_DEV_CMD64X=y

CONFIG_BLK_DEV_PIIX=y

CONFIG_ATA_GENERIC=y

CONFIG_PATA_CMD64X=y

CONFIG_ATA_PIIX=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=m

arch/ia64/configs/tiger_defconfig

+4 −6
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ CONFIG_HOTPLUG_CPU=y 
CONFIG_PERMIT_BSP_REMOVE=y

CONFIG_FORCE_CPEI_RETARGET=y

CONFIG_IA64_MCA_RECOVERY=y

CONFIG_PERFMON=y

CONFIG_IA64_PALINFO=y

CONFIG_KEXEC=y

CONFIG_EFI_VARS=y
@@ -41,11 +40,10 @@ CONFIG_BLK_DEV_LOOP=m 
CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_IDE=y

CONFIG_BLK_DEV_IDECD=y

CONFIG_BLK_DEV_GENERIC=y

CONFIG_BLK_DEV_CMD64X=y

CONFIG_BLK_DEV_PIIX=y

CONFIG_ATA=y

CONFIG_ATA_GENERIC=y

CONFIG_PATA_CMD64X=y

CONFIG_ATA_PIIX=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=m

CRA Git | Maintained and supported by SUSTech CRA and CCSE