linux-next: build warnings after merge of the ia64 tree

linux-next: build warnings after merge of the ia64 tree

[Stephen Rothwell]

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

Hi Tony,

After merging the ia64 tree, today's linux-next build (x86_64_allmodconfig)
produced these warnings:

drivers/acpi/apei/erst.c: In function 'erst_reader':
drivers/acpi/apei/erst.c:826: warning: passing argument 1 of 'spinlock_check' from incompatible pointer type
include/linux/spinlock.h:272: note: expected 'struct spinlock_t *' but argument is of type 'struct raw_spinlock_t *'
drivers/acpi/apei/erst.c:829: warning: passing argument 1 of 'spin_unlock_irqrestore' from incompatible pointer type
include/linux/spinlock.h:338: note: expected 'struct spinlock_t *' but argument is of type 'struct raw_spinlock_t *'
drivers/acpi/apei/erst.c:834: warning: passing argument 1 of 'spin_unlock_irqrestore' from incompatible pointer type
include/linux/spinlock.h:338: note: expected 'struct spinlock_t *' but argument is of type 'struct raw_spinlock_t *'
drivers/acpi/apei/erst.c:840: warning: passing argument 1 of 'spin_unlock_irqrestore' from incompatible pointer type
include/linux/spinlock.h:338: note: expected 'struct spinlock_t *' but argument is of type 'struct raw_spinlock_t *'

Introduced by commit ae85bdfb6bd024fab5556f9b78668b1c6aab6fb8 ("pstore:
X86 platform interface using ACPI/APEI/ERST").

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

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

RE: linux-next: build warnings after merge of the ia64 tree

[Luck, Tony]

> After merging the ia64 tree, today's linux-next build
> produced these warnings:

>drivers/acpi/apei/erst.c: In function 'erst_reader':
>drivers/acpi/apei/erst.c:826: warning: passing argument 1 of >'spinlock_check' from incompatible pointer type

Hmmmh. I wonder why I didn't see them in my build?

I'll take a look and try to fix it tomorrow.

Thanks for the notice.

-Tony

RE: linux-next: build warnings after merge of the ia64 tree

[Luck, Tony]

> Hmmmh. I wonder why I didn't see them in my build?

Ah - because I only built against Linus' tree, and linux-next
has:

commit 3b38bb5f7f06356a89bb2cbf92ad346025e95192
Author: Huang Ying <ying.huang@intel.com>
Date:   Thu Dec 2 10:40:53 2010 +0800

    ACPI, APEI, use raw spinlock in ERST

Drop the ia64/test branch if you like.

-Tony

Re: linux-next: build warnings after merge of the ia64 tree

[Stephen Rothwell]

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

Hi Tony,

On Thu, 16 Dec 2010 16:50:14 -0800 "Luck, Tony" <tony.luck@intel.com> wrote:
>
> > Hmmmh. I wonder why I didn't see them in my build?
> 
> Ah - because I only built against Linus' tree, and linux-next
> has:
> 
> commit 3b38bb5f7f06356a89bb2cbf92ad346025e95192
> Author: Huang Ying <ying.huang@intel.com>
> Date:   Thu Dec 2 10:40:53 2010 +0800
> 
>     ACPI, APEI, use raw spinlock in ERST

That commit is in Linus' tree as of v2.6.37-rc6 so if you merge -rc6 into
your tree, you can fix the conflict there.

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

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

RE: linux-next: build warnings after merge of the ia64 tree

[Luck, Tony]

>> commit 3b38bb5f7f06356a89bb2cbf92ad346025e95192
>> Author: Huang Ying <ying.huang@intel.com>
>> Date:   Thu Dec 2 10:40:53 2010 +0800
>> 
>>     ACPI, APEI, use raw spinlock in ERST
>
> That commit is in Linus' tree as of v2.6.37-rc6 so if you merge -rc6 into
> your tree, you can fix the conflict there.

Ah good. I've rebased a new version of my code on top of -rc6.

Thanks

-Tony

linux-next: build warnings after merge of the ia64 tree

[Stephen Rothwell]

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

Hi all,

After merging the ia64 tree, today's linux-next build (powerpc
ppc64_defconfig) produced these warnings (though presumably it started
yesterday):

In file included from include/ras/ras_event.h:11:0,
                 from drivers/ras/ras.c:13:
include/linux/aer.h:42:58: warning: 'struct pci_dev' declared inside parameter list
 static inline int pci_enable_pcie_error_reporting(struct pci_dev *dev)
                                                          ^
include/linux/aer.h:42:58: warning: its scope is only this definition or declaration, which is probably not what you want
include/linux/aer.h:46:59: warning: 'struct pci_dev' declared inside parameter list
 static inline int pci_disable_pcie_error_reporting(struct pci_dev *dev)
                                                           ^
include/linux/aer.h:50:65: warning: 'struct pci_dev' declared inside parameter list
 static inline int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev)
                                                                 ^
include/linux/aer.h:57:14: warning: 'struct pci_dev' declared inside parameter list
       struct aer_capability_regs *aer);
              ^

Introduced by commit 76ac8275f296 ("trace, RAS: Add basic RAS trace
event") and following patches.

So, presumably, aer.h either needs to include pci.h or, at least, have a

struct pci_dev;

line in it.

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]