aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2012-10-13 22:13:46 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2012-10-13 22:13:51 +0000
commit4d42bbf35b0b68afbe16bdc950bebe2c4c1bcd96 (patch)
treedaca57dcb46f04d0aba73754c21bc8dfcab63d22
parentBug #414581: ensure built-in initramfs compress config options are set to avo... (diff)
downloadgenkernel-4d42bbf35b0b68afbe16bdc950bebe2c4c1bcd96.tar.gz
genkernel-4d42bbf35b0b68afbe16bdc950bebe2c4c1bcd96.tar.bz2
genkernel-4d42bbf35b0b68afbe16bdc950bebe2c4c1bcd96.zip
Bug #336170: amd74xx was long-replaced by pata_amd.
The old driver is problematic, as even with the pata_amd module loaded, it will not release the device. Disable the old driver on remaining platforms, add pata_amd where missing & needed (not alpha). Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-rw-r--r--ChangeLog8
-rw-r--r--arch/alpha/kernel-config2
-rw-r--r--arch/ppc/kernel-config4
-rw-r--r--arch/x86/kernel-config2
-rw-r--r--arch/x86_64/kernel-config2
-rw-r--r--defaults/kernel-config2
6 files changed, 14 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 44477b5..6204a06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,14 @@
# Distributed under the GPL v2
# $Id$
+ 13 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> arch/alpha/kernel-config,
+ arch/ppc/kernel-config, arch/x86/kernel-config, arch/x86_64/kernel-config,
+ defaults/kernel-config:
+ Bug #336170: amd74xx was long-replaced by pata_amd. The old driver is
+ problematic, as even with the pata_amd module loaded, it will not release the
+ device. Disable the old driver on remaining platforms, add pata_amd where
+ missing & needed (not alpha).
+
13 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
Bug #414581: ensure built-in initramfs compress config options are set to
avoid silentoldconfig bailing out.
diff --git a/arch/alpha/kernel-config b/arch/alpha/kernel-config
index 4c8c665..bd6cae7 100644
--- a/arch/alpha/kernel-config
+++ b/arch/alpha/kernel-config
@@ -333,7 +333,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
# CONFIG_BLK_DEV_AEC62XX is not set
CONFIG_BLK_DEV_ALI15X3=y
# CONFIG_WDC_ALI15X3 is not set
-CONFIG_BLK_DEV_AMD74XX=y
+# CONFIG_BLK_DEV_AMD74XX is not set
CONFIG_BLK_DEV_CMD64X=y
# CONFIG_BLK_DEV_TRIFLEX is not set
CONFIG_BLK_DEV_CY82C693=y
diff --git a/arch/ppc/kernel-config b/arch/ppc/kernel-config
index e1013ef..7d6d2d4 100644
--- a/arch/ppc/kernel-config
+++ b/arch/ppc/kernel-config
@@ -594,7 +594,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
CONFIG_BLK_DEV_AEC62XX=y
CONFIG_BLK_DEV_ALI15X3=y
# CONFIG_WDC_ALI15X3 is not set
-CONFIG_BLK_DEV_AMD74XX=y
+# CONFIG_BLK_DEV_AMD74XX is not set
CONFIG_BLK_DEV_CMD64X=y
CONFIG_BLK_DEV_TRIFLEX=y
CONFIG_BLK_DEV_CY82C693=y
@@ -754,7 +754,7 @@ CONFIG_SATA_VIA=m
CONFIG_SATA_VITESSE=m
# CONFIG_SATA_INIC162X is not set
# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
+CONFIG_PATA_AMD=m
# CONFIG_PATA_ARTOP is not set
# CONFIG_PATA_ATIIXP is not set
# CONFIG_PATA_CMD640_PCI is not set
diff --git a/arch/x86/kernel-config b/arch/x86/kernel-config
index 8b5adad..f461b62 100644
--- a/arch/x86/kernel-config
+++ b/arch/x86/kernel-config
@@ -1085,7 +1085,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
CONFIG_BLK_DEV_AEC62XX=y
CONFIG_BLK_DEV_ALI15X3=y
# CONFIG_WDC_ALI15X3 is not set
-CONFIG_BLK_DEV_AMD74XX=y
+# CONFIG_BLK_DEV_AMD74XX is not set
CONFIG_BLK_DEV_ATIIXP=y
CONFIG_BLK_DEV_CMD64X=y
CONFIG_BLK_DEV_TRIFLEX=y
diff --git a/arch/x86_64/kernel-config b/arch/x86_64/kernel-config
index ae006a9..c438bcf 100644
--- a/arch/x86_64/kernel-config
+++ b/arch/x86_64/kernel-config
@@ -1140,7 +1140,7 @@ CONFIG_BLK_DEV_RZ1000=y
CONFIG_BLK_DEV_IDEDMA_PCI=y
CONFIG_BLK_DEV_AEC62XX=y
CONFIG_BLK_DEV_ALI15X3=y
-CONFIG_BLK_DEV_AMD74XX=y
+# CONFIG_BLK_DEV_AMD74XX is not set
CONFIG_BLK_DEV_ATIIXP=y
CONFIG_BLK_DEV_CMD64X=y
CONFIG_BLK_DEV_TRIFLEX=y
diff --git a/defaults/kernel-config b/defaults/kernel-config
index 065d146..06751c5 100644
--- a/defaults/kernel-config
+++ b/defaults/kernel-config
@@ -1085,7 +1085,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
CONFIG_BLK_DEV_AEC62XX=y
CONFIG_BLK_DEV_ALI15X3=y
# CONFIG_WDC_ALI15X3 is not set
-CONFIG_BLK_DEV_AMD74XX=y
+# CONFIG_BLK_DEV_AMD74XX is not set
CONFIG_BLK_DEV_ATIIXP=y
CONFIG_BLK_DEV_CMD64X=y
CONFIG_BLK_DEV_TRIFLEX=y