2011-02-22 05:22:14

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build failure after merge of the drivers-x86 tree

Hi Matthew,

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

drivers/platform/x86/sony-laptop.c: In function 'sony_nc_handles_setup':
drivers/platform/x86/sony-laptop.c:772: error: invalid type argument of '->' (have 'struct device_attribute')
drivers/platform/x86/sony-laptop.c: In function 'sony_nc_kbd_backlight_setup':
drivers/platform/x86/sony-laptop.c:1462: error: invalid type argument of '->' (have 'struct device_attribute')
drivers/platform/x86/sony-laptop.c:1468: error: invalid type argument of '->' (have 'struct device_attribute')

Caused by commit 73dd0f8d0f1f5ac19b56f343cfcf5876b31e699f ("sony-laptop:
cache handles and report them via sysfs").

Please build this stuff *before* putting it into linux-next.

I have used the drivers-x86 tree from next-20110221 for today.

--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/


Attachments:
(No filename) (946.00 B)
(No filename) (490.00 B)
Download all attachments

2011-02-22 06:35:17

by Mattia Dongili

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the drivers-x86 tree



Stephen Rothwell <[email protected]> wrote:

>Hi Matthew,
>
>After merging the drivers-x86 tree, today's linux-next build (x86_64
>allmodconfig) failed like this:

Apologies, I didn't test my code with
DEBUG_LOCK_ALLOC=y.
I'll send a fix in as soon as I get around a usable network
connection.

--
mattia
:wq

2011-02-22 11:46:04

by Mattia Dongili

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the drivers-x86 tree

On Tue, Feb 22, 2011 at 03:26:53PM +0900, Mattia Dongili wrote:
>
>
> Stephen Rothwell <[email protected]> wrote:
>
> >Hi Matthew,
> >
> >After merging the drivers-x86 tree, today's linux-next build (x86_64
> >allmodconfig) failed like this:
>
> Apologies, I didn't test my code with
> DEBUG_LOCK_ALLOC=y.
> I'll send a fix in as soon as I get around a usable network
> connection.

the below patch fixes the build failure.

how does linux-next work? should this patch be a separate commit or can
it be folded into the offending one?

diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index a097a27..a0ba0e7 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -769,7 +769,7 @@ static int sony_nc_handles_setup(struct platform_device *pd)

handles = kzalloc(sizeof(*handles), GFP_KERNEL);

- sysfs_attr_init(handles->devattr);
+ sysfs_attr_init(&handles->devattr.attr);
handles->devattr.attr.name = "handles";
handles->devattr.attr.mode = S_IRUGO;
handles->devattr.show = sony_nc_handles_show;
@@ -1459,13 +1459,13 @@ static int sony_nc_kbd_backlight_setup(struct platform_device *pd)

kbdbl_handle = kzalloc(sizeof(*kbdbl_handle), GFP_KERNEL);

- sysfs_attr_init(kbdbl_handle->mode_attr);
+ sysfs_attr_init(&kbdbl_handle->mode_attr.attr);
kbdbl_handle->mode_attr.attr.name = "kbd_backlight";
kbdbl_handle->mode_attr.attr.mode = S_IRUGO | S_IWUSR;
kbdbl_handle->mode_attr.show = sony_nc_kbd_backlight_mode_show;
kbdbl_handle->mode_attr.store = sony_nc_kbd_backlight_mode_store;

- sysfs_attr_init(kbdbl_handle->timeout_attr);
+ sysfs_attr_init(&kbdbl_handle->timeout_attr.attr);
kbdbl_handle->timeout_attr.attr.name = "kbd_backlight_timeout";
kbdbl_handle->timeout_attr.attr.mode = S_IRUGO | S_IWUSR;
kbdbl_handle->timeout_attr.show = sony_nc_kbd_backlight_timeout_show;
--
mattia
:wq!

2011-02-22 14:34:45

by Matthew Garrett

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the drivers-x86 tree

On Tue, Feb 22, 2011 at 08:46:01PM +0900, Mattia Dongili wrote:

> how does linux-next work? should this patch be a separate commit or can
> it be folded into the offending one?

I'll fold it into the offending one and repush. Sorry about the
breakage, Stephen - I don't have DEBUG_ALLOC enabled so didn't see the
failure. Do you build with a defined configuration I can test against?

--
Matthew Garrett | [email protected]

2011-02-22 22:23:37

by Stephen Rothwell

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the drivers-x86 tree

On Tue, 22 Feb 2011 14:34:34 +0000 Matthew Garrett <[email protected]> wrote:
>
> On Tue, Feb 22, 2011 at 08:46:01PM +0900, Mattia Dongili wrote:
>
> > how does linux-next work? should this patch be a separate commit or can
> > it be folded into the offending one?
>
> I'll fold it into the offending one and repush. Sorry about the
> breakage, Stephen - I don't have DEBUG_ALLOC enabled so didn't see the
> failure. Do you build with a defined configuration I can test against?

As the original report said, this was an x86_64 allmodconfig build.

--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/


Attachments:
(No filename) (658.00 B)
(No filename) (490.00 B)
Download all attachments