From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Len Brown <lenb@kernel•org>
Cc: linux-next@vger•kernel.org, Greg KH <greg@kroah•com>,
Kay Sievers <kay.sievers@vrfy•org>,
Matthew Garrett <mjg59@srcf•ucam.org>
Subject: Re: linux-next: acpi tree build failure
Date: Tue, 3 Mar 2009 12:47:17 +1100 [thread overview]
Message-ID: <20090303124717.f8a65db8.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20090224153742.08562389.sfr@canb.auug.org.au>
Hi Len,
On Tue, 24 Feb 2009 15:37:42 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> drivers/acpi/thermal.c: In function 'thermal_notify':
> drivers/acpi/thermal.c:768: error: 'struct device' has no member named 'bus_id'
>
> Caused by commit b1569e99c795bf83b4ddf41c4f1c42761ab7f75e ("ACPI: move
> thermal trip handling to generic thermal layer") interacting with commit
> d4a078fca590911cdf87a8eaffee1b6e643c2558 ("driver core: get rid of struct
> device's bus_id string array").
>
> I have dropped the acpi tree for today.
Since this hasn't bee fixed yet, I have applied the following patch as a
merge fixup. Please apply it (or something like it) to the acpi tree.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Tue, 3 Mar 2009 12:41:46 +1100
Subject: [PATCH] acpi: update thermal for bus_id removal
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/acpi/thermal.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 0ec48d2..6b95997 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -41,6 +41,7 @@
#include <linux/kmod.h>
#include <linux/seq_file.h>
#include <linux/reboot.h>
+#include <linux/device.h>
#include <asm/uaccess.h>
#include <linux/thermal.h>
#include <acpi/acpi_bus.h>
@@ -765,7 +766,7 @@ static int thermal_notify(struct thermal_zone_device *thermal, int trip,
acpi_bus_generate_proc_event(tz->device, type, 1);
acpi_bus_generate_netlink_event(tz->device->pnp.device_class,
- tz->device->dev.bus_id, type, 1);
+ dev_name(&tz->device->dev), type, 1);
if (trip_type == THERMAL_TRIP_CRITICAL && nocrt)
return 1;
--
1.6.1.3
next prev parent reply other threads:[~2009-03-03 1:47 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-24 4:37 linux-next: acpi tree build failure Stephen Rothwell
2009-03-03 1:47 ` Stephen Rothwell [this message]
2009-03-16 5:10 ` Stephen Rothwell
2009-03-27 20:58 ` Len Brown
-- strict thread matches above, loose matches on Subject: below --
2009-12-14 1:20 Stephen Rothwell
2009-12-14 19:20 ` Bjorn Helgaas
2009-12-15 4:57 ` Bjorn Helgaas
2009-12-15 22:37 ` Len Brown
2009-12-15 23:28 ` Stephen Rothwell
2009-12-16 2:28 ` Stephen Rothwell
2009-09-26 2:15 Stephen Rothwell
2009-09-26 3:11 ` Bjorn Helgaas
2009-09-27 1:27 ` Crane Cai
2009-09-27 7:54 ` Len Brown
2009-09-01 2:57 Stephen Rothwell
2009-09-07 13:46 ` Stephen Rothwell
2009-09-08 0:47 ` Zhang Rui
2009-09-09 4:02 ` Len Brown
2009-09-09 5:45 ` Stephen Rothwell
2009-06-30 3:16 Stephen Rothwell
2009-07-06 6:18 ` Stephen Rothwell
2009-07-07 3:17 ` Len Brown
2009-07-07 3:53 ` Stephen Rothwell
2009-04-24 4:46 Stephen Rothwell
2009-04-24 15:15 ` Len Brown
2009-03-18 0:57 Stephen Rothwell
2009-03-18 1:09 ` Lin Ming
2009-03-18 3:27 ` Stephen Rothwell
2009-03-27 20:49 ` Len Brown
2009-02-02 2:22 Stephen Rothwell
2009-02-05 2:13 ` Stephen Rothwell
2009-02-05 5:00 ` Greg KH
2009-02-07 4:06 ` Len Brown
2009-02-07 5:32 ` Greg KH
2008-10-15 5:08 Stephen Rothwell
2008-10-15 5:15 ` Shaohua Li
2008-10-15 4:51 Stephen Rothwell
2008-08-12 3:16 Stephen Rothwell
2008-08-12 7:06 ` Andi Kleen
2008-08-12 20:07 ` Carlos Corbacho
2008-08-12 21:29 ` Carlos Corbacho
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090303124717.f8a65db8.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=kay.sievers@vrfy$(echo .)org \
--cc=lenb@kernel$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mjg59@srcf$(echo .)ucam.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox