linux-next: build warning after merge of the moduleh tree

linux-next: build warning after merge of the moduleh tree

[Stephen Rothwell]

Hi Paul,

After merging the moduleh tree, today's linux-next build (powerepc
ppc64_defconfig) produced this warning:

drivers/base/power/qos.c:256:1: warning: data definition has no type or storage class
drivers/base/power/qos.c:256:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/base/power/qos.c:256:1: warning: parameter names (without types) in function declaration
drivers/base/power/qos.c:301:1: warning: data definition has no type or storage class
drivers/base/power/qos.c:301:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/base/power/qos.c:301:1: warning: parameter names (without types) in function declaration
drivers/base/power/qos.c:342:1: warning: data definition has no type or storage class
drivers/base/power/qos.c:342:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/base/power/qos.c:342:1: warning: parameter names (without types) in function declaration
drivers/base/power/qos.c:369:1: warning: data definition has no type or storage class
drivers/base/power/qos.c:369:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/base/power/qos.c:369:1: warning: parameter names (without types) in function declaration
drivers/base/power/qos.c:397:1: warning: data definition has no type or storage class
drivers/base/power/qos.c:397:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/base/power/qos.c:397:1: warning: parameter names (without types) in function declaration
drivers/base/power/qos.c:412:1: warning: data definition has no type or storage class
drivers/base/power/qos.c:412:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/base/power/qos.c:412:1: warning: parameter names (without types) in function declaration
drivers/base/power/qos.c:427:1: warning: data definition has no type or storage class
drivers/base/power/qos.c:427:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/base/power/qos.c:427:1: warning: parameter names (without types) in function declaration

Caused by commits 91ff4cb803df ("PM QoS: Implement per-device PM QoS
constraints") and b66213cdb002 ("PM QoS: Add global notification
mechanism for device constraints") from the pm tree interacting with the
module.h split up.

I added the following merge fixup patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 17:15:52 +1000
Subject: [PATCH] PM QoS: include export.h in qos.c for EXPORT_SYMBOL

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

diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c
index f9215e8..7f78682 100644
--- a/drivers/base/power/qos.c
+++ b/drivers/base/power/qos.c
@@ -39,6 +39,7 @@
 #include <linux/slab.h>
 #include <linux/device.h>
 #include <linux/mutex.h>
+#include <linux/export.h>
 
 
 static DEFINE_MUTEX(dev_pm_qos_mtx);
-- 
1.7.6.3

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

Re: linux-next: build warning after merge of the moduleh tree

[Pihet-XID, Jean]

Hi Stephen,

On Wed, Sep 28, 2011 at 9:18 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Paul,
>
> After merging the moduleh tree, today's linux-next build (powerepc
> ppc64_defconfig) produced this warning:
>
> drivers/base/power/qos.c:256:1: warning: data definition has no type or storage class
> drivers/base/power/qos.c:256:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/base/power/qos.c:256:1: warning: parameter names (without types) in function declaration
> drivers/base/power/qos.c:301:1: warning: data definition has no type or storage class
> drivers/base/power/qos.c:301:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/base/power/qos.c:301:1: warning: parameter names (without types) in function declaration
> drivers/base/power/qos.c:342:1: warning: data definition has no type or storage class
> drivers/base/power/qos.c:342:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/base/power/qos.c:342:1: warning: parameter names (without types) in function declaration
> drivers/base/power/qos.c:369:1: warning: data definition has no type or storage class
> drivers/base/power/qos.c:369:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/base/power/qos.c:369:1: warning: parameter names (without types) in function declaration
> drivers/base/power/qos.c:397:1: warning: data definition has no type or storage class
> drivers/base/power/qos.c:397:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/base/power/qos.c:397:1: warning: parameter names (without types) in function declaration
> drivers/base/power/qos.c:412:1: warning: data definition has no type or storage class
> drivers/base/power/qos.c:412:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/base/power/qos.c:412:1: warning: parameter names (without types) in function declaration
> drivers/base/power/qos.c:427:1: warning: data definition has no type or storage class
> drivers/base/power/qos.c:427:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/base/power/qos.c:427:1: warning: parameter names (without types) in function declaration
>
> Caused by commits 91ff4cb803df ("PM QoS: Implement per-device PM QoS
> constraints") and b66213cdb002 ("PM QoS: Add global notification
> mechanism for device constraints") from the pm tree interacting with the
> module.h split up.
>
> I added the following merge fixup patch.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 28 Sep 2011 17:15:52 +1000
> Subject: [PATCH] PM QoS: include export.h in qos.c for EXPORT_SYMBOL
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Thank you for fixing this. I am sorry the warning did not show up
during the OMAP and x86 builds, probably due to the different set of
includes for those platforms.

Regards,
Jean

> ---
>  drivers/base/power/qos.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c
> index f9215e8..7f78682 100644
> --- a/drivers/base/power/qos.c
> +++ b/drivers/base/power/qos.c
> @@ -39,6 +39,7 @@
>  #include <linux/slab.h>
>  #include <linux/device.h>
>  #include <linux/mutex.h>
> +#include <linux/export.h>
>
>
>  static DEFINE_MUTEX(dev_pm_qos_mtx);
> --
> 1.7.6.3
>
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>

Re: linux-next: build warning after merge of the moduleh tree

[Paul Gortmaker]

[linux-next: build warning after merge of the moduleh tree] On 11/10/2011 (Tue 20:21) Stephen Rothwell wrote:

> Hi Paul,
> 
> After merging the moduleh tree, today's linux-next build (i386 defconfig)
> produced this warning:
> 
> arch/x86/kernel/cpu/perf_event_intel.c:1323:1: warning: data definition has no type or storage class [enabled by default]
> arch/x86/kernel/cpu/perf_event_intel.c:1323:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
> arch/x86/kernel/cpu/perf_event_intel.c:1323:1: warning: parameter names (without types) in function declaration [enabled by default]
> 
> Introduced by commit 144d31e6f190 ("perf, intel: Use GO/HO bits in
> perf-ctr") from the tip tree interacting with the module.h slipt up.
> 
> I'll add a patch tomorrow to add an include of export.h to this file.

Hi Stephen,

I've added this and the other nmi export to the post-merge queue.  I'll
assume for the moment that the regulator tree will pick up the 3rd one,
like you recommended.

Thanks,
Paul.

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

linux-next: build warning after merge of the moduleh tree

[Stephen Rothwell]

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

Hi Paul,

After merging the moduleh tree, today's linux-next build (i386 defconfig)
produced this warning:

arch/x86/kernel/cpu/perf_event_intel.c:1323:1: warning: data definition has no type or storage class [enabled by default]
arch/x86/kernel/cpu/perf_event_intel.c:1323:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
arch/x86/kernel/cpu/perf_event_intel.c:1323:1: warning: parameter names (without types) in function declaration [enabled by default]

Introduced by commit 144d31e6f190 ("perf, intel: Use GO/HO bits in
perf-ctr") from the tip tree interacting with the module.h slipt up.

I'll add a patch tomorrow to add an include of export.h to this file.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: build warning after merge of the moduleh tree

[Rafael J. Wysocki]

On Thursday, August 18, 2011, Stephen Rothwell wrote:
> Hi Rafael,
> 
> On Thu, 18 Aug 2011 10:26:51 +0200 "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
> >
> > Do you mean that drivers/base/power/common.c should include module.h
> > or something else?
> 
> Yes, that is exactly what I mean :-)  See Rule 1 in
> Documentation/SubmitChecklist.  The reason it is different, is because
> the module.h splitup is cerating export.h for files that just need
> EXPORT_SYMBOL (like this file).

OK, I've modified common.c so that module.h is included.

Thanks,
Rafael

Re: linux-next: build warning after merge of the moduleh tree

[Stephen Rothwell]

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

Hi Rafael,

On Thu, 18 Aug 2011 10:26:51 +0200 "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
>
> Do you mean that drivers/base/power/common.c should include module.h
> or something else?

Yes, that is exactly what I mean :-)  See Rule 1 in
Documentation/SubmitChecklist.  The reason it is different, is because
the module.h splitup is cerating export.h for files that just need
EXPORT_SYMBOL (like this file).

-- 
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 warning after merge of the moduleh tree

[Rafael J. Wysocki]

Hi,

On Thursday, August 18, 2011, Stephen Rothwell wrote:
> Hi Paul,
> 
> After merging the moduleh tree, today's linux-next build (powerpc
> ppc64_defconfig) produced this warning:
> 
> drivers/base/power/common.c:51:1: warning: data definition has no type or storage class
> drivers/base/power/common.c:51:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/base/power/common.c:51:1: warning: parameter names (without types) in function declaration
> drivers/base/power/common.c:85:1: warning: data definition has no type or storage class
> drivers/base/power/common.c:85:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/base/power/common.c:85:1: warning: parameter names (without types) in function declaration
> 
> Caused by the interaction of the module.h split up with commit
> 616d5814c605 ("PM: Reference counting of power.subsys_data") from the pm
> tree.
> 
> I added this patch for today (Rafael, in your tree this needs to include
> module.h) and will carry it as necessary:

Do you mean that drivers/base/power/common.c should include module.h
or something else?

Rafael

linux-next: build warning after merge of the moduleh tree

[Stephen Rothwell]

Hi Paul,

After merging the moduleh tree, today's linux-next build (powerpc
ppc64_defconfig) produced this warning:

drivers/base/power/common.c:51:1: warning: data definition has no type or storage class
drivers/base/power/common.c:51:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/base/power/common.c:51:1: warning: parameter names (without types) in function declaration
drivers/base/power/common.c:85:1: warning: data definition has no type or storage class
drivers/base/power/common.c:85:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/base/power/common.c:85:1: warning: parameter names (without types) in function declaration

Caused by the interaction of the module.h split up with commit
616d5814c605 ("PM: Reference counting of power.subsys_data") from the pm
tree.

I added this patch for today (Rafael, in your tree this needs to include
module.h) and will carry it as necessary:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 18 Aug 2011 15:06:10 +1000
Subject: [PATCH] PM: EXPORT_SYMBOL needs export.h

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

diff --git a/drivers/base/power/common.c b/drivers/base/power/common.c
index 1f58cf0..5b86d84 100644
--- a/drivers/base/power/common.c
+++ b/drivers/base/power/common.c
@@ -8,6 +8,7 @@
 
 #include <linux/init.h>
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/pm_clock.h>
 
-- 
1.7.5.4

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

Re: linux-next: build warning after merge of the moduleh tree

[Jens Axboe]

On 2011-08-02 10:35, Stephen Rothwell wrote:
> Hi Jens,
> 
> On Tue, 2 Aug 2011 09:26:14 +0200 Jens Axboe <jaxboe@fusionio.com> wrote:
>>
>> Thanks, will you carry this until things are merged? Not easy for me to
>> fix up.
> 
> Yes, no problem.  It is possible that the module.h split may not even go
> into v3.1, in which case the fix patch will jst become part of the moduleh
> tree after the block tree is merged.
> 
> Though the feedback to the original patch writer is that they should have
> included module.h instead of relying on it being implicitly included.

That would arguably have been a much saner approach.

> You could include a patch to add an include of module.h to this file in
> your tree - that way even if the module.h split goes ahead, your tree
> won't get broken.  It could then be changed to the lighter weight
> export.h later.

OK, I will add that. Thanks.

-- 
Jens Axboe

Re: linux-next: build warning after merge of the moduleh tree

[Stephen Rothwell]

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

Hi Jens,

On Tue, 2 Aug 2011 09:26:14 +0200 Jens Axboe <jaxboe@fusionio.com> wrote:
>
> Thanks, will you carry this until things are merged? Not easy for me to
> fix up.

Yes, no problem.  It is possible that the module.h split may not even go
into v3.1, in which case the fix patch will jst become part of the moduleh
tree after the block tree is merged.

Though the feedback to the original patch writer is that they should have
included module.h instead of relying on it being implicitly included.

You could include a patch to add an include of module.h to this file in
your tree - that way even if the module.h split goes ahead, your tree
won't get broken.  It could then be changed to the lighter weight
export.h later.
-- 
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 warning after merge of the moduleh tree

[Jens Axboe]

On 2011-08-01 05:23, Stephen Rothwell wrote:
> Hi Paul,
> 
> After merging the moduleh tree, today's linux-next build (x86_64
> allmodconfig) produced this warning:
> 
> block/bsg-lib.c:75:1: warning: data definition has no type or storage class
> block/bsg-lib.c:75:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> block/bsg-lib.c:75:1: warning: parameter names (without types) in function declaration
> block/bsg-lib.c:164:1: warning: data definition has no type or storage class
> block/bsg-lib.c:164:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> block/bsg-lib.c:164:1: warning: parameter names (without types) in function declaration
> block/bsg-lib.c:210:1: warning: data definition has no type or storage class
> block/bsg-lib.c:210:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> block/bsg-lib.c:210:1: warning: parameter names (without types) in function declaration
> block/bsg-lib.c:244:1: warning: data definition has no type or storage class
> block/bsg-lib.c:244:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> block/bsg-lib.c:244:1: warning: parameter names (without types) in function declaration
> block/bsg-lib.c:297:1: warning: data definition has no type or storage class
> block/bsg-lib.c:297:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> block/bsg-lib.c:297:1: warning: parameter names (without types) in function declaration
> 
> This is an interaction with commit aa387cc89567 ("block: add bsg helper
> library") from the block tree.  That file should have included module.h
> but now would need export.h it seems (just uses EXPORTSYMBOL_GPL).
> 
> I applied the following as a merge fix patch:

Thanks, will you carry this until things are merged? Not easy for me to
fix up.

-- 
Jens Axboe

linux-next: build warning after merge of the moduleh tree

[Stephen Rothwell]

Hi Paul,

After merging the moduleh tree, today's linux-next build (x86_64
allmodconfig) produced this warning:

block/bsg-lib.c:75:1: warning: data definition has no type or storage class
block/bsg-lib.c:75:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
block/bsg-lib.c:75:1: warning: parameter names (without types) in function declaration
block/bsg-lib.c:164:1: warning: data definition has no type or storage class
block/bsg-lib.c:164:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
block/bsg-lib.c:164:1: warning: parameter names (without types) in function declaration
block/bsg-lib.c:210:1: warning: data definition has no type or storage class
block/bsg-lib.c:210:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
block/bsg-lib.c:210:1: warning: parameter names (without types) in function declaration
block/bsg-lib.c:244:1: warning: data definition has no type or storage class
block/bsg-lib.c:244:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
block/bsg-lib.c:244:1: warning: parameter names (without types) in function declaration
block/bsg-lib.c:297:1: warning: data definition has no type or storage class
block/bsg-lib.c:297:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
block/bsg-lib.c:297:1: warning: parameter names (without types) in function declaration

This is an interaction with commit aa387cc89567 ("block: add bsg helper
library") from the block tree.  That file should have included module.h
but now would need export.h it seems (just uses EXPORTSYMBOL_GPL).

I applied the following as a merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 1 Aug 2011 13:21:39 +1000
Subject: [PATCH] block: bsg-lib.c needs export.h

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

diff --git a/block/bsg-lib.c b/block/bsg-lib.c
index f8c0a61..b82c11b 100644
--- a/block/bsg-lib.c
+++ b/block/bsg-lib.c
@@ -23,6 +23,7 @@
 #include <linux/slab.h>
 #include <linux/blkdev.h>
 #include <linux/delay.h>
+#include <linux/export.h>
 #include <linux/scatterlist.h>
 #include <linux/bsg-lib.h>
 #include <scsi/scsi_cmnd.h>
-- 
1.7.5.4

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