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>

diff --git a/ChangeLog b/ChangeLog
index 44477b5130187e46430b77c382f0a5ffca3da19b..6204a06a9347cc9a870e06ab1dd66468c122da86 100644 (file)
--- 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 4c8c665cd662fd5653262cc537cfb8bf9662513d..bd6cae7b0cd1e1fb050136e3c0101170f54eedc9 100644 (file)
--- 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 e1013efdbc73d39b004ed6778bedc8ecad68f02e..7d6d2d42107f725e1b7cf5f4ea709325ea400493 100644 (file)
--- 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 8b5adad03d6911f6726c7f1bc6c0d8922a99250f..f461b62c6c63d18f94e3fdd2ad455c35e6c88524 100644 (file)
--- 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 ae006a937076e6bd3147907acec67420f350f4f1..c438bcfc3b71dcb107bc3c3dccafd9f7c4abc6f6 100644 (file)
--- 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 065d146c1fbfa3fa118372a0dc5126882f784ed9..06751c52388ecd36baf16933bc45a60735b0ff2f 100644 (file)
--- 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