linux-kernel - Re: [PATCH] non-existant config in kernel source (CONFIG

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20100205152635.GC7299@faui49.informatik.uni-erlangen.de>
Date:	Fri, 5 Feb 2010 16:26:35 +0100
From:	Christoph Egger <siccegge@...d.informatik.uni-erlangen.de>
To:	Frans Pop <elendil@...net.nl>
Cc:	jgarzik@...ox.com, knan-lkml@...uin.net, bzolnier@...il.com,
	linux-ide@...r.kernel.org, linux-kernel@...r.kernel.org,
	vamos@...informatik.uni-erlangen.de, alan@...rguk.ukuu.org.uk
Subject: Re: [PATCH] non-existant config in kernel source (CONFIG_AHCI)

On Fri, Feb 05, 2010 at 02:57:00PM +0100, Frans Pop wrote:
> Christoph Egger wrote:
> > --- a/drivers/ata/pata_marvell.c
> > +++ b/drivers/ata/pata_marvell.c
> > @@ -147,7 +147,7 @@ static int marvell_init_one (struct pci_dev *pdev,
> > 	if (pdev->device == 0x6101)
> >		ppi[1] = &ata_dummy_port_info;
> > 
> > -#if defined(CONFIG_AHCI) || defined(CONFIG_AHCI_MODULE)
> > +#if defined(CONFIG_SATA_AHCI) || defined(SATA_CONFIG_AHCI_MODULE)
> 
> Shouldn't the last be CONFIG_SATA_AHCI_MODULE ?

Right my fault. Updated patch below

-----
>From 60136f94d9c97f9a788738e30731e25bd794322b Mon Sep 17 00:00:00 2001
From: Christoph Egger <siccegge@...d.informatik.uni-erlangen.de>
Date: Fri, 5 Feb 2010 13:26:33 +0100
Subject: [PATCH] CONFIG_AHCI is really CONFIG_SATA_AHCI

The marvell driver comtains a fallback to ahci for the sata ports
which is incorrectly checked as CONFIG_AHCI while the only AHCI config
item is actually called SATA_AHCI (which also sounds sensible
considering it's a fallback for the sata ports).

Signed-off-by: Christoph Egger <siccegge@...d.informatik.uni-erlangen.de>
---
 drivers/ata/pata_marvell.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index 950da39..eabd138 100644
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -147,7 +147,7 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i
 	if (pdev->device == 0x6101)
 		ppi[1] = &ata_dummy_port_info;
 
-#if defined(CONFIG_AHCI) || defined(CONFIG_AHCI_MODULE)
+#if defined(CONFIG_SATA_AHCI) || defined(CONFIG_SATA_AHCI_MODULE)
 	if (!marvell_pata_active(pdev)) {
 		printk(KERN_INFO DRV_NAME ": PATA port not active, deferring to AHCI driver.\n");
 		return -ENODEV;
-- 
1.6.3.3


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/