linux-next: acpi tree build failure

linux-next: acpi tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 798 bytes --]

Hi Len,

Today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/i2c/busses/i2c-scmi.c: In function 'acpi_smbus_cmi_add':
drivers/i2c/busses/i2c-scmi.c:374: error: implicit declaration of function 'acpi_device_uid'
drivers/i2c/busses/i2c-scmi.c:374: warning: format '%s' expects type 'char *', but argument 5 has type 'int'

Caused by commit 6622d8cee73a26bce958484065c8f0e704911a62 ("ACPI: remove
acpi_device_uid() and related stuff") interacting with commit
dc9854212e0d7318d7133697906d98b78f3088b6 ("i2c: Add driver for SMBus
Control Method Interface") recently added to Linus' tree.

I have used the version of the acpi tree from next-20090925 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: acpi tree build failure

[Bjorn Helgaas]

On Sat, 2009-09-26 at 12:15 +1000, Stephen Rothwell wrote:
> Hi Len,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> drivers/i2c/busses/i2c-scmi.c: In function 'acpi_smbus_cmi_add':
> drivers/i2c/busses/i2c-scmi.c:374: error: implicit declaration of function 'acpi_device_uid'
> drivers/i2c/busses/i2c-scmi.c:374: warning: format '%s' expects type 'char *', but argument 5 has type 'int'
> 
> Caused by commit 6622d8cee73a26bce958484065c8f0e704911a62 ("ACPI: remove
> acpi_device_uid() and related stuff") interacting with commit
> dc9854212e0d7318d7133697906d98b78f3088b6 ("i2c: Add driver for SMBus
> Control Method Interface") recently added to Linus' tree.
> 
> I have used the version of the acpi tree from next-20090925 for today.

I think we should use the following patch to remove the usage of
acpi_device_uid().  Crane, do you agree, or is there some special
reason you need it here?



i2c-scmi: don't use acpi_device_uid()
    
We recently removed the acpi_device_uid() interface because nobody
used it.  I don't think it's essential here either.
    
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>

diff --git a/drivers/i2c/busses/i2c-scmi.c b/drivers/i2c/busses/i2c-scmi.c
index 276a046..b4a55d4 100644
--- a/drivers/i2c/busses/i2c-scmi.c
+++ b/drivers/i2c/busses/i2c-scmi.c
@@ -369,9 +369,8 @@ static int acpi_smbus_cmi_add(struct acpi_device *device)
 		goto err;
 
 	snprintf(smbus_cmi->adapter.name, sizeof(smbus_cmi->adapter.name),
-		"SMBus CMI adapter %s (%s)",
-		acpi_device_name(device),
-		acpi_device_uid(device));
+		"SMBus CMI adapter %s",
+		acpi_device_name(device));
 	smbus_cmi->adapter.owner = THIS_MODULE;
 	smbus_cmi->adapter.algo = &acpi_smbus_cmi_algorithm;
 	smbus_cmi->adapter.algo_data = smbus_cmi;

Re: linux-next: acpi tree build failure

[Crane Cai]

Hi Bjorn,

On Fri, Sep 25, 2009 at 09:11:43PM -0600, Bjorn Helgaas wrote:
> On Sat, 2009-09-26 at 12:15 +1000, Stephen Rothwell wrote:
> > Hi Len,
> > 
> > Today's linux-next build (x86_64 allmodconfig) failed like this:
> > 
> > drivers/i2c/busses/i2c-scmi.c: In function 'acpi_smbus_cmi_add':
> > drivers/i2c/busses/i2c-scmi.c:374: error: implicit declaration of function 'acpi_device_uid'
> > drivers/i2c/busses/i2c-scmi.c:374: warning: format '%s' expects type 'char *', but argument 5 has type 'int'
> > 
> > Caused by commit 6622d8cee73a26bce958484065c8f0e704911a62 ("ACPI: remove
> > acpi_device_uid() and related stuff") interacting with commit
> > dc9854212e0d7318d7133697906d98b78f3088b6 ("i2c: Add driver for SMBus
> > Control Method Interface") recently added to Linus' tree.
> > 
> > I have used the version of the acpi tree from next-20090925 for today.
> 
> I think we should use the following patch to remove the usage of
> acpi_device_uid().  Crane, do you agree, or is there some special
> reason you need it here?
I agree.
> 
> 
> 

-- 
Best Regards,
- Crane

Re: linux-next: acpi tree build failure

[Len Brown]

> > > drivers/i2c/busses/i2c-scmi.c: In function 'acpi_smbus_cmi_add':
> > > drivers/i2c/busses/i2c-scmi.c:374: error: implicit declaration of function 'acpi_device_uid'
> > > drivers/i2c/busses/i2c-scmi.c:374: warning: format '%s' expects type 'char *', but argument 5 has type 'int'
> > > 
> > > Caused by commit 6622d8cee73a26bce958484065c8f0e704911a62 ("ACPI: remove
> > > acpi_device_uid() and related stuff") interacting with commit
> > > dc9854212e0d7318d7133697906d98b78f3088b6 ("i2c: Add driver for SMBus
> > > Control Method Interface") recently added to Linus' tree.
> > > 
> > > I have used the version of the acpi tree from next-20090925 for today.
> > 
> > I think we should use the following patch to remove the usage of
> > acpi_device_uid().  Crane, do you agree, or is there some special
> > reason you need it here?

> I agree.

Thanks Crane, upstream now includes Bjorn's patch.

-Len Brown, Intel Open Source Technology Center

Re: linux-next: acpi tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 337 bytes --]

Hi Len,

On Tue, 15 Dec 2009 17:37:21 -0500 (EST) Len Brown <lenb@kernel.org> wrote:
>
> i merged bjorn's fix into the original offending patch in acpi-test

That didn't seem to be in what I fetched for linux-next today.

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

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: acpi tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 289 bytes --]

Hi Len, Bjorn,

On Tue, 15 Dec 2009 17:37:21 -0500 (EST) Len Brown <lenb@kernel.org> wrote:
>
> i merged bjorn's fix into the original offending patch in acpi-test

Thanks.

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

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: acpi tree build failure

[Len Brown]

i merged bjorn's fix into the original offending patch in acpi-test

thanks,
Len Brown, Intel Open Source Technology Center

Re: linux-next: acpi tree build failure

[Bjorn Helgaas]

On Mon, 2009-12-14 at 12:20 +1100, Stephen Rothwell wrote:
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> ERROR: "pnpacpi_protocol" [drivers/char/ipmi/ipmi_si.ko] undefined!
> 
> Caused by commit e80b594fd69039387339e75b4f75c58da74676ae ("PNP: add
> interface to retrieve ACPI device from a PNPACPI device").

Here's the fix:

commit 28b07e816ecc25567c8ff25e5a0c52f57e55b91f
Author: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date:   Mon Dec 14 21:41:17 2009 -0700

    PNP: export pnpacpi_protocol (for pnp_acpi_device() test)
    
    In e80b594f, I added an exported interface, pnp_acpi_device(), but
    I neglected to export the underlying pnpacpi_protocol symbol.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>

diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 8dd0f37..5314bf6 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -154,6 +154,7 @@ struct pnp_protocol pnpacpi_protocol = {
 	.resume = pnpacpi_resume,
 #endif
 };
+EXPORT_SYMBOL(pnpacpi_protocol);
 
 static int __init pnpacpi_add_device(struct acpi_device *device)
 {

Re: linux-next: acpi tree build failure

[Bjorn Helgaas]

On Sunday 13 December 2009 06:20:13 pm Stephen Rothwell wrote:
> Hi Len,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> ERROR: "pnpacpi_protocol" [drivers/char/ipmi/ipmi_si.ko] undefined!
> 
> Caused by commit e80b594fd69039387339e75b4f75c58da74676ae ("PNP: add
> interface to retrieve ACPI device from a PNPACPI device").
> 
> I have used the acpi tree form next-20091211 for today.

I will look at this ASAP, but I'm stuck in a required class all day
today, so I can't do anything until tonight.

Bjorn

linux-next: acpi tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 448 bytes --]

Hi Len,

Today's linux-next build (x86_64 allmodconfig) failed like this:

ERROR: "pnpacpi_protocol" [drivers/char/ipmi/ipmi_si.ko] undefined!

Caused by commit e80b594fd69039387339e75b4f75c58da74676ae ("PNP: add
interface to retrieve ACPI device from a PNPACPI device").

I have used the acpi tree form next-20091211 for today.

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

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: acpi tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 406 bytes --]

Hi Len,

On Wed, 09 Sep 2009 00:02:03 -0400 (EDT) Len Brown <lenb@kernel.org> wrote:
>
> > please revert the two ALS patches.
> 
> done.
> 
> Sorry about the merge-conflict and build error, Stephen.
> You can update to the latest acpi-test tree now.

Thanks, I will pick it up tomorrow.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: acpi tree build failure

[Len Brown]

> please revert the two ALS patches.

done.

Sorry about the merge-conflict and build error, Stephen.
You can update to the latest acpi-test tree now.

thanks,
-Len Brown, Intel Open Source Technology Center

Re: linux-next: acpi tree build failure

[Zhang Rui]

len,

please revert the two ALS patches.

thanks,
rui

On Mon, 2009-09-07 at 21:46 +0800, Stephen Rothwell wrote:
> Hi Len,
> 
> On Tue, 1 Sep 2009 12:57:48 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next build (x86_64 allmodconfig) failed like this:
> > 
> > drivers/acpi/als.c: In function 'acpi_als_get_mappings':
> > drivers/acpi/als.c:173: error: expected ')' before 'PREFIX'
> > drivers/acpi/als.c: In function 'acpi_als_add':
> > drivers/acpi/als.c:347: error: expected ')' before 'PREFIX'
> > 
> > I have used the version of the acpi tree from next-20090831 for today.
> 
> This is still there ...

Re: linux-next: acpi tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 617 bytes --]

Hi Len,

On Tue, 1 Sep 2009 12:57:48 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> drivers/acpi/als.c: In function 'acpi_als_get_mappings':
> drivers/acpi/als.c:173: error: expected ')' before 'PREFIX'
> drivers/acpi/als.c: In function 'acpi_als_add':
> drivers/acpi/als.c:347: error: expected ')' before 'PREFIX'
> 
> I have used the version of the acpi tree from next-20090831 for today.

This is still there ...
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: acpi tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 489 bytes --]

Hi Len,

Today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/acpi/als.c: In function 'acpi_als_get_mappings':
drivers/acpi/als.c:173: error: expected ')' before 'PREFIX'
drivers/acpi/als.c: In function 'acpi_als_add':
drivers/acpi/als.c:347: error: expected ')' before 'PREFIX'

I have used the version of the acpi tree from next-20090831 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: acpi tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 350 bytes --]

Hi Len,

On Mon, 06 Jul 2009 23:17:29 -0400 (EDT) Len Brown <lenb@kernel.org> wrote:
>
> This was an obsolete patch in the acpi-test tree.
> it should be better now.   Thanks for working around it.

Thanks, I'll pick it up tomorrow.

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

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: acpi tree build failure

[Len Brown]

On Tue, 30 Jun 2009, Stephen Rothwell wrote:

> Hi Len,
> 
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
>   GEN     /scratch/sfr/powerpc_ppc64_defconfig/Makefile
> drivers/platform/x86/Kconfig:353:error: found recursive dependency: EEEPC_LAPTOP -> HOTPLUG_PCI -> EEEPC_LAPTOP
> 
> Caused by commit 6af05c22969dce2776375953131b56e9f4282848 ("eeepc-laptop:
> Register as a pci-hotplug device") interacting with commit
> 44b3615b8cb3b016a49eb7ef4236e77a77793cec ("eeepc-laptop: Fix build
> failure with HOTPLUG_PCI && !SYSFS") from Linus' tree.  Commit 6af05c2
> from the acpi tree is the same as commit
> 2b121bc262fa03c94e653b2d44356c2f86c1bcdc in Linus' tree that 44b3615b is
> fixing, so I have reverted the drivers/platform/x86/Kconfig part of
> 6af05c2 for today.

Sorry I broke your build, Stephen.

This was an obsolete patch in the acpi-test tree.
it should be better now.   Thanks for working around it.

Len Brown, Intel Open Source Technology Center

Re: linux-next: acpi tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 987 bytes --]

Hi Len,

On Tue, 30 Jun 2009 13:16:45 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
>   GEN     /scratch/sfr/powerpc_ppc64_defconfig/Makefile
> drivers/platform/x86/Kconfig:353:error: found recursive dependency: EEEPC_LAPTOP -> HOTPLUG_PCI -> EEEPC_LAPTOP
> 
> Caused by commit 6af05c22969dce2776375953131b56e9f4282848 ("eeepc-laptop:
> Register as a pci-hotplug device") interacting with commit
> 44b3615b8cb3b016a49eb7ef4236e77a77793cec ("eeepc-laptop: Fix build
> failure with HOTPLUG_PCI && !SYSFS") from Linus' tree.  Commit 6af05c2
> from the acpi tree is the same as commit
> 2b121bc262fa03c94e653b2d44356c2f86c1bcdc in Linus' tree that 44b3615b is
> fixing, so I have reverted the drivers/platform/x86/Kconfig part of
> 6af05c2 for today.

This is still happening ...

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

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: acpi tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 844 bytes --]

Hi Len,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

  GEN     /scratch/sfr/powerpc_ppc64_defconfig/Makefile
drivers/platform/x86/Kconfig:353:error: found recursive dependency: EEEPC_LAPTOP -> HOTPLUG_PCI -> EEEPC_LAPTOP

Caused by commit 6af05c22969dce2776375953131b56e9f4282848 ("eeepc-laptop:
Register as a pci-hotplug device") interacting with commit
44b3615b8cb3b016a49eb7ef4236e77a77793cec ("eeepc-laptop: Fix build
failure with HOTPLUG_PCI && !SYSFS") from Linus' tree.  Commit 6af05c2
from the acpi tree is the same as commit
2b121bc262fa03c94e653b2d44356c2f86c1bcdc in Linus' tree that 44b3615b is
fixing, so I have reverted the drivers/platform/x86/Kconfig part of
6af05c2 for today.

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

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: acpi tree build failure

[Len Brown]

On Fri, 24 Apr 2009, Stephen Rothwell wrote:

> Hi Len,
> 
> Today's linux-next build (i386 defconfig) failed like this:
> 
> drivers/built-in.o: In function `acpi_video_bus_put_devices':
> video.c:(.text+0x34319): undefined reference to `video_output_unregister'
> drivers/built-in.o: In function `acpi_video_bus_add':
> video.c:(.text+0x35995): undefined reference to `video_output_register'
> 
> Probably caused by commit 4b10fee2ec45eae912c2c81730f4eee82e61a247
> ("ACPI/i915: build fix").


> I reverted that commit for today.

Yes, i reverted it too.

thanks Stephen,
Len Brown, Intel Open Source Technolgy Center

linux-next: acpi tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 581 bytes --]

Hi Len,

Today's linux-next build (i386 defconfig) failed like this:

drivers/built-in.o: In function `acpi_video_bus_put_devices':
video.c:(.text+0x34319): undefined reference to `video_output_unregister'
drivers/built-in.o: In function `acpi_video_bus_add':
video.c:(.text+0x35995): undefined reference to `video_output_register'

Probably caused by commit 4b10fee2ec45eae912c2c81730f4eee82e61a247
("ACPI/i915: build fix").

I reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: acpi tree build failure

[Len Brown]

applied.

Thanks Stephen.

--
Len Brown, Intel Open Source Technology Center

On Tue, 3 Mar 2009, Stephen Rothwell wrote:

> 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
> 

Re: linux-next: acpi tree build failure

[Len Brown]

applied.
thanks,
Len Brown, Intel Open Source Technology Center

Re: linux-next: acpi tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 573 bytes --]

Hi Lin,

On Wed, 18 Mar 2009 09:09:01 +0800 Lin Ming <ming.m.lin@intel.com> wrote:
>
> Please try below patch,
> 
> 
>     ACPI: cpufreq: use new bit register access function
>     
>     Signed-off-by: Lin Ming <ming.m.lin@intel.com>

That fixes the build problem - I tested it on top of just today's acpi
test branch (which is what goes into linux-next).  I don't have the
hardware ...

Compile-tested-by: Stephen Rothwell <sfr@canb.auug.org.au>

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

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: acpi tree build failure

[Lin Ming]

On Wed, 2009-03-18 at 08:57 +0800, Stephen Rothwell wrote:
> Hi Len,
> 
> Today's (and several previous day's) linux-next build (i386 allmodconfig)
> failed like this:
> 
> arch/x86/kernel/cpu/cpufreq/longhaul.c: In function 'longhaul_setstate':
> arch/x86/kernel/cpu/cpufreq/longhaul.c:308: error: implicit declaration of function 'acpi_set_register'

Please try below patch,


    ACPI: cpufreq: use new bit register access function
    
    Signed-off-by: Lin Ming <ming.m.lin@intel.com>
---
 arch/x86/kernel/cpu/cpufreq/longhaul.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/cpu/cpufreq/longhaul.c b/arch/x86/kernel/cpu/cpufreq/longhaul.c
index a4cff5d..4e18d51 100644
--- a/arch/x86/kernel/cpu/cpufreq/longhaul.c
+++ b/arch/x86/kernel/cpu/cpufreq/longhaul.c
@@ -303,7 +303,7 @@ retry_loop:
 		outb(3, 0x22);
 	} else if ((pr != NULL) && pr->flags.bm_control) {
 		/* Disable bus master arbitration */
-		acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1);
+		acpi_write_bit_register(ACPI_BITREG_ARB_DISABLE, 1);
 	}
 	switch (longhaul_version) {
 
@@ -326,7 +326,7 @@ retry_loop:
 	case TYPE_POWERSAVER:
 		if (longhaul_flags & USE_ACPI_C3) {
 			/* Don't allow wakeup */
-			acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0);
+			acpi_write_bit_register(ACPI_BITREG_BUS_MASTER_RLD, 0);
 			do_powersaver(cx->address, clock_ratio_index, dir);
 		} else {
 			do_powersaver(0, clock_ratio_index, dir);
@@ -339,7 +339,7 @@ retry_loop:
 		outb(0, 0x22);
 	} else if ((pr != NULL) && pr->flags.bm_control) {
 		/* Enable bus master arbitration */
-		acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0);
+		acpi_write_bit_register(ACPI_BITREG_ARB_DISABLE, 0);
 	}
 	outb(pic2_mask,0xA1);	/* restore mask */
 	outb(pic1_mask,0x21);


> 
> (http://kisskb.ellerman.id.au/kisskb/target/421/)
> 
> Caused by commit e2f34512879026beb26827c14b1d1e67c07f2858 ("ACPICA:
> Rename ACPI bit register access functions").
> 

linux-next: acpi tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 565 bytes --]

Hi Len,

Today's (and several previous day's) linux-next build (i386 allmodconfig)
failed like this:

arch/x86/kernel/cpu/cpufreq/longhaul.c: In function 'longhaul_setstate':
arch/x86/kernel/cpu/cpufreq/longhaul.c:308: error: implicit declaration of function 'acpi_set_register'

(http://kisskb.ellerman.id.au/kisskb/target/421/)

Caused by commit e2f34512879026beb26827c14b1d1e67c07f2858 ("ACPICA:
Rename ACPI bit register access functions").

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

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: acpi tree build failure

[Stephen Rothwell]

Hi Len,

On Tue, 3 Mar 2009 12:47:17 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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.

Can something be done about this, please?  The last change I have in the
acpi tree in linux-next is from Feb 26.

> 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

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

Re: linux-next: acpi tree build failure

[Stephen Rothwell]

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

linux-next: acpi tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 547 bytes --]

Hi Len,

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.

--
Cheers,
Stephen Rothwell

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: acpi tree build failure

[Greg KH]

On Fri, Feb 06, 2009 at 11:06:28PM -0500, Len Brown wrote:
> 
> On Wed, 4 Feb 2009, Greg KH wrote:
> 
> > On Thu, Feb 05, 2009 at 01:13:40PM +1100, Stephen Rothwell wrote:
> > > Greg, Len,
> > > 
> > > On Mon, 2 Feb 2009 13:22:54 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > >
> > > > drivers/platform/x86/oqo-wmi.c: In function 'oqo_kine_init':
> > > > drivers/platform/x86/oqo-wmi.c:595: error: 'struct device' has no member named 'bus_id'
> > > > 
> > > > Caused by commit 03919980ad590ad5c5c181d1bd7d58513ad170bc ("platform/x86:
> > > > Add oqo-wmi driver for model 2 OQO backlight and rfkill control")
> > > > interacting with commit c44c8304353aa6da82cbf98040c6a9c254e68e1c ("driver
> > > > core: get rid of struct device's bus_id string array") from the
> > > > driver-core tree.
> > > 
> > > Still getting this (of course).  Can you guys come up with a fix, please?
> > 
> > Len, you have the patch from Kay, what do you want to do with it?
> 
> I don't recall a patch from Kay specifically for OQO.
> OQO is sitting in my tree to get exposure while it waits for
> a few updates from Matthew.

Ah, sorry, I was confused with the other acpi bus_id patch.

> I think it can be restored with this 1 liner, which I can apply to it.

Yes, your patch looks fine.

thanks,

greg k-h

Re: linux-next: acpi tree build failure

[Len Brown]

On Wed, 4 Feb 2009, Greg KH wrote:

> On Thu, Feb 05, 2009 at 01:13:40PM +1100, Stephen Rothwell wrote:
> > Greg, Len,
> > 
> > On Mon, 2 Feb 2009 13:22:54 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > drivers/platform/x86/oqo-wmi.c: In function 'oqo_kine_init':
> > > drivers/platform/x86/oqo-wmi.c:595: error: 'struct device' has no member named 'bus_id'
> > > 
> > > Caused by commit 03919980ad590ad5c5c181d1bd7d58513ad170bc ("platform/x86:
> > > Add oqo-wmi driver for model 2 OQO backlight and rfkill control")
> > > interacting with commit c44c8304353aa6da82cbf98040c6a9c254e68e1c ("driver
> > > core: get rid of struct device's bus_id string array") from the
> > > driver-core tree.
> > 
> > Still getting this (of course).  Can you guys come up with a fix, please?
> 
> Len, you have the patch from Kay, what do you want to do with it?

I don't recall a patch from Kay specifically for OQO.
OQO is sitting in my tree to get exposure while it waits for
a few updates from Matthew.

I think it can be restored with this 1 liner, which I can apply to it.

thanks,
Len Brown, Intel Open Source Technology Center


diff --git a/drivers/platform/x86/oqo-wmi.c b/drivers/platform/x86/oqo-wmi.c
index 940e605..0a88af8 100644
--- a/drivers/platform/x86/oqo-wmi.c
+++ b/drivers/platform/x86/oqo-wmi.c
@@ -592,7 +592,7 @@ static int __devinit oqo_kine_init(void)
 	    oqo_kine->absmax[ABS_Y] =
 	    oqo_kine->absmax[ABS_Z] = oqo_kine->absmax[ABS_MISC] = 32767;
 
-	memcpy(oqo_kine->dev.bus_id, "kine", 4);
+	dev_set_name(&oqo_kine->dev, "kine");
 
 	oqo_kine_polled = input_allocate_polled_device();
 	if (!oqo_kine_polled) {

Re: linux-next: acpi tree build failure

[Greg KH]

On Thu, Feb 05, 2009 at 01:13:40PM +1100, Stephen Rothwell wrote:
> Greg, Len,
> 
> On Mon, 2 Feb 2009 13:22:54 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > drivers/platform/x86/oqo-wmi.c: In function 'oqo_kine_init':
> > drivers/platform/x86/oqo-wmi.c:595: error: 'struct device' has no member named 'bus_id'
> > 
> > Caused by commit 03919980ad590ad5c5c181d1bd7d58513ad170bc ("platform/x86:
> > Add oqo-wmi driver for model 2 OQO backlight and rfkill control")
> > interacting with commit c44c8304353aa6da82cbf98040c6a9c254e68e1c ("driver
> > core: get rid of struct device's bus_id string array") from the
> > driver-core tree.
> 
> Still getting this (of course).  Can you guys come up with a fix, please?

Len, you have the patch from Kay, what do you want to do with it?

thanks,

greg k-h

Re: linux-next: acpi tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 755 bytes --]

Greg, Len,

On Mon, 2 Feb 2009 13:22:54 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> drivers/platform/x86/oqo-wmi.c: In function 'oqo_kine_init':
> drivers/platform/x86/oqo-wmi.c:595: error: 'struct device' has no member named 'bus_id'
> 
> Caused by commit 03919980ad590ad5c5c181d1bd7d58513ad170bc ("platform/x86:
> Add oqo-wmi driver for model 2 OQO backlight and rfkill control")
> interacting with commit c44c8304353aa6da82cbf98040c6a9c254e68e1c ("driver
> core: get rid of struct device's bus_id string array") from the
> driver-core tree.

Still getting this (of course).  Can you guys come up with a fix, please?

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

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: acpi tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 755 bytes --]

Hi Len,

Today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/platform/x86/oqo-wmi.c: In function 'oqo_kine_init':
drivers/platform/x86/oqo-wmi.c:595: error: 'struct device' has no member named 'bus_id'

Caused by commit 03919980ad590ad5c5c181d1bd7d58513ad170bc ("platform/x86:
Add oqo-wmi driver for model 2 OQO backlight and rfkill control")
interacting with commit c44c8304353aa6da82cbf98040c6a9c254e68e1c ("driver
core: get rid of struct device's bus_id string array") from the
driver-core tree.

I have reverted the acpi tree commit above for today.  Please convert its
usage of bus_id to dev_set_name().

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

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: acpi tree build failure

[Shaohua Li]

On Wed, Oct 15, 2008 at 01:08:37PM +0800, Stephen Rothwell wrote:
> Hi Len,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> ERROR: "acpi_os_hotplug_execute" [drivers/acpi/dock.ko] undefined!
> 
> Caused by commit 19cd847ab24fefe9e50101ec94479e0400a08650 ("ACPI: fix
> hotplug race").  I added the patch below.
We need make dock driver not a module.

Len,
please check your mail box, I had sent the patch (make dock driver built-int) to you before.

Thanks,
Shaohua

linux-next: acpi tree build failure

[Stephen Rothwell]

Hi Len,

Today's linux-next build (x86_64 allmodconfig) failed like this:

ERROR: "acpi_os_hotplug_execute" [drivers/acpi/dock.ko] undefined!

Caused by commit 19cd847ab24fefe9e50101ec94479e0400a08650 ("ACPI: fix
hotplug race").  I added the patch below.

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

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 15 Oct 2008 16:07:16 +1100
Subject: [PATCH] acpi: acpi_os_hotplug_execute needs to be exported

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/acpi/osl.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index d65862b..a384155 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -772,6 +772,7 @@ acpi_status acpi_os_hotplug_execute(acpi_osd_exec_callback function,
 {
 	return __acpi_os_execute(0, function, context, 1);
 }
+EXPORT_SYMBOL(acpi_os_hotplug_execute);
 
 void acpi_os_wait_events_complete(void *context)
 {
-- 
1.5.6.5

linux-next: acpi tree build failure

[Stephen Rothwell]

Hi Len,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

scripts/Makefile.build:41: drivers/idle/Makefile: No such file or directory
make[3]: *** No rule to make target `drivers/idle/Makefile'.

Caused by commit e8b529091b2ab65f5a4783e292c2b472e309116e ("i7300_idle
driver v1.55").  I added the patch below.

I suspect that some patch was missed ...
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 15 Oct 2008 15:32:35 +1100
Subject: [PATCH] drivers has no idle subdirectory

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/x86/Kconfig |    2 --
 drivers/Makefile |    1 -
 2 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 5eb231a..8dbd14c 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1686,8 +1686,6 @@ source "arch/x86/kernel/cpu/cpufreq/Kconfig"
 
 source "drivers/cpuidle/Kconfig"
 
-source "drivers/idle/Kconfig"
-
 endmenu
 
 
diff --git a/drivers/Makefile b/drivers/Makefile
index f443a8a..2735bde 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -82,7 +82,6 @@ obj-$(CONFIG_EISA)		+= eisa/
 obj-y				+= lguest/
 obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
 obj-$(CONFIG_CPU_IDLE)		+= cpuidle/
-obj-y				+= idle/
 obj-$(CONFIG_MMC)		+= mmc/
 obj-$(CONFIG_MEMSTICK)		+= memstick/
 obj-$(CONFIG_NEW_LEDS)		+= leds/
-- 
1.5.6.5

Re: linux-next: acpi tree build failure

[Carlos Corbacho]

On Tuesday 12 August 2008 04:16:13 Stephen Rothwell wrote:
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

If needed:

Acked-by: Carlos Corbacho <carlos@strangeworlds.co.uk>

Although would it be possible to revert the original patch and take my second
patch with the fix in, rather than applying this patch on top, as I still
want the patch to go into stable?

-Carlos
-- 
E-Mail: carlos@strangeworlds.co.uk
Web: strangeworlds.co.uk
GPG Key ID: 0x23EE722D

Re: linux-next: acpi tree build failure

[Carlos Corbacho]

On Tuesday 12 August 2008 08:06:58 Andi Kleen wrote:
> > Clearly, this hasn't even been build tested.  A bit more care, please.
>
> It has, but the ACER_WMI option got disabled for unknown reasons in the
> test builds :/
>
> Thanks, will fix.
>
> -Andi

Looks like my config was screwed up as well. Here's a fixed version of the patch.

-Carlos
---

acer-wmi: Fix wireless and bluetooth on early AMW0 v2 laptops

From: Carlos Corbacho <carlos@strangeworlds.co.uk>

In the old acer_acpi, I discovered that on some of the newer AMW0 laptops
that supported the WMID methods, they don't work properly for setting the
wireless and bluetooth values.

So for the AMW0 V2 laptops, we want to use both the 'old' AMW0 and the
'new' WMID methods for setting wireless & bluetooth to guarantee we always
enable it.

This was fixed in acer_acpi some time ago, but I forgot to port the patch
over to acer-wmi when it was merged.

(Without this patch, early AMW0 V2 laptops such as the Aspire 5040 won't
work with acer-wmi, where-as they did with the old acer_acpi).

v2: Fix compile error

Signed-off-by: Carlos Corbacho <carlos@strangeworlds.co.uk>
CC: stable@kernel.org
---

 drivers/misc/acer-wmi.c |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)


diff --git a/drivers/misc/acer-wmi.c b/drivers/misc/acer-wmi.c
index e7a3fe5..b2d9878 100644
--- a/drivers/misc/acer-wmi.c
+++ b/drivers/misc/acer-wmi.c
@@ -803,11 +803,30 @@ static acpi_status get_u32(u32 *value, u32 cap)
 
 static acpi_status set_u32(u32 value, u32 cap)
 {
+	acpi_status status;
+
 	if (interface->capability & cap) {
 		switch (interface->type) {
 		case ACER_AMW0:
 			return AMW0_set_u32(value, cap, interface);
 		case ACER_AMW0_V2:
+			if (cap == ACER_CAP_MAILLED)
+				return AMW0_set_u32(value, cap, interface);
+
+			/*
+			 * On some models, some WMID methods don't toggle
+			 * properly. For those cases, we want to run the AMW0
+			 * method afterwards to be certain we've really toggled
+			 * the device state.
+			 */
+			if (cap == ACER_CAP_WIRELESS ||
+				cap == ACER_CAP_BLUETOOTH) {
+				status = WMID_set_u32(value, cap, interface);
+				if (ACPI_FAILURE(status))
+					return status;
+
+				return AMW0_set_u32(value, cap, interface);
+			}
 		case ACER_WMID:
 			return WMID_set_u32(value, cap, interface);
 		default:

Re: linux-next: acpi tree build failure

[Andi Kleen]

On Tue, Aug 12, 2008 at 01:16:13PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> drivers/misc/acer-wmi.c: In function 'set_u32':
> drivers/misc/acer-wmi.c:831: error: 'status' undeclared (first use in this function)
> 
> Caused by commit 70ea586cc54ab2fb2af42d7ee97ba4f26e315f45 ("acer-wmi: Fix
> wireless and bluetooth on early AMW0 v2 laptops").
> 
> Clearly, this hasn't even been build tested.  A bit more care, please.

It has, but the ACER_WMI option got disabled for unknown reasons in the
test builds :/

Thanks, will fix.

-Andi

linux-next: acpi tree build failure

[Stephen Rothwell]

Hi all,

Today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/misc/acer-wmi.c: In function 'set_u32':
drivers/misc/acer-wmi.c:831: error: 'status' undeclared (first use in this function)

Caused by commit 70ea586cc54ab2fb2af42d7ee97ba4f26e315f45 ("acer-wmi: Fix
wireless and bluetooth on early AMW0 v2 laptops").

Clearly, this hasn't even been build tested.  A bit more care, please.

I applied the following patch.
-- 
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, 12 Aug 2008 13:10:47 +1000
Subject: [PATCH] acpi: missing status declaration in acer-wmi.c

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/misc/acer-wmi.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/misc/acer-wmi.c b/drivers/misc/acer-wmi.c
index 894990f..6df52e8 100644
--- a/drivers/misc/acer-wmi.c
+++ b/drivers/misc/acer-wmi.c
@@ -812,6 +812,8 @@ static acpi_status get_u32(u32 *value, u32 cap)
 
 static acpi_status set_u32(u32 value, u32 cap)
 {
+	acpi_status status;
+
 	if (interface->capability & cap) {
 		switch (interface->type) {
 		case ACER_AMW0:
-- 
1.5.6.3