linux-kernel - linux-next: build failure after merge of the libata tree

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-next>] [day] [month] [year] [list]

Message-Id: <20120702121041.01a80802af13e2cf511fe0b6@canb.auug.org.au>
Date:	Mon, 2 Jul 2012 12:10:41 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jeff Garzik <jeff@...zik.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Lin Ming <ming.m.lin@...el.com>,
	Huang Ying <ying.huang@...el.com>,
	Bjorn Helgaas <bhelgaas@...gle.com>
Subject: linux-next: build failure after merge of the libata tree

Hi Jeff,

After merging the libata tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/ata/libata-acpi.c: In function 'ata_acpi_set_state':
drivers/ata/libata-acpi.c:872:5: error: too few arguments to function 'acpi_pm_device_sleep_state'
include/acpi/acpi_bus.h:418:5: note: declared here

Caused by commit 3bd46600a7a7 ("libata-acpi: add ata port runtime D3Cold
support") from the libata tree interacting with commit ee85f543710d
("ACPI/PM: specify lowest allowed state for device sleep state") from the
pci tree.

I added the following merge fix patch (and can carry it as necessary):

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Mon, 2 Jul 2012 12:07:25 +1000
Subject: [PATCH] libata-acpi: fix up for acpi_pm_device_sleep_state API
 change

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 drivers/ata/libata-acpi.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index 4112eaa..a2b16c9 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -869,7 +869,7 @@ void ata_acpi_set_state(struct ata_port *ap, pm_message_t state)
 
 		if (state.event != PM_EVENT_ON) {
 			acpi_state = acpi_pm_device_sleep_state(
-				&dev->sdev->sdev_gendev, NULL);
+				&dev->sdev->sdev_gendev, NULL, ACPI_STATE_D3);
 			if (acpi_state > 0)
 				acpi_bus_set_power(handle, acpi_state);
 			/* TBD: need to check if it's runtime pm request */
-- 
1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped