linux-kernel - linux-next: build failure after merge of the final tree (acpi and battery trees related)

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: <20120619145425.6f825e142856ca808927ca45@canb.auug.org.au>
Date:	Tue, 19 Jun 2012 14:54:25 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Len Brown <lenb@...nel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Durgadoss R <durgadoss.r@...el.com>,
	Jenny TC <jenny.tc@...el.com>,
	Anton Vorontsov <avorontsov@...mvista.com>
Subject: linux-next: build failure after merge of the final tree (acpi and
 battery trees related)

Hi all,

After merging the final tree, today's linux-next build (powerpc
allyesconfig, i386 defconfig) failed like this:

drivers/power/power_supply_core.c:204:6: error: too few arguments to function 'thermal_zone_device_register'

Caused by commit a9e7402dd2e4 ("ACPI-Thermal: Make Thermal trip points
writeable") from the acpi tree interacting with commit 3be330bf8860
("power_supply: Register battery as a thermal zone") from the battery
tree.

I have added the following patch and will carry it as a merge fix to the
battery tree:

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Tue, 19 Jun 2012 14:46:17 +1000
Subject: [PATCH] ACPI-Thermal: fix for an API change

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

diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
index ff990d2..85689fb 100644
--- a/drivers/power/power_supply_core.c
+++ b/drivers/power/power_supply_core.c
@@ -201,7 +201,7 @@ static int psy_register_thermal(struct power_supply *psy)
 	for (i = 0; i < psy->num_properties; i++) {
 		if (psy->properties[i] == POWER_SUPPLY_PROP_TEMP) {
 			psy->tzd = thermal_zone_device_register(psy->name, 0,
-					psy, &psy_tzd_ops, 0, 0, 0, 0);
+					0, psy, &psy_tzd_ops, 0, 0, 0, 0);
 			if (IS_ERR(psy->tzd))
 				return PTR_ERR(psy->tzd);
 			break;
-- 
1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped