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

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

[Stephen Rothwell]

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

Hi Paul,

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

drivers/gpu/drm/radeon/si_blit_shaders.c:252:1: error: implicit declaration of function 'BUILD_BUG_ON_ZERO' [-Werror=implicit-function-declaration]
drivers/gpu/drm/radeon/si_blit_shaders.c:252:1: error: initializer element is not constant

Caused by commit 48c0c902e2e6 ("drm/radeon/kms: add support for CP setup
on SI") from Linus' tree interacting with commit 6c03438edeb5 ("kernel.h:
doesn't explicitly use bug.h, so don't include it").

ARRAY_SIZE in kernel.h uses __must_be_array from compiler{-ggc,-intel}.h
which uses BUILD_BUG_ON_ZERO ...  I don;t know if we want to include
bug.h in compiler.h ...

So, for today, I have added the following patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 23 Mar 2012 15:47:07 +1100
Subject: [PATCH] kernel.h: using ARRAY_SIZE needs to include bug.h

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

diff --git a/drivers/gpu/drm/radeon/si_blit_shaders.c b/drivers/gpu/drm/radeon/si_blit_shaders.c
index a7124b4..ec415e7 100644
--- a/drivers/gpu/drm/radeon/si_blit_shaders.c
+++ b/drivers/gpu/drm/radeon/si_blit_shaders.c
@@ -25,6 +25,7 @@
  */
 
 #include <linux/types.h>
+#include <linux/bug.h>
 #include <linux/kernel.h>
 
 const u32 si_default_state[] =
-- 
1.7.9.1

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

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

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

[Paul Gortmaker]

On 12-03-23 12:51 AM, Stephen Rothwell wrote:
> Hi Paul,
> 
> After merging the moduleh tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/gpu/drm/radeon/si_blit_shaders.c:252:1: error: implicit declaration of function 'BUILD_BUG_ON_ZERO' [-Werror=implicit-function-declaration]
> drivers/gpu/drm/radeon/si_blit_shaders.c:252:1: error: initializer element is not constant
> 
> Caused by commit 48c0c902e2e6 ("drm/radeon/kms: add support for CP setup
> on SI") from Linus' tree interacting with commit 6c03438edeb5 ("kernel.h:
> doesn't explicitly use bug.h, so don't include it").

Thanks Stephen,

Too bad the radeon commits weren't in linux-next, then we'd not
have to be fixing these in the merge window...

I think it makes sense for me to fold this into:

commit 50af5ead3b44ccf8bd2b4d2a50c1b610f557c480
Author: Paul Gortmaker <paul.gortmaker@windriver.com>
Date:   Fri Jan 20 18:35:53 2012 -0500

    bug.h: add include of it to various implicit C users

in the bug-3.4 tree before requesting it to be pulled.

Paul.
--

> 
> ARRAY_SIZE in kernel.h uses __must_be_array from compiler{-ggc,-intel}.h
> which uses BUILD_BUG_ON_ZERO ...  I don;t know if we want to include
> bug.h in compiler.h ...
> 
> So, for today, I have added the following patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 23 Mar 2012 15:47:07 +1100
> Subject: [PATCH] kernel.h: using ARRAY_SIZE needs to include bug.h
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/gpu/drm/radeon/si_blit_shaders.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/gpu/drm/radeon/si_blit_shaders.c b/drivers/gpu/drm/radeon/si_blit_shaders.c
> index a7124b4..ec415e7 100644
> --- a/drivers/gpu/drm/radeon/si_blit_shaders.c
> +++ b/drivers/gpu/drm/radeon/si_blit_shaders.c
> @@ -25,6 +25,7 @@
>   */
>  
>  #include <linux/types.h>
> +#include <linux/bug.h>
>  #include <linux/kernel.h>
>  
>  const u32 si_default_state[] =

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

[Stephen Rothwell]

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

Hi Paul,

On Fri, 23 Mar 2012 08:49:31 -0400 Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
>
> Too bad the radeon commits weren't in linux-next, then we'd not
> have to be fixing these in the merge window...

Well, yeah, but I understand that they came in late.

> I think it makes sense for me to fold this into:
> 
> commit 50af5ead3b44ccf8bd2b4d2a50c1b610f557c480
> Author: Paul Gortmaker <paul.gortmaker@windriver.com>
> Date:   Fri Jan 20 18:35:53 2012 -0500
> 
>     bug.h: add include of it to various implicit C users
> 
> in the bug-3.4 tree before requesting it to be pulled.

Except that this file does not exist in your tree currently, so you would
have to merge Linux' tree first (and put this in the merge commit).  It's
probably better to just mention this to Linus when you request the pull
(along with the one in fs/reiserfs/reiserfs.h).

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

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

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

[Stephen Rothwell]

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

Hi Paul,

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

drivers/md/dm-bufio.c:988:1: warning: data definition has no type or storage class [enabled by default]
drivers/md/dm-bufio.c:988:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/md/dm-bufio.c:988:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/md/dm-bufio.c:997:1: warning: data definition has no type or storage class [enabled by default]
drivers/md/dm-bufio.c:997:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/md/dm-bufio.c:997:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/md/dm-bufio.c:1006:1: warning: data definition has no type or storage class [enabled by default]
drivers/md/dm-bufio.c:1006:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/md/dm-bufio.c:1006:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/md/dm-bufio.c:1036:1: warning: data definition has no type or storage class [enabled by default]
drivers/md/dm-bufio.c:1036:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/md/dm-bufio.c:1036:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/md/dm-bufio.c:1049:1: warning: data definition has no type or storage class [enabled by default]
drivers/md/dm-bufio.c:1049:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/md/dm-bufio.c:1049:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/md/dm-bufio.c:1059:1: warning: data definition has no type or storage class [enabled by default]
drivers/md/dm-bufio.c:1059:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/md/dm-bufio.c:1059:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/md/dm-bufio.c:1135:1: warning: data definition has no type or storage class [enabled by default]
drivers/md/dm-bufio.c:1135:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/md/dm-bufio.c:1135:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/md/dm-bufio.c:1158:1: warning: data definition has no type or storage class [enabled by default]
drivers/md/dm-bufio.c:1158:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/md/dm-bufio.c:1158:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/md/dm-bufio.c:1232:1: warning: data definition has no type or storage class [enabled by default]
drivers/md/dm-bufio.c:1232:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/md/dm-bufio.c:1232:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/md/dm-bufio.c:1238:1: warning: data definition has no type or storage class [enabled by default]
drivers/md/dm-bufio.c:1238:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/md/dm-bufio.c:1238:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/md/dm-bufio.c:1245:1: warning: data definition has no type or storage class [enabled by default]
drivers/md/dm-bufio.c:1245:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/md/dm-bufio.c:1245:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/md/dm-bufio.c:1251:1: warning: data definition has no type or storage class [enabled by default]
drivers/md/dm-bufio.c:1251:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/md/dm-bufio.c:1251:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/md/dm-bufio.c:1257:1: warning: data definition has no type or storage class [enabled by default]
drivers/md/dm-bufio.c:1257:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/md/dm-bufio.c:1257:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/md/dm-bufio.c:1263:1: warning: data definition has no type or storage class [enabled by default]
drivers/md/dm-bufio.c:1263:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/md/dm-bufio.c:1263:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/md/dm-bufio.c:1269:1: warning: data definition has no type or storage class [enabled by default]
drivers/md/dm-bufio.c:1269:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/md/dm-bufio.c:1269:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/md/dm-bufio.c:1489:1: warning: data definition has no type or storage class [enabled by default]
drivers/md/dm-bufio.c:1489:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/md/dm-bufio.c:1489:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/md/dm-bufio.c:1534:1: warning: data definition has no type or storage class [enabled by default]
drivers/md/dm-bufio.c:1534:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/md/dm-bufio.c:1534:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/md/dm-bufio.c:1676:63: error: expected ')' before 'ulong'
drivers/md/dm-bufio.c:1677:40: error: expected ')' before string constant
drivers/md/dm-bufio.c:1679:55: error: expected ')' before 'uint'
drivers/md/dm-bufio.c:1680:35: error: expected ')' before string constant
drivers/md/dm-bufio.c:1682:67: error: expected ')' before 'ulong'
drivers/md/dm-bufio.c:1683:40: error: expected ')' before string constant
drivers/md/dm-bufio.c:1685:79: error: expected ')' before 'ulong'
drivers/md/dm-bufio.c:1686:46: error: expected ')' before string constant
drivers/md/dm-bufio.c:1688:87: error: expected ')' before 'ulong'
drivers/md/dm-bufio.c:1689:50: error: expected ')' before string constant
drivers/md/dm-bufio.c:1691:73: error: expected ')' before 'ulong'
drivers/md/dm-bufio.c:1692:43: error: expected ')' before string constant
drivers/md/dm-bufio.c:1694:73: error: expected ')' before 'ulong'
drivers/md/dm-bufio.c:1695:43: error: expected ')' before string constant
drivers/md/dm-bufio.c:1697:15: error: expected declaration specifiers or '...' before string constant
drivers/md/dm-bufio.c:1698:20: error: expected declaration specifiers or '...' before string constant
drivers/md/dm-bufio.c:1699:16: error: expected declaration specifiers or '...' before string constant

Caused by commit 0b068238c5ef ("The dm-bufio interface allows you to do
cached I/O on devices") interacting with the modul.h split up.  This file
should have included module.h in any case.

I have added this merg fix patch (Alasdair, this could be added to the
device-mapper tree):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 1 Nov 2011 18:30:49 +1100
Subject: [PATCH] device-mapper: dm-bufio.c needs to include module.h

since it uses the module facilities.

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

diff --git a/drivers/md/dm-bufio.c b/drivers/md/dm-bufio.c
index cb24666..3a94ef4 100644
--- a/drivers/md/dm-bufio.c
+++ b/drivers/md/dm-bufio.c
@@ -14,6 +14,7 @@
 #include <linux/vmalloc.h>
 #include <linux/version.h>
 #include <linux/shrinker.h>
+#include <linux/module.h>
 
 #define DM_MSG_PREFIX "bufio"
 
-- 
1.7.7

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

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

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

[Stephen Rothwell]

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

Hi Paul,

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

drivers/net/wireless/brcm80211/brcmutil/utils.c:20:15: error: expected declaration specifiers or '...' before string constant
drivers/net/wireless/brcm80211/brcmutil/utils.c:21:20: error: expected declaration specifiers or '...' before string constant
drivers/net/wireless/brcm80211/brcmutil/utils.c:22:25: error: expected declaration specifiers or '...' before string constant
drivers/net/wireless/brcm80211/brcmutil/utils.c:23:16: error: expected declaration specifiers or '...' before string constant
drivers/net/wireless/brcm80211/brcmutil/utils.c:37:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:37:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/brcm80211/brcmutil/utils.c:37:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:65:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:65:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/brcm80211/brcmutil/utils.c:65:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:96:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:96:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/brcm80211/brcmutil/utils.c:96:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:108:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:108:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/brcm80211/brcmutil/utils.c:108:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:139:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:139:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/brcm80211/brcmutil/utils.c:139:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:165:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:165:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/brcm80211/brcmutil/utils.c:165:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:190:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:190:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/brcm80211/brcmutil/utils.c:190:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:218:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:218:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/brcm80211/brcmutil/utils.c:218:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:250:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:250:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/brcm80211/brcmutil/utils.c:250:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:259:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:259:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/brcm80211/brcmutil/utils.c:259:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:276:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:276:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/brcm80211/brcmutil/utils.c:276:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:294:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:294:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/brcm80211/brcmutil/utils.c:294:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:309:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:309:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/brcm80211/brcmutil/utils.c:309:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:350:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:350:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/brcm80211/brcmutil/utils.c:350:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:364:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:364:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/brcm80211/brcmutil/utils.c:364:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:394:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:394:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/brcm80211/brcmutil/utils.c:394:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:451:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:451:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/brcm80211/brcmutil/utils.c:451:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:469:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:469:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/brcm80211/brcmutil/utils.c:469:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:480:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:480:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/brcm80211/brcmutil/utils.c:480:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:499:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:499:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/brcm80211/brcmutil/utils.c:499:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:553:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:553:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/brcm80211/brcmutil/utils.c:553:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:585:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:585:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/brcm80211/brcmutil/utils.c:585:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:600:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/brcm80211/brcmutil/utils.c:600:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/brcm80211/brcmutil/utils.c:600:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c:47:15: error: expected declaration specifiers or '...' before string constant
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c:48:20: error: expected declaration specifiers or '...' before string constant
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c:49:25: error: expected declaration specifiers or '...' before string constant
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c:50:16: error: expected declaration specifiers or '...' before string constant
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c:80:31: error: expected ')' before 'int'
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c:3400:17: error: expected declaration specifiers or '...' before string constant
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c:3401:17: error: expected declaration specifiers or '...' before string constant
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c:51:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c:51:1: warning: type defaults to 'int' in declaration of 'MODULE_DEVICE_TABLE' [-Wimplicit-int]
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c:51:1: warning: parameter names (without types) in function declaration [enabled by default]

Caused by commit 5b435de0d786 ("net: wireless: add brcm80211 drivers")
from the wireless tree interacting with the module.h split up.

These files clearly should include module.h (John, please apply this to the
wireless tree):

From d89b14ffc84a2b8a54ffe89453b8bbf9cabf1468 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 12 Oct 2011 17:07:06 +1100
Subject: [PATCH] net: wireless: brcm80211: include module.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---

diff --git a/drivers/net/wireless/brcm80211/brcmutil/utils.c b/drivers/net/wireless/brcm80211/brcmutil/utils.c
index 62bcc71..e96bdbf 100644
--- a/drivers/net/wireless/brcm80211/brcmutil/utils.c
+++ b/drivers/net/wireless/brcm80211/brcmutil/utils.c
@@ -15,6 +15,7 @@
  */
 
 #include <linux/netdevice.h>
+#include <linux/module.h>
 #include <brcmu_utils.h>
 
 MODULE_AUTHOR("Broadcom Corporation");
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index e919de2..bbaeb2d 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -23,6 +23,7 @@
 #include <linux/suspend.h>
 #include <linux/errno.h>
 #include <linux/sched.h>	/* request_irq() */
+#include <linux/module.h>
 #include <net/cfg80211.h>
 
 #include <defs.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index 03607ca..1adc3be 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -31,6 +31,7 @@
 #include <linux/hardirq.h>
 #include <linux/mutex.h>
 #include <linux/wait.h>
+#include <linux/module.h>
 #include <net/cfg80211.h>
 #include <net/rtnetlink.h>
 #include <defs.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index 6885755..bd9db48 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -27,6 +27,7 @@
 #include <linux/mmc/card.h>
 #include <linux/semaphore.h>
 #include <linux/firmware.h>
+#include <linux/module.h>
 #include <asm/unaligned.h>
 #include <defs.h>
 #include <brcmu_wifi.h>
-- 
1.7.6.3

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

[Mark Brown]

On Tue, Oct 11, 2011 at 07:25:15PM +1100, Stephen Rothwell wrote:

> I have applied the following patch for today.  Mark, Liam, this should be
> applied to the regulator tree.

I open coded this since it was easier than fishing the patch out of the
backtrace.

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

[Stephen Rothwell]

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

Hi Paul,

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

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

ERROR: "register_nmi_handler" [drivers/watchdog/hpwdt.ko] undefined!
ERROR: "unregister_nmi_handler" [drivers/watchdog/hpwdt.ko] undefined!
ERROR: "unregister_nmi_handler" [drivers/char/ipmi/ipmi_watchdog.ko] undefined!
ERROR: "register_nmi_handler" [drivers/char/ipmi/ipmi_watchdog.ko] undefined!
ERROR: "register_nmi_handler" [arch/x86/oprofile/oprofile.ko] undefined!
ERROR: "unregister_nmi_handler" [arch/x86/oprofile/oprofile.ko] undefined!
ERROR: "register_nmi_handler" [arch/x86/kernel/cpu/mcheck/mce-inject.ko] undefined!

Caused by commit 9c48f1c629ec ("x86, nmi: Wire up NMI handlers to new
routines") from the tip tree interacting with the modul.h split up.

I have added the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 11 Oct 2011 19:36:20 +1100
Subject: [PATCH] x86, nmi: include export.h for EXPORT_SYBBOL

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

diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index 7ec5bd1..b9c8628 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -17,6 +17,7 @@
 #include <linux/delay.h>
 #include <linux/hardirq.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 
 #include <linux/mca.h>
 
-- 
1.7.6.3

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

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

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

[Stephen Rothwell]

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

Hi Paul,

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

drivers/regulator/gpio-regulator.c: In function 'gpio_regulator_probe':
drivers/regulator/gpio-regulator.c:209:24: error: 'THIS_MODULE' undeclared (first use in this function)
drivers/regulator/gpio-regulator.c:209:24: note: each undeclared identifier is reported only once for each function it appears in
drivers/regulator/gpio-regulator.c: At top level:
drivers/regulator/gpio-regulator.c:338:13: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/regulator/gpio-regulator.c:354:15: error: expected declaration specifiers or '...' before string constant
drivers/regulator/gpio-regulator.c:355:20: error: expected declaration specifiers or '...' before string constant
drivers/regulator/gpio-regulator.c:356:16: error: expected declaration specifiers or '...' before string constant
drivers/regulator/gpio-regulator.c:357:14: error: expected declaration specifiers or '...' before string constant

Caused by commit 3f0292ae8bb1 ("regulator: Add driver for gpio-controlled
regulators") from the regulator tree interacting with the module.h split
up.

I have applied the following patch for today.  Mark, Liam, this should be
applied to the regulator tree.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 11 Oct 2011 19:22:29 +1100
Subject: [PATCH] regulator: using module related services requires module.h

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

diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c
index abf32ad..24d4477 100644
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -31,6 +31,7 @@
 #include <linux/gpio.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 
 struct gpio_regulator_data {
 	struct regulator_desc desc;
-- 
1.7.6.3

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

[Chris Ball]

Hi Paul,

On Sun, Oct 09 2011, Paul Gortmaker wrote:
> I was wondering if you were going to apply this to the mmc tree.  Since
> the module_param addition isn't in the module.h baseline, I'd be
> speculatively fixing an issue that hasn't been created yet, which isn't
> the end of the world, but it doesn't feel quite right to do that either.

Thanks, I've pushed both this patch and "Add module.h to drivers/mmc
users assuming implicit presence" to the mmc-next tree now.

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

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

[Paul Gortmaker]

[linux-next: build failure after merge of the moduleh tree] On 28/09/2011 (Wed 18:18) Stephen Rothwell wrote:

> Hi Paul,
> 
> After merging the moduleh tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/mmc/core/debugfs.c:28:35: error: expected ')' before numeric constant
> 
> Caused by commit b5a62f8be3af ("mmc: add module param to set fault
> injection attributes") from the mmc tree interacting with the module.h
> split up.
> 
> I have applied the patch below for today (something similar could be
> applied to the mmc tree).

Hi Chris,

I was wondering if you were going to apply this to the mmc tree.  Since
the module_param addition isn't in the module.h baseline, I'd be
speculatively fixing an issue that hasn't been created yet, which isn't
the end of the world, but it doesn't feel quite right to do that either.

If it is in the mmc tree, then the include fix will be guaranteed to be
present wherever the module_param usage is present.

Thanks,
Paul.


>From 00812c67db3d0ade3571684191781d866293f1ba Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 18:09:12 +1000
Subject: [PATCH] mmc: using module_param requires the inclusion of
 moduleparam.h

Commit "mmc: add module param to set fault injection attributes" adds
a module_param to this file.  But it is relying on the old implicit
"module.h is everywhere" behaviour, and without the explicit include
of moduleparam.h, the pending module.h split up produces this error:

drivers/mmc/core/debugfs.c:28:35: error: expected ')' before numeric constant

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

diff --git a/drivers/mmc/core/debugfs.c b/drivers/mmc/core/debugfs.c
index 0a1e7cf..65138e0 100644
--- a/drivers/mmc/core/debugfs.c
+++ b/drivers/mmc/core/debugfs.c
@@ -7,6 +7,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+#include <linux/moduleparam.h>
 #include <linux/debugfs.h>
 #include <linux/fs.h>
 #include <linux/export.h>
-- 
1.7.6

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

[Jonathan Cameron]

On 10/04/11 08:21, Stephen Rothwell wrote:
> Hi Paul,
> 
> After merging the moduleh tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/staging/iio/adc/ad7746.c:345:8: error: 'S_IWUSR' undeclared here (not in a function)
> drivers/staging/iio/adc/ad7746.c:436:8: error: 'S_IRUGO' undeclared here (not in a function)
> drivers/staging/iio/adc/ad7746.c:681:19: error: 'THIS_MODULE' undeclared here (not in a function)
> drivers/staging/iio/adc/ad7746.c:778:1: warning: data definition has no type or storage class [enabled by default]
> drivers/staging/iio/adc/ad7746.c:778:1: warning: type defaults to 'int' in declaration of 'MODULE_DEVICE_TABLE' [-Wimplicit-int]
> drivers/staging/iio/adc/ad7746.c:778:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/staging/iio/adc/ad7746.c:799:15: error: expected declaration specifiers or '...' before string constant
> drivers/staging/iio/adc/ad7746.c:800:20: error: expected declaration specifiers or '...' before string constant
> drivers/staging/iio/adc/ad7746.c:801:16: error: expected declaration specifiers or '...' before string constant
> 
> Caused by commit 83e416f458d5 ("staging: iio: adc: Replace, rewrite
> ad7745 from scratch") from the staging tree interacting with the module.h
> split.
> 
> I added the following patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 4 Oct 2011 18:18:28 +1100
> Subject: [PATCH] staging: iio: adc: add includes of module.h and stat.h
> 
> fixes these build problems:
> 
> drivers/staging/iio/adc/ad7746.c:345:8: error: 'S_IWUSR' undeclared here (not in a function)
> drivers/staging/iio/adc/ad7746.c:436:8: error: 'S_IRUGO' undeclared here (not in a function)
> drivers/staging/iio/adc/ad7746.c:681:19: error: 'THIS_MODULE' undeclared here (not in a function)
> drivers/staging/iio/adc/ad7746.c:778:1: warning: data definition has no type or storage class [enabled by default]
> drivers/staging/iio/adc/ad7746.c:778:1: warning: type defaults to 'int' in declaration of 'MODULE_DEVICE_TABLE' [-Wimplicit-int]
> drivers/staging/iio/adc/ad7746.c:778:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/staging/iio/adc/ad7746.c:799:15: error: expected declaration specifiers or '...' before string constant
> drivers/staging/iio/adc/ad7746.c:800:20: error: expected declaration specifiers or '...' before string constant
> drivers/staging/iio/adc/ad7746.c:801:16: error: expected declaration specifiers or '...' before string constant
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>

> ---
>  drivers/staging/iio/adc/ad7746.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/staging/iio/adc/ad7746.c b/drivers/staging/iio/adc/ad7746.c
> index 0b251ad..3fe0c17 100644
> --- a/drivers/staging/iio/adc/ad7746.c
> +++ b/drivers/staging/iio/adc/ad7746.c
> @@ -13,6 +13,8 @@
>  #include <linux/sysfs.h>
>  #include <linux/i2c.h>
>  #include <linux/delay.h>
> +#include <linux/module.h>
> +#include <linux/stat.h>
>  
>  #include "../iio.h"
>  #include "../sysfs.h"

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

[Larry Finger]

On 10/04/2011 03:14 AM, Stephen Rothwell wrote:
>
> Since it adds an include of export.h (which only exists in Paul's tree),
> it goes into Paul's post merge patch series.

Sounds good. ACKed-by: Larry Finger <Larry.Finger@lwfinger.net>

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

[Stephen Rothwell]

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

Hi Kalle,

On Tue, 4 Oct 2011 10:35:29 +0300 Kalle Valo <kvalo@qca.qualcomm.com> wrote:
>
> On 10/04/2011 10:03 AM, Stephen Rothwell wrote:
> > After merging the moduleh tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/net/wireless/ath/ath6kl/debug.c:237:11: error: 'THIS_MODULE' undeclared here (not in a function)
> > 
> > Caused by commit 9a7308341b71 ("ath6kl: silence "invalid rate" warning")
> > from the wireless tree interacting with the module.h split.
> > 
> > I added this patch:
> 
> John&Paul, how do we handle this patch?

Since it adds an include of export.h (which only exists in Paul's tree),
it goes into Paul's post merge patch series.

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

[Kalle Valo]

On 10/04/2011 10:03 AM, Stephen Rothwell wrote:
> After merging the moduleh tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/net/wireless/ath/ath6kl/debug.c:237:11: error: 'THIS_MODULE' undeclared here (not in a function)
> 
> Caused by commit 9a7308341b71 ("ath6kl: silence "invalid rate" warning")
> from the wireless tree interacting with the module.h split.
> 
> I added this patch:

John&Paul, how do we handle this patch?

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 4 Oct 2011 18:01:03 +1100
> Subject: [PATCH] ath6kl: THIS_MODULES needs export.h
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/net/wireless/ath/ath6kl/debug.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/net/wireless/ath/ath6kl/debug.c b/drivers/net/wireless/ath/ath6kl/debug.c
> index ba3f23d..7879b53 100644
> --- a/drivers/net/wireless/ath/ath6kl/debug.c
> +++ b/drivers/net/wireless/ath/ath6kl/debug.c
> @@ -19,6 +19,7 @@
>  #include <linux/circ_buf.h>
>  #include <linux/fs.h>
>  #include <linux/vmalloc.h>
> +#include <linux/export.h>
>  
>  #include "debug.h"
>  #include "target.h"

Kalle

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

[Stephen Rothwell]

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

Hi Paul,

After merging the moduleh tree, today's linux-next build (x86_64
allmodconfig) produced these errors/warnings:

drivers/staging/rtl8712/usb_intf.c:172:1: warning: data definition has no type or storage class [enabled by default]
drivers/staging/rtl8712/usb_intf.c:172:1: warning: type defaults to 'int' in declaration of 'MODULE_DEVICE_TABLE' [-Wimplicit-int]
drivers/staging/rtl8712/usb_intf.c:172:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/staging/rtl8712/usb_intf.c: In function 'r8712u_drv_entry':
drivers/staging/rtl8712/usb_intf.c:649:9: error: 'THIS_MODULE' undeclared (first use in this function)
drivers/staging/rtl8712/hal_init.c:66:17: error: expected declaration specifiers or '...' before string constant

Caused by various commits in the staging tree interacting with the
module.h split.

I have added the following patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 4 Oct 2011 18:30:10 +1100
Subject: [PATCH] staging: r8712u:  include module.h where needed

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

diff --git a/drivers/staging/rtl8712/hal_init.c b/drivers/staging/rtl8712/hal_init.c
index 1bd9c37..d0029aa 100644
--- a/drivers/staging/rtl8712/hal_init.c
+++ b/drivers/staging/rtl8712/hal_init.c
@@ -32,6 +32,7 @@
 #include <linux/device.h>
 #include <linux/usb/ch9.h>
 #include <linux/firmware.h>
+#include <linux/module.h>
 
 #include "osdep_service.h"
 #include "drv_types.h"
diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c
index 0a2f274..fb2e89c 100644
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -29,6 +29,7 @@
 #define _HCI_INTF_C_
 
 #include <linux/usb.h>
+#include <linux/module.h>
 
 #include "osdep_service.h"
 #include "drv_types.h"
-- 
1.7.6.3

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

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

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

[Stephen Rothwell]

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

Hi Paul,

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

drivers/staging/iio/adc/ad7746.c:345:8: error: 'S_IWUSR' undeclared here (not in a function)
drivers/staging/iio/adc/ad7746.c:436:8: error: 'S_IRUGO' undeclared here (not in a function)
drivers/staging/iio/adc/ad7746.c:681:19: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/staging/iio/adc/ad7746.c:778:1: warning: data definition has no type or storage class [enabled by default]
drivers/staging/iio/adc/ad7746.c:778:1: warning: type defaults to 'int' in declaration of 'MODULE_DEVICE_TABLE' [-Wimplicit-int]
drivers/staging/iio/adc/ad7746.c:778:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/staging/iio/adc/ad7746.c:799:15: error: expected declaration specifiers or '...' before string constant
drivers/staging/iio/adc/ad7746.c:800:20: error: expected declaration specifiers or '...' before string constant
drivers/staging/iio/adc/ad7746.c:801:16: error: expected declaration specifiers or '...' before string constant

Caused by commit 83e416f458d5 ("staging: iio: adc: Replace, rewrite
ad7745 from scratch") from the staging tree interacting with the module.h
split.

I added the following patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 4 Oct 2011 18:18:28 +1100
Subject: [PATCH] staging: iio: adc: add includes of module.h and stat.h

fixes these build problems:

drivers/staging/iio/adc/ad7746.c:345:8: error: 'S_IWUSR' undeclared here (not in a function)
drivers/staging/iio/adc/ad7746.c:436:8: error: 'S_IRUGO' undeclared here (not in a function)
drivers/staging/iio/adc/ad7746.c:681:19: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/staging/iio/adc/ad7746.c:778:1: warning: data definition has no type or storage class [enabled by default]
drivers/staging/iio/adc/ad7746.c:778:1: warning: type defaults to 'int' in declaration of 'MODULE_DEVICE_TABLE' [-Wimplicit-int]
drivers/staging/iio/adc/ad7746.c:778:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/staging/iio/adc/ad7746.c:799:15: error: expected declaration specifiers or '...' before string constant
drivers/staging/iio/adc/ad7746.c:800:20: error: expected declaration specifiers or '...' before string constant
drivers/staging/iio/adc/ad7746.c:801:16: error: expected declaration specifiers or '...' before string constant

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

diff --git a/drivers/staging/iio/adc/ad7746.c b/drivers/staging/iio/adc/ad7746.c
index 0b251ad..3fe0c17 100644
--- a/drivers/staging/iio/adc/ad7746.c
+++ b/drivers/staging/iio/adc/ad7746.c
@@ -13,6 +13,8 @@
 #include <linux/sysfs.h>
 #include <linux/i2c.h>
 #include <linux/delay.h>
+#include <linux/module.h>
+#include <linux/stat.h>
 
 #include "../iio.h"
 #include "../sysfs.h"
-- 
1.7.6.3

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

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

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

[Stephen Rothwell]

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

Hi Paul,

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

drivers/net/wireless/ath/ath6kl/cfg80211.c:25:26: error: expected ')' before 'uint'

Caused by commit 6bbc7c35ed0f ("ath6kl: Allow enabling of P2P support")
from the wireless tree interacting with the module.h split.

I added the following patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 4 Oct 2011 18:07:51 +1100
Subject: [PATCH] ath6kl: module_param needs the inclusion of moduleparam.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/wireless/ath/ath6kl/cfg80211.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index 8d9fbd4..c201445 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -14,6 +14,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <linux/moduleparam.h>
+
 #include "core.h"
 #include "cfg80211.h"
 #include "debug.h"
-- 
1.7.6.3

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

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

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

[Stephen Rothwell]

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

Hi Paul,

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

drivers/net/wireless/ath/ath6kl/debug.c:237:11: error: 'THIS_MODULE' undeclared here (not in a function)

Caused by commit 9a7308341b71 ("ath6kl: silence "invalid rate" warning")
from the wireless tree interacting with the module.h split.

I added this patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 4 Oct 2011 18:01:03 +1100
Subject: [PATCH] ath6kl: THIS_MODULES needs export.h

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

diff --git a/drivers/net/wireless/ath/ath6kl/debug.c b/drivers/net/wireless/ath/ath6kl/debug.c
index ba3f23d..7879b53 100644
--- a/drivers/net/wireless/ath/ath6kl/debug.c
+++ b/drivers/net/wireless/ath/ath6kl/debug.c
@@ -19,6 +19,7 @@
 #include <linux/circ_buf.h>
 #include <linux/fs.h>
 #include <linux/vmalloc.h>
+#include <linux/export.h>
 
 #include "debug.h"
 #include "target.h"
-- 
1.7.6.3

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

[Linus Walleij]

On Fri, Sep 30, 2011 at 3:19 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> On Fri, 30 Sep 2011 14:52:28 +0200 Linus Walleij <linus.walleij@linaro.org> wrote:
>>
>> On Fri, Sep 30, 2011 at 6:50 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> > I have applied the following patch for today (Linus, the
>> > drivers/pinctrl/pinmux.c part of this can be applied to your tree).
>>
>> Thanks a lot Stephen, applied and pushed this to the pinctrl tree!
>
> You can't apply the whole patch since export.h doe not exist outside the
> moduleh tree in linux-next (did you try to build it?).  As I said above
> only the drivers/pinctrl/pinmux.c part is applicable to your tree.

OK right, I fixed it up, sorry...

Thanks,
Linus Walleij

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

[Paul Gortmaker]

On Fri, Sep 30, 2011 at 12:50 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Paul,
>
> After merging the moduleh tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/pinctrl/core.c:80:1: warning: data definition has no type or storage class [enabled by default]
> drivers/pinctrl/core.c:80:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
> drivers/pinctrl/core.c:80:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/pinctrl/core.c:86:1: warning: data definition has no type or storage class [enabled by default]
> drivers/pinctrl/core.c:86:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
> drivers/pinctrl/core.c:86:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/pinctrl/core.c:152:1: warning: data definition has no type or storage class [enabled by default]
> drivers/pinctrl/core.c:152:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
> drivers/pinctrl/core.c:152:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/pinctrl/core.c:590:1: warning: data definition has no type or storage class [enabled by default]
> drivers/pinctrl/core.c:590:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
> drivers/pinctrl/core.c:590:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/pinctrl/core.c:614:1: warning: data definition has no type or storage class [enabled by default]
> drivers/pinctrl/core.c:614:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
> drivers/pinctrl/core.c:614:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/pinctrl/pinmux.c: In function 'pin_request':
> drivers/pinctrl/pinmux.c:143:2: error: implicit declaration of function 'try_module_get' [-Werror=implicit-function-declaration]
> drivers/pinctrl/pinmux.c: In function 'pin_free':
> drivers/pinctrl/pinmux.c:206:2: error: implicit declaration of function 'module_put' [-Werror=implicit-function-declaration]
> drivers/pinctrl/pinmux.c: At top level:
> drivers/pinctrl/pinmux.c:234:1: warning: data definition has no type or storage class [enabled by default]
> drivers/pinctrl/pinmux.c:234:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
> drivers/pinctrl/pinmux.c:234:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/pinctrl/pinmux.c:257:1: warning: data definition has no type or storage class [enabled by default]
> drivers/pinctrl/pinmux.c:257:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
> drivers/pinctrl/pinmux.c:257:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/pinctrl/pinmux.c:754:1: warning: data definition has no type or storage class [enabled by default]
> drivers/pinctrl/pinmux.c:754:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
> drivers/pinctrl/pinmux.c:754:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/pinctrl/pinmux.c:779:1: warning: data definition has no type or storage class [enabled by default]
> drivers/pinctrl/pinmux.c:779:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
> drivers/pinctrl/pinmux.c:779:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/pinctrl/pinmux.c:813:1: warning: data definition has no type or storage class [enabled by default]
> drivers/pinctrl/pinmux.c:813:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
> drivers/pinctrl/pinmux.c:813:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/pinctrl/pinmux.c:837:1: warning: data definition has no type or storage class [enabled by default]
> drivers/pinctrl/pinmux.c:837:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
> drivers/pinctrl/pinmux.c:837:1: warning: parameter names (without types) in function declaration [enabled by default]
>
>
> Caused by commit 05f20c997d73 ("drivers: create a pin control subsystem
> v8"), revelealed by the module.h split.
>
> I have applied the following patch for today (Linus, the
> drivers/pinctrl/pinmux.c part of this can be applied to your tree).

I've queued the remaining export.h part to core.c as a post-merge patch in the
modsplit-post-merge queue.

Paul.

>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 30 Sep 2011 14:39:04 +1000
> Subject: [PATCH] pinctrl: EXPORT_SYMBOL needs export.h
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/pinctrl/core.c   |    1 +
>  drivers/pinctrl/pinmux.c |    1 +
>  2 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
> index 4229628..f9263b2 100644
> --- a/drivers/pinctrl/core.c
> +++ b/drivers/pinctrl/core.c
> @@ -12,6 +12,7 @@
>  #define pr_fmt(fmt) "pinctrl core: " fmt
>
>  #include <linux/kernel.h>
> +#include <linux/export.h>
>  #include <linux/init.h>
>  #include <linux/device.h>
>  #include <linux/slab.h>
> diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
> index 37803f0..6b28f2b 100644
> --- a/drivers/pinctrl/pinmux.c
> +++ b/drivers/pinctrl/pinmux.c
> @@ -12,6 +12,7 @@
>  #define pr_fmt(fmt) "pinmux core: " fmt
>
>  #include <linux/kernel.h>
> +#include <linux/module.h>
>  #include <linux/init.h>
>  #include <linux/device.h>
>  #include <linux/slab.h>
> --
> 1.7.6.3
>
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
> --
> To unsubscribe from this list: send the line "unsubscribe linux-next" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

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

[Stephen Rothwell]

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

On Fri, 30 Sep 2011 14:52:28 +0200 Linus Walleij <linus.walleij@linaro.org> wrote:
>
> On Fri, Sep 30, 2011 at 6:50 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > I have applied the following patch for today (Linus, the
> > drivers/pinctrl/pinmux.c part of this can be applied to your tree).
> 
> Thanks a lot Stephen, applied and pushed this to the pinctrl tree!

You can't apply the whole patch since export.h doe not exist outside the
moduleh tree in linux-next (did you try to build it?).  As I said above
only the drivers/pinctrl/pinmux.c part is applicable to your tree.

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

[Linus Walleij]

On Fri, Sep 30, 2011 at 6:50 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> I have applied the following patch for today (Linus, the
> drivers/pinctrl/pinmux.c part of this can be applied to your tree).

Thanks a lot Stephen, applied and pushed this to the pinctrl tree!

Yours,
Linus Walleij

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

[Stephen Rothwell]

Hi Paul,

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

drivers/pinctrl/core.c:80:1: warning: data definition has no type or storage class [enabled by default]
drivers/pinctrl/core.c:80:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/pinctrl/core.c:80:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/pinctrl/core.c:86:1: warning: data definition has no type or storage class [enabled by default]
drivers/pinctrl/core.c:86:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/pinctrl/core.c:86:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/pinctrl/core.c:152:1: warning: data definition has no type or storage class [enabled by default]
drivers/pinctrl/core.c:152:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/pinctrl/core.c:152:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/pinctrl/core.c:590:1: warning: data definition has no type or storage class [enabled by default]
drivers/pinctrl/core.c:590:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/pinctrl/core.c:590:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/pinctrl/core.c:614:1: warning: data definition has no type or storage class [enabled by default]
drivers/pinctrl/core.c:614:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/pinctrl/core.c:614:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/pinctrl/pinmux.c: In function 'pin_request':
drivers/pinctrl/pinmux.c:143:2: error: implicit declaration of function 'try_module_get' [-Werror=implicit-function-declaration]
drivers/pinctrl/pinmux.c: In function 'pin_free':
drivers/pinctrl/pinmux.c:206:2: error: implicit declaration of function 'module_put' [-Werror=implicit-function-declaration]
drivers/pinctrl/pinmux.c: At top level:
drivers/pinctrl/pinmux.c:234:1: warning: data definition has no type or storage class [enabled by default]
drivers/pinctrl/pinmux.c:234:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/pinctrl/pinmux.c:234:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/pinctrl/pinmux.c:257:1: warning: data definition has no type or storage class [enabled by default]
drivers/pinctrl/pinmux.c:257:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/pinctrl/pinmux.c:257:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/pinctrl/pinmux.c:754:1: warning: data definition has no type or storage class [enabled by default]
drivers/pinctrl/pinmux.c:754:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/pinctrl/pinmux.c:754:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/pinctrl/pinmux.c:779:1: warning: data definition has no type or storage class [enabled by default]
drivers/pinctrl/pinmux.c:779:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/pinctrl/pinmux.c:779:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/pinctrl/pinmux.c:813:1: warning: data definition has no type or storage class [enabled by default]
drivers/pinctrl/pinmux.c:813:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/pinctrl/pinmux.c:813:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/pinctrl/pinmux.c:837:1: warning: data definition has no type or storage class [enabled by default]
drivers/pinctrl/pinmux.c:837:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
drivers/pinctrl/pinmux.c:837:1: warning: parameter names (without types) in function declaration [enabled by default]


Caused by commit 05f20c997d73 ("drivers: create a pin control subsystem
v8"), revelealed by the module.h split.

I have applied the following patch for today (Linus, the
drivers/pinctrl/pinmux.c part of this can be applied to your tree).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 30 Sep 2011 14:39:04 +1000
Subject: [PATCH] pinctrl: EXPORT_SYMBOL needs export.h

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

diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 4229628..f9263b2 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -12,6 +12,7 @@
 #define pr_fmt(fmt) "pinctrl core: " fmt
 
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/slab.h>
diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
index 37803f0..6b28f2b 100644
--- a/drivers/pinctrl/pinmux.c
+++ b/drivers/pinctrl/pinmux.c
@@ -12,6 +12,7 @@
 #define pr_fmt(fmt) "pinmux core: " fmt
 
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/slab.h>
-- 
1.7.6.3

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

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

[Stephen Rothwell]

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

Hu Paul,

On Wed, 28 Sep 2011 20:15:45 -0400 Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
>
> I figured, given the footprint of the module.h stuff, that it is entirely
> unfair for you to have to carry all those changes that aren't in the
> merge-base of the module.h branch.  So I've created a post merge
> commit series that I'll maintain -- which will have the commits that
> can't be in the module.h split branch, but will be required, once all
> the linux-next content has been merged.
> 
> If you clone:
> 
>    git://openlinux.windriver.com/people/paulg/modsplit-post-merge
> 
> you will get a repository of commits, and a series file (just like that used
> for longterm/stable queues) that you can deploy onto linux-next to get
> the changes you'd been carrying, plus new ones I found by testing on
> linux-next myself.
> 
> I'm hoping that you can plug pulls of this post-merge queue into your
> infrastructure in a way that moves the burden off you and onto me.

OK, that is easy, I will just use your set of patches instead of my set
of merge fixups - it just drops in.

Thanks for that.
-- 
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 failure after merge of the moduleh tree

[Paul Gortmaker]

On Wed, Sep 28, 2011 at 9:42 AM, Paul Gortmaker
<paul.gortmaker@windriver.com> wrote:
> On 11-09-28 04:41 AM, Stephen Rothwell wrote:
>> Hi Paul,
>>
>> After merging the moduleh tree, today's linux-next build (x86_64
>> allmodconfig) went on producing more failures (beyond those reported
>> earlier).  I have used the version of the moduleh tree from next-20110927
>> for today and will see if I have more stamina tomorrow.
>
> I will grab a copy of today's next and pick up where you left off, plowing
> into the new additions in next that are implicitly using module.h

Hi Stephen,

I figured, given the footprint of the module.h stuff, that it is entirely
unfair for you to have to carry all those changes that aren't in the
merge-base of the module.h branch.  So I've created a post merge
commit series that I'll maintain -- which will have the commits that
can't be in the module.h split branch, but will be required, once all
the linux-next content has been merged.

If you clone:

   git://openlinux.windriver.com/people/paulg/modsplit-post-merge

you will get a repository of commits, and a series file (just like that used
for longterm/stable queues) that you can deploy onto linux-next to get
the changes you'd been carrying, plus new ones I found by testing on
linux-next myself.  It replaces the following from your tree generation:

Applying: dm: use export.h instead of module.h where possible
Applying: block: bsg-lib.c needs export.h not module.h
Applying: PM: EXPORT_SYMBOL needs export.h
Applying: bcma: driver_chipcommon_pmu.c needs linux/export.h
Applying: powerpc/powernv: include export.h in hvc_opal.h for THIS_MODULE
Applying: PM QoS: include export.h in qos.c for EXPORT_SYMBOL
Applying: x86, amd: include linux/elf.h since we use stuff from asm/elf.h
Applying: block/mtip32xx: include module.h for its utilities
Applying: NFC: use of module facilities requires the inclusion of module.h
Applying: mmc: using mopdule_param requires the inclusion of moduleparam.h
Applying: rtlwifi: use of module_param requires the inclusion of moduleparam.h
Applying: wireless/ath6kl: use of module_param requires the inclusion
of moduleparam.h

I'm hoping that you can plug pulls of this post-merge queue into your
infrastructure in a way that moves the burden off you and onto me.

[I didn't have exact copies of what you were using for the top three, but
it wasn't hard to recreate them based on the oneline shortlog]

I took the most recent linux-next, reverted the merge of the "old" module
split content, merged the "new" split content, and then played the series
file to get a tree that will pass x86_64 allmodconfig with the linux-next
content all present.  I'll be doing additional build coverage over all the
other arch on that same tree overnight.

I also weeded out as many conflicts as I could by trivial relocations of
include files.  However, the following remain, and can't be easily killed
because some files only have one or two includes, and don't lend
themselves to relocations.   Here is the conflicts that remain:

    Conflicts:
        arch/arm/mach-bcmring/mm.c
        drivers/media/dvb/frontends/dibx000_common.c
        drivers/misc/altera-stapl/altera.c
        drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
        drivers/scsi/libfc/fc_lport.c
        drivers/staging/iio/accel/adis16220_core.c
        include/linux/dmaengine.h
        sound/soc/soc-io.c

Some of these you will already have in your rr-cache for sure.
They are all trivial conflicts in header lists.

Hopefully this makes things easier for you.  If you have any
other suggestions/tweaks that you'd like to see in order to
make your life easier, please do let me know.

Thanks again for putting up with the large footprint of this,
Paul.

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

[Kalle Valo]

On 09/28/2011 11:35 AM, Stephen Rothwell wrote:
> Hi Paul,
> 
> After merging the moduleh tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/net/wireless/ath/ath6kl/init.c:27:26: error: expected ')' before 'uint'
> 
> Caused by commit bdcd81707973 ("Add ath6kl cleaned up driver") from the
> net tree interacting with the module.h split up.
> 
> I have applied the following patch for today (which sould be applied to
> the net or wireless trees).
> 
> From 1875bfc8881cca3064c7d7fad024555fe1652926 Mon Sep 17 00:00:00 2001
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 28 Sep 2011 18:32:34 +1000
> Subject: [PATCH] wireless/ath6kl: use of module_param requires the inclusion
>  of moduleparam.h
> 
> Otheriwse the module.h split up fails like this:
> 
> drivers/net/wireless/ath/ath6kl/init.c:27:26: error: expected ')' before 'uint'

Thanks, I applied this to ath6kl.git (had to fix just one conflict).
Later this week I will send a pull request to John so that the patch
should get to the wireless tree soon.

Unless John wants to take the patch directly, of course.

Kalle

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

[Paul Gortmaker]

On 11-09-28 04:41 AM, Stephen Rothwell wrote:
> Hi Paul,
> 
> After merging the moduleh tree, today's linux-next build (x86_64
> allmodconfig) went on producing more failures (beyond those reported
> earlier).  I have used the version of the moduleh tree from next-20110927
> for today and will see if I have more stamina tomorrow.

I will grab a copy of today's next and pick up where you left off, plowing
into the new additions in next that are implicitly using module.h

Thanks again for doing more than I could have asked.
Paul.

> 

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

[Stephen Rothwell]

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

Hi Paul,

After merging the moduleh tree, today's linux-next build (x86_64
allmodconfig) went on producing more failures (beyond those reported
earlier).  I have used the version of the moduleh tree from next-20110927
for today and will see if I have more stamina tomorrow.

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

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

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

[Stephen Rothwell]

Hi Paul,

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

drivers/net/wireless/ath/ath6kl/init.c:27:26: error: expected ')' before 'uint'

Caused by commit bdcd81707973 ("Add ath6kl cleaned up driver") from the
net tree interacting with the module.h split up.

I have applied the following patch for today (which sould be applied to
the net or wireless trees).

>From 1875bfc8881cca3064c7d7fad024555fe1652926 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 18:32:34 +1000
Subject: [PATCH] wireless/ath6kl: use of module_param requires the inclusion
 of moduleparam.h

Otheriwse the module.h split up fails like this:

drivers/net/wireless/ath/ath6kl/init.c:27:26: error: expected ')' before 'uint'

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

diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c
index 9d10322..8552da0 100644
--- a/drivers/net/wireless/ath/ath6kl/init.c
+++ b/drivers/net/wireless/ath/ath6kl/init.c
@@ -15,6 +15,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <linux/moduleparam.h>
 #include <linux/mmc/sdio_func.h>
 #include "core.h"
 #include "cfg80211.h"
-- 
1.7.6.3

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

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

[Stephen Rothwell]

Hi Paul,

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

drivers/net/wireless/rtlwifi/debug.c:32:21: error: expected ')' before 'uint'
drivers/net/wireless/rtlwifi/debug.c:33:25: error: expected ')' before string constant

Caused by commit b5be7e4c8f7b ("rtlwifi: add module parameter to set
global debug level") from the net tree interacting with the module.h
split up.

I have applied the following patch for today (and it could be applied to
the net or wireless trees).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 18:21:47 +1000
Subject: [PATCH] rtlwifi: use of module_param requires the inclusion of
 moduleparam.h

Otherwise the module.h split up will fail like this:

drivers/net/wireless/rtlwifi/debug.c:32:21: error: expected ')' before 'uint'
drivers/net/wireless/rtlwifi/debug.c:33:25: error: expected ')' before string constant

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

diff --git a/drivers/net/wireless/rtlwifi/debug.c b/drivers/net/wireless/rtlwifi/debug.c
index b2f897a..e69aba9 100644
--- a/drivers/net/wireless/rtlwifi/debug.c
+++ b/drivers/net/wireless/rtlwifi/debug.c
@@ -26,6 +26,8 @@
  * Larry Finger <Larry.Finger@lwfinger.net>
  *****************************************************************************/
 
+#include <linux/moduleparam.h>
+
 #include "wifi.h"
 
 static unsigned int debug = DBG_EMERG;
-- 
1.7.6.3

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

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

[Stephen Rothwell]

Hi Paul,

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

drivers/mmc/core/debugfs.c:28:35: error: expected ')' before numeric constant

Caused by commit b5a62f8be3af ("mmc: add module param to set fault
injection attributes") from the mmc tree interacting with the module.h
split up.

I have applied the patch below for today (something similar could be
applied to the mmc tree).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 18:09:12 +1000
Subject: [PATCH] mmc: using mopdule_param requires the inclusion of
 moduleparam.h

Otherwise the module.h split up produces this error:

drivers/mmc/core/debugfs.c:28:35: error: expected ')' before numeric constant

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

diff --git a/drivers/mmc/core/debugfs.c b/drivers/mmc/core/debugfs.c
index 0a1e7cf..f9e9ff0 100644
--- a/drivers/mmc/core/debugfs.c
+++ b/drivers/mmc/core/debugfs.c
@@ -9,6 +9,7 @@
  */
 #include <linux/debugfs.h>
 #include <linux/fs.h>
+#include <linux/moduleparam.h>
 #include <linux/export.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
-- 
1.7.6.3

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

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

[Stephen Rothwell]

Hi Paul,

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

drivers/nfc/nfcwilink.c:318:12: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/nfc/nfcwilink.c:340:15: error: expected declaration specifiers or '...' before string constant
drivers/nfc/nfcwilink.c:340:1: warning: data definition has no type or storage class
drivers/nfc/nfcwilink.c:340:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/nfc/nfcwilink.c:340:15: warning: function declaration isn't a prototype
drivers/nfc/nfcwilink.c:341:20: error: expected declaration specifiers or '...' before string constant
drivers/nfc/nfcwilink.c:341:1: warning: data definition has no type or storage class
drivers/nfc/nfcwilink.c:341:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/nfc/nfcwilink.c:341:20: warning: function declaration isn't a prototype
drivers/nfc/nfcwilink.c:342:16: error: expected declaration specifiers or '...' before string constant
drivers/nfc/nfcwilink.c:342:1: warning: data definition has no type or storage class
drivers/nfc/nfcwilink.c:342:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/nfc/nfcwilink.c:342:16: warning: function declaration isn't a prototype

Caused by commit 93aead46428d ("NFC: driver for TI shared transport")
from the wireless tree interacting with the module.h split up.

I applied the patch below for today (which should be applied to the
wireless tree).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 17:56:29 +1000
Subject: [PATCH] NFC: use of module facilities requires the inclusion of
 module.h

Otherwise the module.h split up produces this build failure:

drivers/nfc/nfcwilink.c:318:12: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/nfc/nfcwilink.c:340:15: error: expected declaration specifiers or '...' before string constant
drivers/nfc/nfcwilink.c:340:1: warning: data definition has no type or storage class
drivers/nfc/nfcwilink.c:340:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/nfc/nfcwilink.c:340:15: warning: function declaration isn't a prototype
drivers/nfc/nfcwilink.c:341:20: error: expected declaration specifiers or '...' before string constant
drivers/nfc/nfcwilink.c:341:1: warning: data definition has no type or storage class
drivers/nfc/nfcwilink.c:341:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/nfc/nfcwilink.c:341:20: warning: function declaration isn't a prototype
drivers/nfc/nfcwilink.c:342:16: error: expected declaration specifiers or '...' before string constant
drivers/nfc/nfcwilink.c:342:1: warning: data definition has no type or storage class
drivers/nfc/nfcwilink.c:342:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/nfc/nfcwilink.c:342:16: warning: function declaration isn't a prototype

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

diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
index 5b0f1ff..06c3642 100644
--- a/drivers/nfc/nfcwilink.c
+++ b/drivers/nfc/nfcwilink.c
@@ -27,6 +27,7 @@
  *
  */
 #include <linux/platform_device.h>
+#include <linux/module.h>
 #include <linux/nfc.h>
 #include <net/nfc/nci.h>
 #include <net/nfc/nci_core.h>
-- 
1.7.6.3

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

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

[Borislav Petkov]

On Wed, Sep 28, 2011 at 03:42:14AM -0400, Stephen Rothwell wrote:
> Hi Paul,
> 
> After merging the moduleh tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> arch/x86/kernel/sys_x86_64.c:28:10: warning: 'enum align_flags' declared inside parameter list
> arch/x86/kernel/sys_x86_64.c:28:10: warning: its scope is only this definition or declaration, which is probably not what you want
> arch/x86/kernel/sys_x86_64.c:28:22: error: parameter 3 ('flags') has incomplete type
> arch/x86/kernel/sys_x86_64.c:27:15: warning: function declaration isn't a prototype
> arch/x86/kernel/sys_x86_64.c: In function 'align_addr':
> arch/x86/kernel/sys_x86_64.c:33:6: error: 'va_align' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c:33:6: note: each undeclared identifier is reported only once for each function it appears in
> arch/x86/kernel/sys_x86_64.c:33:2: error: implicit declaration of function 'mmap_is_ia32'
> arch/x86/kernel/sys_x86_64.c:39:17: error: 'ALIGN_VDSO' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c:48:16: error: 'ALIGN_TOPDOWN' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c: In function 'control_va_addr_alignment':
> arch/x86/kernel/sys_x86_64.c:59:6: error: 'va_align' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c:69:20: error: 'ALIGN_VA_32' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c:71:20: error: 'ALIGN_VA_64' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c: In function 'arch_get_unmapped_area_topdown':
> arch/x86/kernel/sys_x86_64.c:231:11: error: 'ALIGN_TOPDOWN' undeclared (first use in this function)
> 
> Presumably caused by commit dfb09f9b7ab0 ("x86, amd: Avoid cache aliasing
> penalties on AMD family 15h") from the tip tree interacting with the
> module.h split up.
> 
> I applied the following patch (which could be applied to the tip
> tree ...).
> 
> From 6b1212311c0728a7e3054e1f187e7c3b9f464bd5 Mon Sep 17 00:00:00 2001
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 28 Sep 2011 17:28:50 +1000
> Subject: [PATCH] x86, amd: include linux/elf.h since we use stuff from
>  asm/elf.h
> 
> The lack of this inclusion causes build erros after the module.h split up:
> 
> arch/x86/kernel/sys_x86_64.c:28:10: warning: 'enum align_flags' declared inside parameter list
> arch/x86/kernel/sys_x86_64.c:28:10: warning: its scope is only this definition or declaration, which is probably not what you want
> arch/x86/kernel/sys_x86_64.c:28:22: error: parameter 3 ('flags') has incomplete type
> arch/x86/kernel/sys_x86_64.c:27:15: warning: function declaration isn't a prototype
> arch/x86/kernel/sys_x86_64.c: In function 'align_addr':
> arch/x86/kernel/sys_x86_64.c:33:6: error: 'va_align' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c:33:6: note: each undeclared identifier is reported only once for each function it appears in
> arch/x86/kernel/sys_x86_64.c:33:2: error: implicit declaration of function 'mmap_is_ia32'
> arch/x86/kernel/sys_x86_64.c:39:17: error: 'ALIGN_VDSO' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c:48:16: error: 'ALIGN_TOPDOWN' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c: In function 'control_va_addr_alignment':
> arch/x86/kernel/sys_x86_64.c:59:6: error: 'va_align' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c:69:20: error: 'ALIGN_VA_32' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c:71:20: error: 'ALIGN_VA_64' undeclared (first use in this function)
> arch/x86/kernel/sys_x86_64.c: In function 'arch_get_unmapped_area_topdown':
> arch/x86/kernel/sys_x86_64.c:231:11: error: 'ALIGN_TOPDOWN' undeclared (first use in this function)
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  arch/x86/kernel/sys_x86_64.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
> index fe7d2da..0514890 100644
> --- a/arch/x86/kernel/sys_x86_64.c
> +++ b/arch/x86/kernel/sys_x86_64.c
> @@ -14,6 +14,7 @@
>  #include <linux/personality.h>
>  #include <linux/random.h>
>  #include <linux/uaccess.h>
> +#include <linux/elf.h>
>  
>  #include <asm/ia32.h>
>  #include <asm/syscalls.h>

Yep, it looks good, thanks Stephen. Btw, this is the second time
something like that happens as a result from the module split tree,
here's the first one: http://marc.info/?l=linux-kernel&m=131296515915227

It's a good thing we have linux-next! :-)

Thanks.

-- 
Regards/Gruss,
Boris.

Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach
GM: Alberto Bozzo
Reg: Dornach, Landkreis Muenchen
HRB Nr. 43632 WEEE Registernr: 129 19551

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

[Stephen Rothwell]

Hi Paul,

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

drivers/block/mtip32xx/mtip32xx.c:3542:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3542:1: warning: type defaults to 'int' in declaration of 'MODULE_DEVICE_TABLE'
drivers/block/mtip32xx/mtip32xx.c:3542:1: warning: parameter names (without types) in function declaration
drivers/block/mtip32xx/mtip32xx.c:3589:15: error: expected declaration specifiers or '...' before string constant
drivers/block/mtip32xx/mtip32xx.c:3589:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3589:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/block/mtip32xx/mtip32xx.c:3589:15: warning: function declaration isn't a prototype
drivers/block/mtip32xx/mtip32xx.c:3590:20: error: expected declaration specifiers or '...' before string constant
drivers/block/mtip32xx/mtip32xx.c:3590:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3590:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/block/mtip32xx/mtip32xx.c:3590:20: warning: function declaration isn't a prototype
drivers/block/mtip32xx/mtip32xx.c:3591:16: error: expected declaration specifiers or '...' before string constant
drivers/block/mtip32xx/mtip32xx.c:3591:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3591:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/block/mtip32xx/mtip32xx.c:3591:16: warning: function declaration isn't a prototype
drivers/block/mtip32xx/mtip32xx.c:3592:16: error: expected declaration specifiers or '...' before string constant
drivers/block/mtip32xx/mtip32xx.c:3592:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3592:1: warning: type defaults to 'int' in declaration of 'MODULE_VERSION'
drivers/block/mtip32xx/mtip32xx.c:3592:16: warning: function declaration isn't a prototype

Casued by commit 49fdf3a7c4cf ("block: Add driver for Micron RealSSD pcie
flash cards") from the block tree interacting with the module.h split up.

I applied the following patch for today (whcih should be applied to the
block tree ...).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 17:47:05 +1000
Subject: [PATCH] block/mtip32xx: include module.h for its utilities

The module.h split up produced thses errors/warnings:

drivers/block/mtip32xx/mtip32xx.c:3542:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3542:1: warning: type defaults to 'int' in declaration of 'MODULE_DEVICE_TABLE'
drivers/block/mtip32xx/mtip32xx.c:3542:1: warning: parameter names (without types) in function declaration
drivers/block/mtip32xx/mtip32xx.c:3589:15: error: expected declaration specifiers or '...' before string constant
drivers/block/mtip32xx/mtip32xx.c:3589:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3589:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/block/mtip32xx/mtip32xx.c:3589:15: warning: function declaration isn't a prototype
drivers/block/mtip32xx/mtip32xx.c:3590:20: error: expected declaration specifiers or '...' before string constant
drivers/block/mtip32xx/mtip32xx.c:3590:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3590:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/block/mtip32xx/mtip32xx.c:3590:20: warning: function declaration isn't a prototype
drivers/block/mtip32xx/mtip32xx.c:3591:16: error: expected declaration specifiers or '...' before string constant
drivers/block/mtip32xx/mtip32xx.c:3591:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3591:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/block/mtip32xx/mtip32xx.c:3591:16: warning: function declaration isn't a prototype
drivers/block/mtip32xx/mtip32xx.c:3592:16: error: expected declaration specifiers or '...' before string constant
drivers/block/mtip32xx/mtip32xx.c:3592:1: warning: data definition has no type or storage class
drivers/block/mtip32xx/mtip32xx.c:3592:1: warning: type defaults to 'int' in declaration of 'MODULE_VERSION'
drivers/block/mtip32xx/mtip32xx.c:3592:16: warning: function declaration isn't a prototype

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

diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index 3ec3d34..0e19eb5 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -33,6 +33,7 @@
 #include <linux/bio.h>
 #include <linux/dma-mapping.h>
 #include <linux/idr.h>
+#include <linux/module.h>
 #include <../drivers/ata/ahci.h>
 #include "mtip32xx.h"
 
-- 
1.7.6.3

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

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

[Stephen Rothwell]

Hi Paul,

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

arch/x86/kernel/sys_x86_64.c:28:10: warning: 'enum align_flags' declared inside parameter list
arch/x86/kernel/sys_x86_64.c:28:10: warning: its scope is only this definition or declaration, which is probably not what you want
arch/x86/kernel/sys_x86_64.c:28:22: error: parameter 3 ('flags') has incomplete type
arch/x86/kernel/sys_x86_64.c:27:15: warning: function declaration isn't a prototype
arch/x86/kernel/sys_x86_64.c: In function 'align_addr':
arch/x86/kernel/sys_x86_64.c:33:6: error: 'va_align' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:33:6: note: each undeclared identifier is reported only once for each function it appears in
arch/x86/kernel/sys_x86_64.c:33:2: error: implicit declaration of function 'mmap_is_ia32'
arch/x86/kernel/sys_x86_64.c:39:17: error: 'ALIGN_VDSO' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:48:16: error: 'ALIGN_TOPDOWN' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c: In function 'control_va_addr_alignment':
arch/x86/kernel/sys_x86_64.c:59:6: error: 'va_align' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:69:20: error: 'ALIGN_VA_32' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:71:20: error: 'ALIGN_VA_64' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c: In function 'arch_get_unmapped_area_topdown':
arch/x86/kernel/sys_x86_64.c:231:11: error: 'ALIGN_TOPDOWN' undeclared (first use in this function)

Presumably caused by commit dfb09f9b7ab0 ("x86, amd: Avoid cache aliasing
penalties on AMD family 15h") from the tip tree interacting with the
module.h split up.

I applied the following patch (which could be applied to the tip
tree ...).

>From 6b1212311c0728a7e3054e1f187e7c3b9f464bd5 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 17:28:50 +1000
Subject: [PATCH] x86, amd: include linux/elf.h since we use stuff from
 asm/elf.h

The lack of this inclusion causes build erros after the module.h split up:

arch/x86/kernel/sys_x86_64.c:28:10: warning: 'enum align_flags' declared inside parameter list
arch/x86/kernel/sys_x86_64.c:28:10: warning: its scope is only this definition or declaration, which is probably not what you want
arch/x86/kernel/sys_x86_64.c:28:22: error: parameter 3 ('flags') has incomplete type
arch/x86/kernel/sys_x86_64.c:27:15: warning: function declaration isn't a prototype
arch/x86/kernel/sys_x86_64.c: In function 'align_addr':
arch/x86/kernel/sys_x86_64.c:33:6: error: 'va_align' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:33:6: note: each undeclared identifier is reported only once for each function it appears in
arch/x86/kernel/sys_x86_64.c:33:2: error: implicit declaration of function 'mmap_is_ia32'
arch/x86/kernel/sys_x86_64.c:39:17: error: 'ALIGN_VDSO' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:48:16: error: 'ALIGN_TOPDOWN' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c: In function 'control_va_addr_alignment':
arch/x86/kernel/sys_x86_64.c:59:6: error: 'va_align' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:69:20: error: 'ALIGN_VA_32' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:71:20: error: 'ALIGN_VA_64' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c: In function 'arch_get_unmapped_area_topdown':
arch/x86/kernel/sys_x86_64.c:231:11: error: 'ALIGN_TOPDOWN' undeclared (first use in this function)

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

diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
index fe7d2da..0514890 100644
--- a/arch/x86/kernel/sys_x86_64.c
+++ b/arch/x86/kernel/sys_x86_64.c
@@ -14,6 +14,7 @@
 #include <linux/personality.h>
 #include <linux/random.h>
 #include <linux/uaccess.h>
+#include <linux/elf.h>
 
 #include <asm/ia32.h>
 #include <asm/syscalls.h>
-- 
1.7.6.3

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

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

[Stephen Rothwell]

Hi Paul,

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

drivers/tty/hvc/hvc_opal.c:244:12: error: 'THIS_MODULE' undeclared here (not in a function)

Caused by commit daea1175a9f0 ("powerpc/powernv: Support for OPAL
console") from the powerpc tree interacting with the module.h split up.

I have applied the below patch for today (and will carry it as a merge
fix up as necessary).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 17:07:24 +1000
Subject: [PATCH] powerpc/powernv: include export.h in hvc_opal.h for
 THIS_MODULE

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

diff --git a/drivers/tty/hvc/hvc_opal.c b/drivers/tty/hvc/hvc_opal.c
index 7b38512..ced26c8 100644
--- a/drivers/tty/hvc/hvc_opal.c
+++ b/drivers/tty/hvc/hvc_opal.c
@@ -28,6 +28,7 @@
 #include <linux/console.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
+#include <linux/export.h>
 
 #include <asm/hvconsole.h>
 #include <asm/prom.h>
-- 
1.7.6.3


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

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

[Felipe Balbi]

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

Hi,

On Fri, Sep 02, 2011 at 08:32:09PM +0200, Geert Uytterhoeven wrote:
> On Tue, Aug 23, 2011 at 11:59, Felipe Balbi <balbi@ti.com> wrote:
> > On Tue, Aug 23, 2011 at 03:08:54PM +1000, Stephen Rothwell wrote:
> >> After merging the moduleh tree, today's linux-next build (x86_64
> >> allmodconfig) failed like this:
> >>
> >> drivers/usb/dwc3/dwc3-pci.c: In function 'dwc3_pci_init':
> >> drivers/usb/dwc3/dwc3-pci.c:211:9: error: 'THIS_MODULE' undeclared (first use in this function)
> >>
> >> Caused by the interaction of the module.h split up with commit
> >> 72246da40f37 ("usb: Introduce DesignWare USB3 DRD Driver") from the usb
> >> tree.
> >>
> >> I have applied this patch for today (Greg, this should be applied to your
> >> tree):
> >>
> >> From: Stephen Rothwell <sfr@canb.auug.org.au>
> >> Date: Tue, 23 Aug 2011 15:05:25 +1000
> >> Subject: [PATCH] usb: include module.h in the DesignWare USB3 DRD driver
> >>
> >> Fixes this build error:
> >>
> >> drivers/usb/dwc3/dwc3-pci.c: In function 'dwc3_pci_init':
> >> drivers/usb/dwc3/dwc3-pci.c:211:9: error: 'THIS_MODULE' undeclared (first use in this function)
> >>
> >> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> >> ---
> >>  drivers/usb/dwc3/dwc3-pci.c |    1 +
> >>  1 files changed, 1 insertions(+), 0 deletions(-)
> >>
> >> diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
> >> index 2578595..e3b77d2 100644
> >> --- a/drivers/usb/dwc3/dwc3-pci.c
> >> +++ b/drivers/usb/dwc3/dwc3-pci.c
> >> @@ -38,6 +38,7 @@
> >>   */
> >>
> >>  #include <linux/kernel.h>
> >> +#include <linux/module.h>
> >
> > that was my fault, I didn't know about Paul's commit. Please Greg, apply
> > this to your tree:
> >
> > Acked-by: Felipe Balbi <balbi@ti.com>
> 
> The include should also be added to drivers/usb/dwc3/core.c and
> drivers/usb/dwc3/dwc3-omap.c,
> cfr. http://kisskb.ellerman.id.au/kisskb/buildresult/4491952/

that's true, here's a patch for that:

From 2b248785ee47dd16bb8fa544f80f7e2e51919e8c Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Mon, 5 Sep 2011 13:37:28 +0300
Subject: [PATCH] usb: dwc3: add module.h to dwc3-omap.c and core.c
Organization: Texas Instruments\n

We need that header because of THIS_MODULE.

Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 drivers/usb/dwc3/core.c      |    1 +
 drivers/usb/dwc3/dwc3-omap.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 6aa0913..64ba097 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -37,6 +37,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index ddbf38a..8a5d6ae 100644
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -37,6 +37,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-- 
1.7.6.396.ge0613

I'll send this to Greg once hera is back up and running.

-- 
balbi

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

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

[Geert Uytterhoeven]

On Tue, Aug 23, 2011 at 11:59, Felipe Balbi <balbi@ti.com> wrote:
> On Tue, Aug 23, 2011 at 03:08:54PM +1000, Stephen Rothwell wrote:
>> After merging the moduleh tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/usb/dwc3/dwc3-pci.c: In function 'dwc3_pci_init':
>> drivers/usb/dwc3/dwc3-pci.c:211:9: error: 'THIS_MODULE' undeclared (first use in this function)
>>
>> Caused by the interaction of the module.h split up with commit
>> 72246da40f37 ("usb: Introduce DesignWare USB3 DRD Driver") from the usb
>> tree.
>>
>> I have applied this patch for today (Greg, this should be applied to your
>> tree):
>>
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Tue, 23 Aug 2011 15:05:25 +1000
>> Subject: [PATCH] usb: include module.h in the DesignWare USB3 DRD driver
>>
>> Fixes this build error:
>>
>> drivers/usb/dwc3/dwc3-pci.c: In function 'dwc3_pci_init':
>> drivers/usb/dwc3/dwc3-pci.c:211:9: error: 'THIS_MODULE' undeclared (first use in this function)
>>
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> ---
>>  drivers/usb/dwc3/dwc3-pci.c |    1 +
>>  1 files changed, 1 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
>> index 2578595..e3b77d2 100644
>> --- a/drivers/usb/dwc3/dwc3-pci.c
>> +++ b/drivers/usb/dwc3/dwc3-pci.c
>> @@ -38,6 +38,7 @@
>>   */
>>
>>  #include <linux/kernel.h>
>> +#include <linux/module.h>
>
> that was my fault, I didn't know about Paul's commit. Please Greg, apply
> this to your tree:
>
> Acked-by: Felipe Balbi <balbi@ti.com>

The include should also be added to drivers/usb/dwc3/core.c and
drivers/usb/dwc3/dwc3-omap.c,
cfr. http://kisskb.ellerman.id.au/kisskb/buildresult/4491952/

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

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

[Felipe Balbi]

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

Hi,

On Tue, Aug 23, 2011 at 03:08:54PM +1000, Stephen Rothwell wrote:
> After merging the moduleh tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/usb/dwc3/dwc3-pci.c: In function 'dwc3_pci_init':
> drivers/usb/dwc3/dwc3-pci.c:211:9: error: 'THIS_MODULE' undeclared (first use in this function)
> 
> Caused by the interaction of the module.h split up with commit
> 72246da40f37 ("usb: Introduce DesignWare USB3 DRD Driver") from the usb
> tree.
> 
> I have applied this patch for today (Greg, this should be applied to your
> tree):
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 23 Aug 2011 15:05:25 +1000
> Subject: [PATCH] usb: include module.h in the DesignWare USB3 DRD driver
> 
> Fixes this build error:
> 
> drivers/usb/dwc3/dwc3-pci.c: In function 'dwc3_pci_init':
> drivers/usb/dwc3/dwc3-pci.c:211:9: error: 'THIS_MODULE' undeclared (first use in this function)
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/usb/dwc3/dwc3-pci.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
> index 2578595..e3b77d2 100644
> --- a/drivers/usb/dwc3/dwc3-pci.c
> +++ b/drivers/usb/dwc3/dwc3-pci.c
> @@ -38,6 +38,7 @@
>   */
>  
>  #include <linux/kernel.h>
> +#include <linux/module.h>

that was my fault, I didn't know about Paul's commit. Please Greg, apply
this to your tree:

Acked-by: Felipe Balbi <balbi@ti.com>

-- 
balbi

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

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

[Stephen Rothwell]

Hi Paul,

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

drivers/usb/dwc3/dwc3-pci.c: In function 'dwc3_pci_init':
drivers/usb/dwc3/dwc3-pci.c:211:9: error: 'THIS_MODULE' undeclared (first use in this function)

Caused by the interaction of the module.h split up with commit
72246da40f37 ("usb: Introduce DesignWare USB3 DRD Driver") from the usb
tree.

I have applied this patch for today (Greg, this should be applied to your
tree):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 23 Aug 2011 15:05:25 +1000
Subject: [PATCH] usb: include module.h in the DesignWare USB3 DRD driver

Fixes this build error:

drivers/usb/dwc3/dwc3-pci.c: In function 'dwc3_pci_init':
drivers/usb/dwc3/dwc3-pci.c:211:9: error: 'THIS_MODULE' undeclared (first use in this function)

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

diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index 2578595..e3b77d2 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -38,6 +38,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/platform_device.h>
-- 
1.7.5.4

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

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

[Stephen Rothwell]

Hi Paul,

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

arch/x86/kernel/cpu/amd.c: In function 'bsp_init_amd':
arch/x86/kernel/cpu/amd.c:437:3: error: 'va_align' undeclared (first use in this function)
arch/x86/kernel/cpu/amd.c:438:23: error: 'ALIGN_VA_32' undeclared (first use in this function)
arch/x86/kernel/cpu/amd.c:438:37: error: 'ALIGN_VA_64' undeclared (first use in this function)

Caused by the module.h split up intreacting with commit dfb09f9b7ab0
("x86, amd: Avoid cache aliasing penalties on AMD family 15h") from the
tip tree.

I have added the following patch for today (this, or something similar,
could be applied to the tip tree directly - the export.h include below
was added by the module.h splitup).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 10 Aug 2011 11:45:44 +1000
Subject: [PATCH] x86, amd: using va_align requires includeing elf.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/x86/kernel/cpu/amd.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index c17a8c4..a19a209 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -2,6 +2,7 @@
 #include <linux/bitops.h>
 #include <linux/export.h>
 #include <linux/mm.h>
+#include <linux/elf.h>
 
 #include <linux/io.h>
 #include <asm/processor.h>
-- 
1.7.5.4

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

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

[Greg KH]

On Wed, Aug 03, 2011 at 02:16:41PM +1000, Stephen Rothwell wrote:
> Hi Paul,
> 
> After merging the moduleh tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/staging/zcache/zcache-main.c:57:16: error: expected declaration specifiers or '...' before string constant
> drivers/staging/zcache/zcache-main.c:57:1: warning: data definition has no type or storage class
> drivers/staging/zcache/zcache-main.c:57:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
> drivers/staging/zcache/zcache-main.c:57:16: warning: function declaration isn't a prototype
> 
> Caused by commit fd6b68bbac9f ("staging: zcache: module is GPL")
> interacting with the module.h split up.
> 
> Greg, this file needs module.h even in upstream.

Ick, sorry about that, now fixed.

greg k-h

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

[Stephen Rothwell]

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

Hi Paul,

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

drivers/staging/zcache/zcache-main.c:57:16: error: expected declaration specifiers or '...' before string constant
drivers/staging/zcache/zcache-main.c:57:1: warning: data definition has no type or storage class
drivers/staging/zcache/zcache-main.c:57:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/staging/zcache/zcache-main.c:57:16: warning: function declaration isn't a prototype

Caused by commit fd6b68bbac9f ("staging: zcache: module is GPL")
interacting with the module.h split up.

Greg, this file needs module.h even in upstream.

I have 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: 490 bytes --]

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

[Stephen Rothwell]

Hi Paul,

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

drivers/md/persistent-data/dm-transaction-manager.c:137:1: warning: data definition has no type or storage class
drivers/md/persistent-data/dm-transaction-manager.c:137:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/md/persistent-data/dm-transaction-manager.c:137:1: warning: parameter names (without types) in function declaration
drivers/md/persistent-data/dm-transaction-manager.c:143:1: warning: data definition has no type or storage class
drivers/md/persistent-data/dm-transaction-manager.c:143:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/md/persistent-data/dm-transaction-manager.c:143:1: warning: parameter names (without types) in function declaration
drivers/md/persistent-data/dm-transaction-manager.c:158:1: warning: data definition has no type or storage class
drivers/md/persistent-data/dm-transaction-manager.c:158:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/md/persistent-data/dm-transaction-manager.c:158:1: warning: parameter names (without types) in function declaration
drivers/md/persistent-data/dm-transaction-manager.c:169:1: warning: data definition has no type or storage class
drivers/md/persistent-data/dm-transaction-manager.c:169:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/md/persistent-data/dm-transaction-manager.c:169:1: warning: parameter names (without types) in function declaration
drivers/md/persistent-data/dm-transaction-manager.c:292:1: warning: data definition has no type or storage class
drivers/md/persistent-data/dm-transaction-manager.c:292:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/md/persistent-data/dm-transaction-manager.c:292:1: warning: parameter names (without types) in function declaration
drivers/md/persistent-data/dm-transaction-manager.c:303:1: warning: data definition has no type or storage class
drivers/md/persistent-data/dm-transaction-manager.c:303:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/md/persistent-data/dm-transaction-manager.c:303:1: warning: parameter names (without types) in function declaration
drivers/md/persistent-data/dm-transaction-manager.c:402:1: warning: data definition has no type or storage class
drivers/md/persistent-data/dm-transaction-manager.c:402:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/md/persistent-data/dm-transaction-manager.c:402:1: warning: parameter names (without types) in function declaration
drivers/md/persistent-data/dm-transaction-manager.c:413:1: warning: data definition has no type or storage class
drivers/md/persistent-data/dm-transaction-manager.c:413:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/md/persistent-data/dm-transaction-manager.c:413:1: warning: parameter names (without types) in function declaration

Caused by an interaction between the module.h split and commit
90616764c64f ("The persistent-data library offers a re-usable framework
for the storage").

I have applied the below patch for today.  This file should really have
included module.h anyway ...

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 3 Aug 2011 14:06:38 +1000
Subject: [PATCH] dm: dm-transaction-manager.c needs export.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 .../md/persistent-data/dm-transaction-manager.c    |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/md/persistent-data/dm-transaction-manager.c b/drivers/md/persistent-data/dm-transaction-manager.c
index 4284921..bf9b61b 100644
--- a/drivers/md/persistent-data/dm-transaction-manager.c
+++ b/drivers/md/persistent-data/dm-transaction-manager.c
@@ -10,6 +10,7 @@
 #include "dm-persistent-data-internal.h"
 
 #include <linux/slab.h>
+#include <linux/export.h>
 #include <linux/device-mapper.h>
 
 #define DM_MSG_PREFIX "transaction manager"
-- 
1.7.5.4

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

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

[Alasdair G Kergon]

On Tue, Aug 02, 2011 at 03:13:06PM +1000, Stephen Rothwell wrote:
> This really is a bug in the original patch as you should explicitly
> include module.h if you are using the module facilities.

Fixed, thanks.

Alasdair

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

[Stephen Rothwell]

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

Hi Paul,

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

drivers/md/persistent-data/dm-block-manager.c:961:16: error: expected declaration specifiers or '...' before string constant
drivers/md/persistent-data/dm-block-manager.c:961:1: warning: data definition has no type or storage class
drivers/md/persistent-data/dm-block-manager.c:961:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/md/persistent-data/dm-block-manager.c:961:16: warning: function declaration isn't a prototype
drivers/md/persistent-data/dm-block-manager.c:962:15: error: expected declaration specifiers or '...' before string constant
drivers/md/persistent-data/dm-block-manager.c:962:1: warning: data definition has no type or storage class
drivers/md/persistent-data/dm-block-manager.c:962:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/md/persistent-data/dm-block-manager.c:962:15: warning: function declaration isn't a prototype
drivers/md/persistent-data/dm-block-manager.c:963:20: error: expected declaration specifiers or '...' before string constant
drivers/md/persistent-data/dm-block-manager.c:963:1: warning: data definition has no type or storage class
drivers/md/persistent-data/dm-block-manager.c:963:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/md/persistent-data/dm-block-manager.c:963:20: warning: function declaration isn't a prototype

Caused by an interaction between the module.h split up and commit
29a226094ff6 ("The persistent-data library offers a re-usable framework
for the storage") from the device-mapper tree.  Previous versions of this
file only needed export.h, but the current one needs module.h.  The
following is an incremental patch on top of the one that added export.h.
I will amend the other patch for tomorrow.

This really is a bug in the original patch as you should explicitly
include module.h if you are using the module facilities.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 2 Aug 2011 15:06:14 +1000
Subject: [PATCH] dm: include module.h since its facilities are used

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/md/persistent-data/dm-block-manager.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/md/persistent-data/dm-block-manager.c b/drivers/md/persistent-data/dm-block-manager.c
index 842bd66..b479953 100644
--- a/drivers/md/persistent-data/dm-block-manager.c
+++ b/drivers/md/persistent-data/dm-block-manager.c
@@ -9,7 +9,7 @@
 #include <linux/dm-io.h>
 #include <linux/slab.h>
 #include <linux/device-mapper.h>
-#include <linux/export.h>
+#include <linux/module.h>
 
 #define DM_MSG_PREFIX "block manager"
 
-- 
1.7.5.4

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

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

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

[Stephen Rothwell]

Hi Paul,

[I reported this on Friday, but this time I have a patch.]

After merging the moduleh tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/power/max8997_charger.c:185:12: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/power/max8997_charger.c:204:20: error: expected declaration specifiers or '...' before string constant
drivers/power/max8997_charger.c:204:1: warning: data definition has no type or storage class
drivers/power/max8997_charger.c:204:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/power/max8997_charger.c:204:20: warning: function declaration isn't a prototype
drivers/power/max8997_charger.c:205:15: error: expected declaration specifiers or '...' before string constant
drivers/power/max8997_charger.c:205:1: warning: data definition has no type or storage class
drivers/power/max8997_charger.c:205:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/power/max8997_charger.c:205:15: warning: function declaration isn't a prototype
drivers/power/max8997_charger.c:206:16: error: expected declaration specifiers or '...' before string constant
drivers/power/max8997_charger.c:206:1: warning: data definition has no type or storage class
drivers/power/max8997_charger.c:206:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/power/max8997_charger.c:206:16: warning: function declaration isn't a prototype

Caused by commit 149c077b4bd7 ("power_supply: Add charger driver for
MAX8997/8966") interacting with the modules.h split.

I have applied the following patch for today.  This file is now upstream,
so this patch could be applied to Linus' tree (or the battery tree where
this commit originated).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 1 Aug 2011 13:51:35 +1000
Subject: [PATCH] power_supply: max8997_charger.c need to include module.h

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

diff --git a/drivers/power/max8997_charger.c b/drivers/power/max8997_charger.c
index 7106b49..b093af9 100644
--- a/drivers/power/max8997_charger.c
+++ b/drivers/power/max8997_charger.c
@@ -23,6 +23,7 @@
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
+#include <linux/module.h>
 #include <linux/mfd/max8997.h>
 #include <linux/mfd/max8997-private.h>
 
-- 
1.7.5.4

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

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

[Stephen Rothwell]

Hi Paul,

On Sun, 31 Jul 2011 03:44:55 -0400 Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
>
> [linux-next: build failure after merge of the moduleh tree] On 29/07/2011 (Fri 17:06) Stephen Rothwell wrote:
> 
> > After merging the moduleh tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> > 
> > drivers/power/max8997_charger.c:205:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'

This driver is upstream today.  Randy wrote a patch for it (which I will
apply to my fixes tree today):

Date: Fri, 29 Jul 2011 21:11:43 -0700
From: Randy Dunlap <rdunlap@xenotime.net>
Subject: [PATCH -next] power: max8998_charger.c needs module.h

power/max8998_charger.c uses interfaces from linux/module.h,
so it should include that file.  This fixes build errors.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
 drivers/power/max8998_charger.c |    1 +
 1 file changed, 1 insertion(+)

--- linux-next-20110729.orig/drivers/power/max8998_charger.c
+++ linux-next-20110729/drivers/power/max8998_charger.c
@@ -20,6 +20,7 @@
  */
 
 #include <linux/err.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>


> [...]
> > drivers/regulator/aat2870-regulator.c:231:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
> [...]
> 
> The mmc ones I can fix; the power/regulator ones are not in master yet.
> But since they need module.h, the fix can be applied by their respective
> tree owner as well (vs. ones needing export.h -- which presents a minor
> chicken-and-egg problem).

OK, Randy wrote a fix patch for drivers/regulator/aat2870-regulator.c as
well (which he cc'd to the wrong people :-().  I have it reproduced below
and it should be applied to the mfd tree.   I will apply it myself for
today.

Date: Fri, 29 Jul 2011 12:43:13 -0700
From: Randy Dunlap <rdunlap@xenotime.net>
Subject: [PATCH -next] regulator: aat2870 needs module.h

aat2870-regulator.c needs to include linux/module.h to fix multiple
build errors.

drivers/regulator/aat2870-regulator.c:145: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/regulator/aat2870-regulator.c:230: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/regulator/aat2870-regulator.c:231: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/regulator/aat2870-regulator.c:232: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
 drivers/regulator/aat2870-regulator.c |    1 +
 1 file changed, 1 insertion(+)

--- linux-next-20110729.orig/drivers/regulator/aat2870-regulator.c
+++ linux-next-20110729/drivers/regulator/aat2870-regulator.c
@@ -22,6 +22,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/err.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/platform_device.h>


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

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

[Paul Gortmaker]

[linux-next: build failure after merge of the moduleh tree] On 29/07/2011 (Fri 15:25) Stephen Rothwell wrote:

> Hi Paul,
> 
> After merging the moduleh tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/media/rc/ir-raw.c: In function 'init_decoders':
> drivers/media/rc/ir-raw.c:354:2: error: implicit declaration of function 'request_module'
> 
> I have added this patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 29 Jul 2011 15:21:27 +1000
> Subject: [PATCH] ir-raw.c: include modules .h for request_module

Thanks, I've got this change in tree now.

P.

> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/media/rc/ir-raw.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/media/rc/ir-raw.c b/drivers/media/rc/ir-raw.c
> index 56adca8..ba817d2 100644
> --- a/drivers/media/rc/ir-raw.c
> +++ b/drivers/media/rc/ir-raw.c
> @@ -14,7 +14,7 @@
>  
>  #include <linux/kthread.h>
>  #include <linux/mutex.h>
> -#include <linux/export.h>
> +#include <linux/module.h>
>  #include <linux/sched.h>
>  #include <linux/freezer.h>
>  #include "rc-core-priv.h"
> -- 
> 1.7.5.4
> 
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/

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

[Paul Gortmaker]

[linux-next: build failure after merge of the moduleh tree] On 29/07/2011 (Fri 16:19) Stephen Rothwell wrote:

> Hi Paul,
> 
> After merging the moduleh tree, today's linux-next build (powerpc
> allnoconfig) failed like this:
> 

[...]

> 
> I have added this patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 29 Jul 2011 16:15:26 +1000
> Subject: [PATCH] powerpc32: include export.h for EXPORT_SYMBOL

Thanks, applied alongside the 4xx powerpc exports.

Paul.

> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  arch/powerpc/kernel/iomap.c          |    1 +
>  arch/powerpc/kernel/pci_32.c         |    1 +
>  arch/powerpc/mm/mmu_context_hash32.c |    1 +
>  arch/powerpc/mm/tlb_hash32.c         |    1 +
>  4 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/powerpc/kernel/iomap.c b/arch/powerpc/kernel/iomap.c
> index 1577434..2735872 100644
> --- a/arch/powerpc/kernel/iomap.c
> +++ b/arch/powerpc/kernel/iomap.c
> @@ -6,6 +6,7 @@
>  #include <linux/init.h>
>  #include <linux/pci.h>
>  #include <linux/mm.h>
> +#include <linux/export.h>
>  #include <asm/io.h>
>  #include <asm/pci-bridge.h>
>  
> diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
> index bb15451..fdd1a3d 100644
> --- a/arch/powerpc/kernel/pci_32.c
> +++ b/arch/powerpc/kernel/pci_32.c
> @@ -15,6 +15,7 @@
>  #include <linux/list.h>
>  #include <linux/of.h>
>  #include <linux/slab.h>
> +#include <linux/export.h>
>  
>  #include <asm/processor.h>
>  #include <asm/io.h>
> diff --git a/arch/powerpc/mm/mmu_context_hash32.c b/arch/powerpc/mm/mmu_context_hash32.c
> index d0ee554..78fef67 100644
> --- a/arch/powerpc/mm/mmu_context_hash32.c
> +++ b/arch/powerpc/mm/mmu_context_hash32.c
> @@ -24,6 +24,7 @@
>  
>  #include <linux/mm.h>
>  #include <linux/init.h>
> +#include <linux/export.h>
>  
>  #include <asm/mmu_context.h>
>  #include <asm/tlbflush.h>
> diff --git a/arch/powerpc/mm/tlb_hash32.c b/arch/powerpc/mm/tlb_hash32.c
> index 9a445f6..558e30c 100644
> --- a/arch/powerpc/mm/tlb_hash32.c
> +++ b/arch/powerpc/mm/tlb_hash32.c
> @@ -27,6 +27,7 @@
>  #include <linux/init.h>
>  #include <linux/highmem.h>
>  #include <linux/pagemap.h>
> +#include <linux/export.h>
>  
>  #include <asm/tlbflush.h>
>  #include <asm/tlb.h>
> -- 
> 1.7.5.4
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/

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

[Paul Gortmaker]

[linux-next: build failure after merge of the moduleh tree] On 29/07/2011 (Fri 17:06) Stephen Rothwell wrote:

> Hi Paul,
> 
> After merging the moduleh tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/mmc/host/sdhci-of-esdhc.c:110:1: warning: type defaults to 'int' in declaration of 'MODULE_DEVICE_TABLE'
[...]
> drivers/mmc/host/sdhci-of-hlwd.c:82:1: warning: type defaults to 'int' in declaration of 'MODULE_DEVICE_TABLE'
[...]
> drivers/power/max8997_charger.c:205:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
[...]
> drivers/regulator/aat2870-regulator.c:231:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
[...]

> I have just left these in fixed for now.  Please let me know if some of
> them can't be fixed in your tree and I will spin fixes for them in
> linux-next.

The mmc ones I can fix; the power/regulator ones are not in master yet.
But since they need module.h, the fix can be applied by their respective
tree owner as well (vs. ones needing export.h -- which presents a minor
chicken-and-egg problem).

Thanks,
Paul.

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

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

[Paul Gortmaker]

[linux-next: build failure after merge of the moduleh tree] On 29/07/2011 (Fri 16:48) Stephen Rothwell wrote:

> Hi Paul,
> 
> After merging the moduleh tree, today's linux-next build (powerpc
> ppx44x_defconfig) failed like this:
> 

[...]

> 
> I have added this patch for today:
> 
> From a2af733fcb26084a9a79e16d127e84900c9094e4 Mon Sep 17 00:00:00 2001
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 29 Jul 2011 16:42:37 +1000
> Subject: [PATCH] powerpc/44x: include export.h for EXPORT_SYMBOL

Thanks, added in the queue right beside the other powerpc export
commits.

Paul.

> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  arch/powerpc/include/asm/machdep.h |    1 +
>  arch/powerpc/kvm/44x.c             |    1 +
>  arch/powerpc/mm/dma-noncoherent.c  |    1 +
>  arch/powerpc/mm/tlb_nohash.c       |    1 +
>  arch/powerpc/platforms/44x/warp.c  |    1 +
>  arch/powerpc/sysdev/ppc4xx_msi.c   |    1 +
>  6 files changed, 6 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h
> index 47cacdd..7fa31ce 100644
> --- a/arch/powerpc/include/asm/machdep.h
> +++ b/arch/powerpc/include/asm/machdep.h
> @@ -12,6 +12,7 @@
>  #include <linux/seq_file.h>
>  #include <linux/init.h>
>  #include <linux/dma-mapping.h>
> +#include <linux/export.h>
>  
>  #include <asm/setup.h>
>  
> diff --git a/arch/powerpc/kvm/44x.c b/arch/powerpc/kvm/44x.c
> index da3a122..94fc29c 100644
> --- a/arch/powerpc/kvm/44x.c
> +++ b/arch/powerpc/kvm/44x.c
> @@ -20,6 +20,7 @@
>  #include <linux/kvm_host.h>
>  #include <linux/slab.h>
>  #include <linux/err.h>
> +#include <linux/export.h>
>  
>  #include <asm/reg.h>
>  #include <asm/cputable.h>
> diff --git a/arch/powerpc/mm/dma-noncoherent.c b/arch/powerpc/mm/dma-noncoherent.c
> index b42f76c..329be36 100644
> --- a/arch/powerpc/mm/dma-noncoherent.c
> +++ b/arch/powerpc/mm/dma-noncoherent.c
> @@ -30,6 +30,7 @@
>  #include <linux/types.h>
>  #include <linux/highmem.h>
>  #include <linux/dma-mapping.h>
> +#include <linux/export.h>
>  
>  #include <asm/tlbflush.h>
>  
> diff --git a/arch/powerpc/mm/tlb_nohash.c b/arch/powerpc/mm/tlb_nohash.c
> index d32ec64..ea9309e 100644
> --- a/arch/powerpc/mm/tlb_nohash.c
> +++ b/arch/powerpc/mm/tlb_nohash.c
> @@ -36,6 +36,7 @@
>  #include <linux/spinlock.h>
>  #include <linux/memblock.h>
>  #include <linux/of_fdt.h>
> +#include <linux/export.h>
>  
>  #include <asm/tlbflush.h>
>  #include <asm/tlb.h>
> diff --git a/arch/powerpc/platforms/44x/warp.c b/arch/powerpc/platforms/44x/warp.c
> index 8f77139..4cfa499 100644
> --- a/arch/powerpc/platforms/44x/warp.c
> +++ b/arch/powerpc/platforms/44x/warp.c
> @@ -18,6 +18,7 @@
>  #include <linux/of_gpio.h>
>  #include <linux/of_i2c.h>
>  #include <linux/slab.h>
> +#include <linux/export.h>
>  
>  #include <asm/machdep.h>
>  #include <asm/prom.h>
> diff --git a/arch/powerpc/sysdev/ppc4xx_msi.c b/arch/powerpc/sysdev/ppc4xx_msi.c
> index 367af02..1c2d7af 100644
> --- a/arch/powerpc/sysdev/ppc4xx_msi.c
> +++ b/arch/powerpc/sysdev/ppc4xx_msi.c
> @@ -27,6 +27,7 @@
>  #include <linux/msi.h>
>  #include <linux/of_platform.h>
>  #include <linux/interrupt.h>
> +#include <linux/export.h>
>  #include <asm/prom.h>
>  #include <asm/hw_irq.h>
>  #include <asm/ppc-pci.h>
> -- 
> 1.7.5.4
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/

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

[Paul Gortmaker]

[linux-next: build failure after merge of the moduleh tree] On 29/07/2011 (Fri 16:24) Stephen Rothwell wrote:

> Hi Paul,
> 
> After merging the moduleh tree, today's linux-next build (powerpc
> allnoconfig) failed like this:
> 
> kernel/ksysfs.c:161:11: error: 'S_IRUGO' undeclared here (not in a function)

I had a similar commit to this in tree already:

http://git.kernel.org/?p=linux/kernel/git/paulg/linux.git;a=commit;h=f82a90450b1cb580f3b7e8da7d8f41380b49145c

I must have added it after you had pulled your copy.
In any case, we shoudn't see this one again.

Thanks,
Paul.

> 
> Caused by commit d03b684f1773 ("kernel: Map most files to use export.h
> instead of module.h").
> 
> I added this patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 29 Jul 2011 16:21:37 +1000
> Subject: [PATCH] ksysfs: include stat.h for S_IRUGO
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  kernel/ksysfs.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
> index 6771de3..ece4547 100644
> --- a/kernel/ksysfs.c
> +++ b/kernel/ksysfs.c
> @@ -17,6 +17,7 @@
>  #include <linux/profile.h>
>  #include <linux/sched.h>
>  #include <linux/capability.h>
> +#include <linux/stat.h>
>  
>  #define KERNEL_ATTR_RO(_name) \
>  static struct kobj_attribute _name##_attr = __ATTR_RO(_name)
> -- 
> 1.7.5.4
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/

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

[Paul Gortmaker]

[linux-next: build failure after merge of the moduleh tree] On 29/07/2011 (Fri 17:09) Stephen Rothwell wrote:

> Hi Paul,
> 
> After merging the moduleh tree, today's linux-next build (sparc defconfig)
> failed like this:

[...]

> Again, I have left these unfixed in linux-next today.

Thanks, I've got these sparc32 items all fixed up; I wasn't thinking
that my allyesconfig would have excluded sparc32.  I've retested with
the two defconfigs, all[yes,no,mod]config to make sure I didn't miss
any other module.h cleanup fallout for sparc.

Paul.

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

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

[Paul Gortmaker]

[Re: linux-next: build failure after merge of the moduleh tree] On 29/07/2011 (Fri 15:37) Stephen Rothwell wrote:

[...]

> 
> Forget that, it was not the correct patch.  Instead I have added this
> patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 29 Jul 2011 15:34:32 +1000
> Subject: [PATCH] ir-raw: include kmod.h for request_module

Thanks, I just saw the same thing while retesting sparc on the latest
master content.  Applied to queue.

Paul.

> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/media/rc/ir-raw.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/media/rc/ir-raw.c b/drivers/media/rc/ir-raw.c
> index 56adca8..1ebaf5b 100644
> --- a/drivers/media/rc/ir-raw.c
> +++ b/drivers/media/rc/ir-raw.c
> @@ -15,6 +15,7 @@
>  #include <linux/kthread.h>
>  #include <linux/mutex.h>
>  #include <linux/export.h>
> +#include <linux/kmod.h>
>  #include <linux/sched.h>
>  #include <linux/freezer.h>
>  #include "rc-core-priv.h"
> -- 
> 1.7.5.4
> 
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/

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

[Paul Gortmaker]

[linux-next: build failure after merge of the moduleh tree] On 29/07/2011 (Fri 14:56) Stephen Rothwell wrote:

> Hi Paul,
> 
> After merging the moduleh tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> arch/powerpc/platforms/cell/spu_syscalls.c: In function 'spufs_calls_get':
> arch/powerpc/platforms/cell/spu_syscalls.c:42:2: error: implicit declaration of function 'try_module_get'
> arch/powerpc/platforms/cell/spu_syscalls.c: In function 'spufs_calls_put':
> arch/powerpc/platforms/cell/spu_syscalls.c:54:2: error: implicit declaration of function 'module_put'
> 
> Caused by commit f7f927183dba ("powerpc: various straight conversions
> from module.h --> export.h").  This file should not be modified.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 29 Jul 2011 14:53:16 +1000
> Subject: [PATCH] Partial revert of f7f927183dba

Thanks, I've dropped the offending hunk from its origin.

Paul.

> 
> "powerpc: various straight conversions from module.h --> export.h"
> 
> This file needs module.h.
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  arch/powerpc/platforms/cell/spu_syscalls.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/powerpc/platforms/cell/spu_syscalls.c b/arch/powerpc/platforms/cell/spu_syscalls.c
> index 60fc5ec..75530d9 100644
> --- a/arch/powerpc/platforms/cell/spu_syscalls.c
> +++ b/arch/powerpc/platforms/cell/spu_syscalls.c
> @@ -22,7 +22,7 @@
>   */
>  #include <linux/file.h>
>  #include <linux/fs.h>
> -#include <linux/export.h>
> +#include <linux/module.h>
>  #include <linux/syscalls.h>
>  #include <linux/rcupdate.h>
>  
> -- 
> 1.7.5.4
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/

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

[Paul Gortmaker]

[linux-next: build failure after merge of the moduleh tree] On 29/07/2011 (Fri 15:10) Stephen Rothwell wrote:

[...]

> I have added this commit for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 29 Jul 2011 15:03:54 +1000
> Subject: [PATCH] Partial revert of commit d03b684f1773

I've just fixed the original rather than introduce a revert,
since I'm moving ahead to the latest in order to at least
catch some of these new drivers that showed up in linux-next.

Thanks,
Paul.

> 
> "kernel: Map most files to use export.h instead of module.h"
> 
> This file need module.h
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  kernel/jump_label.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/kernel/jump_label.c b/kernel/jump_label.c
> index d636f85..a8ce450 100644
> --- a/kernel/jump_label.c
> +++ b/kernel/jump_label.c
> @@ -7,7 +7,7 @@
>   */
>  #include <linux/memory.h>
>  #include <linux/uaccess.h>
> -#include <linux/export.h>
> +#include <linux/module.h>
>  #include <linux/list.h>
>  #include <linux/slab.h>
>  #include <linux/sort.h>
> -- 
> 1.7.5.4
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/

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

[Dmitry Torokhov]

On Fri, Jul 29, 2011 at 03:10:44PM +1000, Stephen Rothwell wrote:
> Hi Paul,
> 
> After merging the moduleh tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/input/misc/kxtj9.c:644:1: warning: data definition has no type or storage class
> drivers/input/misc/kxtj9.c:644:1: warning: type defaults to 'int' in declaration of 'MODULE_DEVICE_TABLE'
> drivers/input/misc/kxtj9.c:644:1: warning: parameter names (without types) in function declaration
> drivers/input/misc/kxtj9.c:649:12: error: 'THIS_MODULE' undeclared here (not in a function)
> drivers/input/misc/kxtj9.c:669:20: error: expected declaration specifiers or '...' before string constant
> drivers/input/misc/kxtj9.c:669:1: warning: data definition has no type or storage class
> drivers/input/misc/kxtj9.c:669:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
> drivers/input/misc/kxtj9.c:669:20: warning: function declaration isn't a prototype
> drivers/input/misc/kxtj9.c:670:15: error: expected declaration specifiers or '...' before string constant
> drivers/input/misc/kxtj9.c:670:1: warning: data definition has no type or storage class
> drivers/input/misc/kxtj9.c:670:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
> drivers/input/misc/kxtj9.c:670:15: warning: function declaration isn't a prototype
> drivers/input/misc/kxtj9.c:671:16: error: expected declaration specifiers or '...' before string constant
> drivers/input/misc/kxtj9.c:671:1: warning: data definition has no type or storage class
> drivers/input/misc/kxtj9.c:671:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
> drivers/input/misc/kxtj9.c:671:16: warning: function declaration isn't a prototype
> drivers/input/misc/kxtj9.c: In function 'kxtj9_init':
> drivers/input/misc/kxtj9.c:660:1: warning: control reaches end of non-void function
> 
> I have added this patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 29 Jul 2011 15:06:46 +1000
> Subject: [PATCH] kxtj9: explictly include module.h
> 
> since some of its facilities are used.
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Applied, thanks Stephen.

-- 
Dmitry

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

[Stephen Rothwell]

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

Hi Paul,

After merging the moduleh tree, today's linux-next build (sparc defconfig)
failed like this:

arch/sparc/mm/extable.c: In function 'trim_init_extable':
arch/sparc/mm/extable.c:74:19: error: dereferencing pointer to incomplete type
arch/sparc/mm/extable.c:75:12: error: dereferencing pointer to incomplete type
arch/sparc/mm/extable.c:77:3: error: implicit declaration of function 'within_module_init'
arch/sparc/mm/extable.c:77:27: error: dereferencing pointer to incomplete type
arch/sparc/mm/extable.c:78:5: error: dereferencing pointer to incomplete type
arch/sparc/mm/extable.c:80:6: error: dereferencing pointer to incomplete type
arch/sparc/mm/extable.c: In function 'search_extables_range':
arch/sparc/mm/extable.c:93:2: error: implicit declaration of function 'search_exception_tables'
cc1: warnings being treated as errors
arch/sparc/mm/extable.c:93:8: error: assignment makes pointer from integer without a cast
cc1: warnings being treated as errors
arch/sparc/mm/highmem.c:66:1: error: data definition has no type or storage class
arch/sparc/mm/highmem.c:66:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/sparc/mm/highmem.c:66:1: error: parameter names (without types) in function declaration
arch/sparc/mm/highmem.c:111:1: error: data definition has no type or storage class
arch/sparc/mm/highmem.c:111:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/sparc/mm/highmem.c:111:1: error: parameter names (without types) in function declaration
cc1: warnings being treated as errors
arch/sparc/kernel/traps_32.c:426:1: error: data definition has no type or storage class
arch/sparc/kernel/traps_32.c:426:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/sparc/kernel/traps_32.c:426:1: error: parameter names (without types) in function declaration
cc1: warnings being treated as errors
arch/sparc/kernel/irq_32.c:53:1: error: data definition has no type or storage class
arch/sparc/kernel/irq_32.c:53:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/sparc/kernel/irq_32.c:53:1: error: parameter names (without types) in function declaration
arch/sparc/kernel/irq_32.c:69:1: error: data definition has no type or storage class
arch/sparc/kernel/irq_32.c:69:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/sparc/kernel/irq_32.c:69:1: error: parameter names (without types) in function declaration
arch/sparc/kernel/irq_32.c:86:1: error: data definition has no type or storage class
arch/sparc/kernel/irq_32.c:86:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/sparc/kernel/irq_32.c:86:1: error: parameter names (without types) in function declaration
cc1: warnings being treated as errors
arch/sparc/kernel/setup_32.c:203:1: error: data definition has no type or storage class
arch/sparc/kernel/setup_32.c:203:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/sparc/kernel/setup_32.c:203:1: error: parameter names (without types) in function declaration
arch/sparc/kernel/setup_32.c:332:1: error: data definition has no type or storage class
arch/sparc/kernel/setup_32.c:332:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/sparc/kernel/setup_32.c:332:1: error: parameter names (without types) in function declaration
cc1: warnings being treated as errors
arch/sparc/mm/generic_32.c:98:1: error: data definition has no type or storage class
arch/sparc/mm/generic_32.c:98:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/sparc/mm/generic_32.c:98:1: error: parameter names (without types) in function declaration

Again, I have left these unfixed in 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: 490 bytes --]

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

[Stephen Rothwell]

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

Hi Paul,

After merging the moduleh tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/mmc/host/sdhci-of-esdhc.c:110:1: warning: data definition has no type or storage class
drivers/mmc/host/sdhci-of-esdhc.c:110:1: warning: type defaults to 'int' in declaration of 'MODULE_DEVICE_TABLE'
drivers/mmc/host/sdhci-of-esdhc.c:110:1: warning: parameter names (without types) in function declaration
drivers/mmc/host/sdhci-of-esdhc.c:115:12: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/mmc/host/sdhci-of-esdhc.c:138:20: error: expected declaration specifiers or '...' before string constant
drivers/mmc/host/sdhci-of-esdhc.c:138:1: warning: data definition has no type or storage class
drivers/mmc/host/sdhci-of-esdhc.c:138:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/mmc/host/sdhci-of-esdhc.c:138:20: warning: function declaration isn't a prototype
drivers/mmc/host/sdhci-of-esdhc.c:139:15: error: expected declaration specifiers or '...' before string constant
drivers/mmc/host/sdhci-of-esdhc.c:139:1: warning: data definition has no type or storage class
drivers/mmc/host/sdhci-of-esdhc.c:139:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/mmc/host/sdhci-of-esdhc.c:139:15: warning: function declaration isn't a prototype
drivers/mmc/host/sdhci-of-esdhc.c:141:16: error: expected declaration specifiers or '...' before string constant
drivers/mmc/host/sdhci-of-esdhc.c:141:1: warning: data definition has no type or storage class
drivers/mmc/host/sdhci-of-esdhc.c:141:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/mmc/host/sdhci-of-esdhc.c:141:16: warning: function declaration isn't a prototype
drivers/mmc/host/sdhci-of-hlwd.c:82:1: warning: data definition has no type or storage class
drivers/mmc/host/sdhci-of-hlwd.c:82:1: warning: type defaults to 'int' in declaration of 'MODULE_DEVICE_TABLE'
drivers/mmc/host/sdhci-of-hlwd.c:82:1: warning: parameter names (without types) in function declaration
drivers/mmc/host/sdhci-of-hlwd.c:87:12: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/mmc/host/sdhci-of-hlwd.c:110:20: error: expected declaration specifiers or '...' before string constant
drivers/mmc/host/sdhci-of-hlwd.c:110:1: warning: data definition has no type or storage class
drivers/mmc/host/sdhci-of-hlwd.c:110:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/mmc/host/sdhci-of-hlwd.c:110:20: warning: function declaration isn't a prototype
drivers/mmc/host/sdhci-of-hlwd.c:111:15: error: expected declaration specifiers or '...' before string constant
drivers/mmc/host/sdhci-of-hlwd.c:111:1: warning: data definition has no type or storage class
drivers/mmc/host/sdhci-of-hlwd.c:111:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/mmc/host/sdhci-of-hlwd.c:111:15: warning: function declaration isn't a prototype
drivers/mmc/host/sdhci-of-hlwd.c:112:16: error: expected declaration specifiers or '...' before string constant
drivers/mmc/host/sdhci-of-hlwd.c:112:1: warning: data definition has no type or storage class
drivers/mmc/host/sdhci-of-hlwd.c:112:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/mmc/host/sdhci-of-hlwd.c:112:16: warning: function declaration isn't a prototype
drivers/power/max8997_charger.c:185:12: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/power/max8997_charger.c:204:20: error: expected declaration specifiers or '...' before string constant
drivers/power/max8997_charger.c:204:1: warning: data definition has no type or storage class
drivers/power/max8997_charger.c:204:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/power/max8997_charger.c:204:20: warning: function declaration isn't a prototype
drivers/power/max8997_charger.c:205:15: error: expected declaration specifiers or '...' before string constant
drivers/power/max8997_charger.c:205:1: warning: data definition has no type or storage class
drivers/power/max8997_charger.c:205:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/power/max8997_charger.c:205:15: warning: function declaration isn't a prototype
drivers/power/max8997_charger.c:206:16: error: expected declaration specifiers or '...' before string constant
drivers/power/max8997_charger.c:206:1: warning: data definition has no type or storage class
drivers/power/max8997_charger.c:206:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/power/max8997_charger.c:206:16: warning: function declaration isn't a prototype
drivers/power/max8998_charger.c:196:12: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/power/max8998_charger.c:215:20: error: expected declaration specifiers or '...' before string constant
drivers/power/max8998_charger.c:215:1: warning: data definition has no type or storage class
drivers/power/max8998_charger.c:215:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/power/max8998_charger.c:215:20: warning: function declaration isn't a prototype
drivers/power/max8998_charger.c:216:15: error: expected declaration specifiers or '...' before string constant
drivers/power/max8998_charger.c:216:1: warning: data definition has no type or storage class
drivers/power/max8998_charger.c:216:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/power/max8998_charger.c:216:15: warning: function declaration isn't a prototype
drivers/power/max8998_charger.c:217:16: error: expected declaration specifiers or '...' before string constant
drivers/power/max8998_charger.c:217:1: warning: data definition has no type or storage class
drivers/power/max8998_charger.c:217:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/power/max8998_charger.c:217:16: warning: function declaration isn't a prototype
drivers/power/max8998_charger.c:218:14: error: expected declaration specifiers or '...' before string constant
drivers/power/max8998_charger.c:218:1: warning: data definition has no type or storage class
drivers/power/max8998_charger.c:218:1: warning: type defaults to 'int' in declaration of 'MODULE_ALIAS'
drivers/power/max8998_charger.c:218:14: warning: function declaration isn't a prototype
drivers/regulator/aat2870-regulator.c:145:2: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/regulator/aat2870-regulator.c:212:3: error: initializer element is not constant
drivers/regulator/aat2870-regulator.c:212:3: error: (near initialization for 'aat2870_regulator_driver.driver.owner')
drivers/regulator/aat2870-regulator.c:230:20: error: expected declaration specifiers or '...' before string constant
drivers/regulator/aat2870-regulator.c:230:1: warning: data definition has no type or storage class
drivers/regulator/aat2870-regulator.c:230:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/regulator/aat2870-regulator.c:230:20: warning: function declaration isn't a prototype
drivers/regulator/aat2870-regulator.c:231:16: error: expected declaration specifiers or '...' before string constant
drivers/regulator/aat2870-regulator.c:231:1: warning: data definition has no type or storage class
drivers/regulator/aat2870-regulator.c:231:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/regulator/aat2870-regulator.c:231:16: warning: function declaration isn't a prototype
drivers/regulator/aat2870-regulator.c:232:15: error: expected declaration specifiers or '...' before string constant
drivers/regulator/aat2870-regulator.c:232:1: warning: data definition has no type or storage class
drivers/regulator/aat2870-regulator.c:232:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/regulator/aat2870-regulator.c:232:15: warning: function declaration isn't a prototype

I have just left these in fixed for now.  Please let me know if some of
them can't be fixed in your tree and I will spin fixes for them in
linux-next.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

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

[Stephen Rothwell]

Hi Paul,

After merging the moduleh tree, today's linux-next build (powerpc
ppx44x_defconfig) failed like this:

cc1: warnings being treated as errors
arch/powerpc/mm/tlb_nohash.c:137:1: error: data definition has no type or storage class
arch/powerpc/mm/tlb_nohash.c:137:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/mm/tlb_nohash.c:137:1: error: parameter names (without types) in function declaration
arch/powerpc/mm/tlb_nohash.c:156:1: error: data definition has no type or storage class
arch/powerpc/mm/tlb_nohash.c:156:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/mm/tlb_nohash.c:156:1: error: parameter names (without types) in function declaration
arch/powerpc/mm/tlb_nohash.c:301:1: error: data definition has no type or storage class
arch/powerpc/mm/tlb_nohash.c:301:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/mm/tlb_nohash.c:301:1: error: parameter names (without types) in function declaration
arch/powerpc/mm/tlb_nohash.c:315:1: error: data definition has no type or storage class
arch/powerpc/mm/tlb_nohash.c:315:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/mm/tlb_nohash.c:315:1: error: parameter names (without types) in function declaration
cc1: warnings being treated as errors
arch/powerpc/platforms/44x/sam440ep.c:59:1: error: data definition has no type or storage class
arch/powerpc/platforms/44x/sam440ep.c:59:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/platforms/44x/sam440ep.c:59:1: error: parameter names (without types) in function declaration
arch/powerpc/sysdev/ppc4xx_msi.c:265:15: error: 'THIS_MODULE' undeclared here (not in a function)
cc1: warnings being treated as errors
arch/powerpc/platforms/44x/ppc44x_simple.c:83:1: error: data definition has no type or storage class
arch/powerpc/platforms/44x/ppc44x_simple.c:83:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/platforms/44x/ppc44x_simple.c:83:1: error: parameter names (without types) in function declaration
arch/powerpc/mm/dma-noncoherent.c:250:1: error: data definition has no type or storage class
arch/powerpc/mm/dma-noncoherent.c:250:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/mm/dma-noncoherent.c:250:1: error: parameter names (without types) in function declaration
arch/powerpc/mm/dma-noncoherent.c:312:1: error: data definition has no type or storage class
arch/powerpc/mm/dma-noncoherent.c:312:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/mm/dma-noncoherent.c:312:1: error: parameter names (without types) in function declaration
arch/powerpc/mm/dma-noncoherent.c:343:1: error: data definition has no type or storage class
arch/powerpc/mm/dma-noncoherent.c:343:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/mm/dma-noncoherent.c:343:1: error: parameter names (without types) in function declaration
arch/powerpc/mm/dma-noncoherent.c:401:1: error: data definition has no type or storage class
arch/powerpc/mm/dma-noncoherent.c:401:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/mm/dma-noncoherent.c:401:1: error: parameter names (without types) in function declaration
cc1: warnings being treated as errors
arch/powerpc/platforms/44x/warp.c:57:1: error: data definition has no type or storage class
arch/powerpc/platforms/44x/warp.c:57:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/platforms/44x/warp.c:57:1: error: parameter names (without types) in function declaration
arch/powerpc/platforms/44x/warp.c:318:1: error: data definition has no type or storage classcc1: warnings being treated as errors
arch/powerpc/platforms/44x/virtex.c:54:1: error: data definition has no type or storage class
arch/powerpc/platforms/44x/virtex.c:54:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/platforms/44x/virtex.c:54:1: error: parameter names (without types) in function declaration
cc1: warnings being treated as errors
arch/powerpc/platforms/44x/ebony.c:62:1: error: data definition has no type or storage class
arch/powerpc/platforms/44x/ebony.c:62:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/platforms/44x/ebony.c:62:1: error: parameter names (without types) in function declaration
arch/powerpc/platforms/44x/warp.c:318:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/platforms/44x/warp.c:318:1: error: parameter names (without types) in function declaration
arch/powerpc/platforms/44x/warp.c:319:1: error: data definition has no type or storage class
arch/powerpc/platforms/44x/warp.c:319:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/platforms/44x/warp.c:319:1: error: parameter names (without types) in function declaration
cc1: warnings being treated as errors
arch/powerpc/platforms/44x/canyonlands.c:126:1: error: data definition has no type or storage class
arch/powerpc/platforms/44x/canyonlands.c:126:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/platforms/44x/canyonlands.c:126:1: error: parameter names (without types) in function declaration
arch/powerpc/kvm/44x.c: In function 'kvmppc_44x_init':
arch/powerpc/kvm/44x.c:168:59: error: 'THIS_MODULE' undeclared (first use in this function)
arch/powerpc/kvm/44x.c:169:1: error: control reaches end of non-void function

I have added this patch for today:

>From a2af733fcb26084a9a79e16d127e84900c9094e4 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 29 Jul 2011 16:42:37 +1000
Subject: [PATCH] powerpc/44x: include export.h for EXPORT_SYMBOL

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/powerpc/include/asm/machdep.h |    1 +
 arch/powerpc/kvm/44x.c             |    1 +
 arch/powerpc/mm/dma-noncoherent.c  |    1 +
 arch/powerpc/mm/tlb_nohash.c       |    1 +
 arch/powerpc/platforms/44x/warp.c  |    1 +
 arch/powerpc/sysdev/ppc4xx_msi.c   |    1 +
 6 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h
index 47cacdd..7fa31ce 100644
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@ -12,6 +12,7 @@
 #include <linux/seq_file.h>
 #include <linux/init.h>
 #include <linux/dma-mapping.h>
+#include <linux/export.h>
 
 #include <asm/setup.h>
 
diff --git a/arch/powerpc/kvm/44x.c b/arch/powerpc/kvm/44x.c
index da3a122..94fc29c 100644
--- a/arch/powerpc/kvm/44x.c
+++ b/arch/powerpc/kvm/44x.c
@@ -20,6 +20,7 @@
 #include <linux/kvm_host.h>
 #include <linux/slab.h>
 #include <linux/err.h>
+#include <linux/export.h>
 
 #include <asm/reg.h>
 #include <asm/cputable.h>
diff --git a/arch/powerpc/mm/dma-noncoherent.c b/arch/powerpc/mm/dma-noncoherent.c
index b42f76c..329be36 100644
--- a/arch/powerpc/mm/dma-noncoherent.c
+++ b/arch/powerpc/mm/dma-noncoherent.c
@@ -30,6 +30,7 @@
 #include <linux/types.h>
 #include <linux/highmem.h>
 #include <linux/dma-mapping.h>
+#include <linux/export.h>
 
 #include <asm/tlbflush.h>
 
diff --git a/arch/powerpc/mm/tlb_nohash.c b/arch/powerpc/mm/tlb_nohash.c
index d32ec64..ea9309e 100644
--- a/arch/powerpc/mm/tlb_nohash.c
+++ b/arch/powerpc/mm/tlb_nohash.c
@@ -36,6 +36,7 @@
 #include <linux/spinlock.h>
 #include <linux/memblock.h>
 #include <linux/of_fdt.h>
+#include <linux/export.h>
 
 #include <asm/tlbflush.h>
 #include <asm/tlb.h>
diff --git a/arch/powerpc/platforms/44x/warp.c b/arch/powerpc/platforms/44x/warp.c
index 8f77139..4cfa499 100644
--- a/arch/powerpc/platforms/44x/warp.c
+++ b/arch/powerpc/platforms/44x/warp.c
@@ -18,6 +18,7 @@
 #include <linux/of_gpio.h>
 #include <linux/of_i2c.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 
 #include <asm/machdep.h>
 #include <asm/prom.h>
diff --git a/arch/powerpc/sysdev/ppc4xx_msi.c b/arch/powerpc/sysdev/ppc4xx_msi.c
index 367af02..1c2d7af 100644
--- a/arch/powerpc/sysdev/ppc4xx_msi.c
+++ b/arch/powerpc/sysdev/ppc4xx_msi.c
@@ -27,6 +27,7 @@
 #include <linux/msi.h>
 #include <linux/of_platform.h>
 #include <linux/interrupt.h>
+#include <linux/export.h>
 #include <asm/prom.h>
 #include <asm/hw_irq.h>
 #include <asm/ppc-pci.h>
-- 
1.7.5.4

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

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

[Stephen Rothwell]

Hi Paul,

After merging the moduleh tree, today's linux-next build (powerpc
allnoconfig) failed like this:

kernel/ksysfs.c:161:11: error: 'S_IRUGO' undeclared here (not in a function)

Caused by commit d03b684f1773 ("kernel: Map most files to use export.h
instead of module.h").

I added this patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 29 Jul 2011 16:21:37 +1000
Subject: [PATCH] ksysfs: include stat.h for S_IRUGO

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

diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
index 6771de3..ece4547 100644
--- a/kernel/ksysfs.c
+++ b/kernel/ksysfs.c
@@ -17,6 +17,7 @@
 #include <linux/profile.h>
 #include <linux/sched.h>
 #include <linux/capability.h>
+#include <linux/stat.h>
 
 #define KERNEL_ATTR_RO(_name) \
 static struct kobj_attribute _name##_attr = __ATTR_RO(_name)
-- 
1.7.5.4

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

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

[Stephen Rothwell]

Hi Paul,

After merging the moduleh tree, today's linux-next build (powerpc
allnoconfig) failed like this:

arch/powerpc/mm/mmu_context_hash32.c:76:1: error: data definition has no type or storage class
arch/powerpc/mm/mmu_context_hash32.c:76:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
arch/powerpc/mm/mmu_context_hash32.c:76:1: error: parameter names (without types) in function declaration
arch/powerpc/mm/mmu_context_hash32.c:95:1: error: data definition has no type or storage class
arch/powerpc/mm/mmu_context_hash32.c:95:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
arch/powerpc/mm/mmu_context_hash32.c:95:1: error: parameter names (without types) in function declaration
cc1: warnings being treated as errors
arch/powerpc/mm/tlb_hash32.c:48:1: error: data definition has no type or storage class
arch/powerpc/mm/tlb_hash32.c:48:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/mm/tlb_hash32.c:48:1: error: parameter names (without types) in function declaration
arch/powerpc/mm/tlb_hash32.c:128:1: error: data definition has no type or storage class
arch/powerpc/mm/tlb_hash32.c:128:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/mm/tlb_hash32.c:128:1: error: parameter names (without types) in function declaration
arch/powerpc/mm/tlb_hash32.c:151:1: error: data definition has no type or storage class
arch/powerpc/mm/tlb_hash32.c:151:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/mm/tlb_hash32.c:151:1: error: parameter names (without types) in function declaration
arch/powerpc/mm/tlb_hash32.c:167:1: error: data definition has no type or storage class
arch/powerpc/mm/tlb_hash32.c:167:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/mm/tlb_hash32.c:167:1: error: parameter names (without types) in function declaration
arch/powerpc/mm/tlb_hash32.c:179:1: error: data definition has no type or storage class
arch/powerpc/mm/tlb_hash32.c:179:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/mm/tlb_hash32.c:179:1: error: parameter names (without types) in function declaration
cc1: warnings being treated as errors
arch/powerpc/kernel/pci_32.c:51:1: error: data definition has no type or storage class
arch/powerpc/kernel/pci_32.c:51:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
arch/powerpc/kernel/pci_32.c:51:1: error: parameter names (without types) in function declaration
arch/powerpc/kernel/pci_32.c:190:1: error: data definition has no type or storage class
arch/powerpc/kernel/pci_32.c:190:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/kernel/pci_32.c:190:1: error: parameter names (without types) in function declaration
cc1: warnings being treated as errors
arch/powerpc/kernel/iomap.c:36:1: error: data definition has no type or storage class
arch/powerpc/kernel/iomap.c:36:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/kernel/iomap.c:36:1: error: parameter names (without types) in function declaration
arch/powerpc/kernel/iomap.c:37:1: error: data definition has no type or storage class
arch/powerpc/kernel/iomap.c:37:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/kernel/iomap.c:37:1: error: parameter names (without types) in function declaration
arch/powerpc/kernel/iomap.c:38:1: error: data definition has no type or storage class
arch/powerpc/kernel/iomap.c:38:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/kernel/iomap.c:38:1: error: parameter names (without types) in function declaration
arch/powerpc/kernel/iomap.c:39:1: error: data definition has no type or storage class
arch/powerpc/kernel/iomap.c:39:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/kernel/iomap.c:39:1: error: parameter names (without types) in function declaration
arch/powerpc/kernel/iomap.c:40:1: error: data definition has no type or storage class
arch/powerpc/kernel/iomap.c:40:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/kernel/iomap.c:40:1: error: parameter names (without types) in function declaration
arch/powerpc/kernel/iomap.c:62:1: error: data definition has no type or storage class
arch/powerpc/kernel/iomap.c:62:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/kernel/iomap.c:62:1: error: parameter names (without types) in function declaration
arch/powerpc/kernel/iomap.c:63:1: error: data definition has no type or storage class
arch/powerpc/kernel/iomap.c:63:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/kernel/iomap.c:63:1: error: parameter names (without types) in function declaration
arch/powerpc/kernel/iomap.c:64:1: error: data definition has no type or storage class
arch/powerpc/kernel/iomap.c:64:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/kernel/iomap.c:64:1: error: parameter names (without types) in function declaration
arch/powerpc/kernel/iomap.c:65:1: error: data definition has no type or storage class
arch/powerpc/kernel/iomap.c:65:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/kernel/iomap.c:65:1: error: parameter names (without types) in function declaration
arch/powerpc/kernel/iomap.c:66:1: error: data definition has no type or storage class
arch/powerpc/kernel/iomap.c:66:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/kernel/iomap.c:66:1: error: parameter names (without types) in function declaration
arch/powerpc/kernel/iomap.c:88:1: error: data definition has no type or storage class
arch/powerpc/kernel/iomap.c:88:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/kernel/iomap.c:88:1: error: parameter names (without types) in function declaration
arch/powerpc/kernel/iomap.c:89:1: error: data definition has no type or storage class
arch/powerpc/kernel/iomap.c:89:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/kernel/iomap.c:89:1: error: parameter names (without types) in function declaration
arch/powerpc/kernel/iomap.c:90:1: error: data definition has no type or storage class
arch/powerpc/kernel/iomap.c:90:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/kernel/iomap.c:90:1: error: parameter names (without types) in function declaration
arch/powerpc/kernel/iomap.c:104:1: error: data definition has no type or storage class
arch/powerpc/kernel/iomap.c:104:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/kernel/iomap.c:104:1: error: parameter names (without types) in function declaration
arch/powerpc/kernel/iomap.c:105:1: error: data definition has no type or storage class
arch/powerpc/kernel/iomap.c:105:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/kernel/iomap.c:105:1: error: parameter names (without types) in function declaration
arch/powerpc/kernel/iomap.c:106:1: error: data definition has no type or storage class
arch/powerpc/kernel/iomap.c:106:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/kernel/iomap.c:106:1: error: parameter names (without types) in function declaration
arch/powerpc/kernel/iomap.c:117:1: error: data definition has no type or storage class
arch/powerpc/kernel/iomap.c:117:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/kernel/iomap.c:117:1: error: parameter names (without types) in function declaration
arch/powerpc/kernel/iomap.c:118:1: error: data definition has no type or storage class
arch/powerpc/kernel/iomap.c:118:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/kernel/iomap.c:118:1: error: parameter names (without types) in function declaration
arch/powerpc/kernel/iomap.c:147:1: error: data definition has no type or storage class
arch/powerpc/kernel/iomap.c:147:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/kernel/iomap.c:147:1: error: parameter names (without types) in function declaration
arch/powerpc/kernel/iomap.c:148:1: error: data definition has no type or storage class
arch/powerpc/kernel/iomap.c:148:1: error: type defaults to 'int' in declaration of 'EXPORT_SYMBOL'
arch/powerpc/kernel/iomap.c:148:1: error: parameter names (without types) in function declaration

I have added this patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 29 Jul 2011 16:15:26 +1000
Subject: [PATCH] powerpc32: include export.h for EXPORT_SYMBOL

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/powerpc/kernel/iomap.c          |    1 +
 arch/powerpc/kernel/pci_32.c         |    1 +
 arch/powerpc/mm/mmu_context_hash32.c |    1 +
 arch/powerpc/mm/tlb_hash32.c         |    1 +
 4 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/kernel/iomap.c b/arch/powerpc/kernel/iomap.c
index 1577434..2735872 100644
--- a/arch/powerpc/kernel/iomap.c
+++ b/arch/powerpc/kernel/iomap.c
@@ -6,6 +6,7 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/mm.h>
+#include <linux/export.h>
 #include <asm/io.h>
 #include <asm/pci-bridge.h>
 
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index bb15451..fdd1a3d 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -15,6 +15,7 @@
 #include <linux/list.h>
 #include <linux/of.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 
 #include <asm/processor.h>
 #include <asm/io.h>
diff --git a/arch/powerpc/mm/mmu_context_hash32.c b/arch/powerpc/mm/mmu_context_hash32.c
index d0ee554..78fef67 100644
--- a/arch/powerpc/mm/mmu_context_hash32.c
+++ b/arch/powerpc/mm/mmu_context_hash32.c
@@ -24,6 +24,7 @@
 
 #include <linux/mm.h>
 #include <linux/init.h>
+#include <linux/export.h>
 
 #include <asm/mmu_context.h>
 #include <asm/tlbflush.h>
diff --git a/arch/powerpc/mm/tlb_hash32.c b/arch/powerpc/mm/tlb_hash32.c
index 9a445f6..558e30c 100644
--- a/arch/powerpc/mm/tlb_hash32.c
+++ b/arch/powerpc/mm/tlb_hash32.c
@@ -27,6 +27,7 @@
 #include <linux/init.h>
 #include <linux/highmem.h>
 #include <linux/pagemap.h>
+#include <linux/export.h>
 
 #include <asm/tlbflush.h>
 #include <asm/tlb.h>
-- 
1.7.5.4

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

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

[Stephen Rothwell]

Hi Paul,

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

drivers/media/rc/ir-mce_kbd-decoder.c:446:16: error: expected declaration specifiers or '...' before string constant
drivers/media/rc/ir-mce_kbd-decoder.c:446:1: warning: data definition has no type or storage class
drivers/media/rc/ir-mce_kbd-decoder.c:446:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/media/rc/ir-mce_kbd-decoder.c:446:16: warning: function declaration isn't a prototype
drivers/media/rc/ir-mce_kbd-decoder.c:447:15: error: expected declaration specifiers or '...' before string constant
drivers/media/rc/ir-mce_kbd-decoder.c:447:1: warning: data definition has no type or storage class
drivers/media/rc/ir-mce_kbd-decoder.c:447:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/media/rc/ir-mce_kbd-decoder.c:447:15: warning: function declaration isn't a prototype
drivers/media/rc/ir-mce_kbd-decoder.c:448:20: error: expected declaration specifiers or '...' before string constant
drivers/media/rc/ir-mce_kbd-decoder.c:448:1: warning: data definition has no type or storage class
drivers/media/rc/ir-mce_kbd-decoder.c:448:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/media/rc/ir-mce_kbd-decoder.c:448:20: warning: function declaration isn't a prototype

Another interaction with the v4l-dvb tree.  Mauro, this patch could be
added to your tree as well:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 29 Jul 2011 15:39:51 +1000
Subject: [PATCH] ir-mce_kbd-decoder: include module.h for its facilities

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

diff --git a/drivers/media/rc/ir-mce_kbd-decoder.c b/drivers/media/rc/ir-mce_kbd-decoder.c
index fe96e54..3784ebf 100644
--- a/drivers/media/rc/ir-mce_kbd-decoder.c
+++ b/drivers/media/rc/ir-mce_kbd-decoder.c
@@ -14,6 +14,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
+#include <linux/module.h>
 
 #include "rc-core-priv.h"
 
-- 
1.7.5.4

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

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

[Stephen Rothwell]

Hi Paul,

On Fri, 29 Jul 2011 15:25:33 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the moduleh tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/media/rc/ir-raw.c: In function 'init_decoders':
> drivers/media/rc/ir-raw.c:354:2: error: implicit declaration of function 'request_module'
> 
> I have added this patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 29 Jul 2011 15:21:27 +1000
> Subject: [PATCH] ir-raw.c: include modules .h for request_module

Forget that, it was not the correct patch.  Instead I have added this
patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 29 Jul 2011 15:34:32 +1000
Subject: [PATCH] ir-raw: include kmod.h for request_module

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

diff --git a/drivers/media/rc/ir-raw.c b/drivers/media/rc/ir-raw.c
index 56adca8..1ebaf5b 100644
--- a/drivers/media/rc/ir-raw.c
+++ b/drivers/media/rc/ir-raw.c
@@ -15,6 +15,7 @@
 #include <linux/kthread.h>
 #include <linux/mutex.h>
 #include <linux/export.h>
+#include <linux/kmod.h>
 #include <linux/sched.h>
 #include <linux/freezer.h>
 #include "rc-core-priv.h"
-- 
1.7.5.4


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

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

[Stephen Rothwell]

Hi Paul,

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

drivers/media/video/ov5642.c:985:1: warning: data definition has no type or storage class
drivers/media/video/ov5642.c:985:1: warning: type defaults to 'int' in declaration of 'MODULE_DEVICE_TABLE'
drivers/media/video/ov5642.c:985:1: warning: parameter names (without types) in function declaration
drivers/media/video/ov5642.c: In function 'ov5642_mod_init':
drivers/media/video/ov5642.c:998:9: error: 'THIS_MODULE' undeclared (first use in this function)
drivers/media/video/ov5642.c:998:9: note: each undeclared identifier is reported only once for each function it appears in
drivers/media/video/ov5642.c: At top level:
drivers/media/video/ov5642.c:1009:20: error: expected declaration specifiers or '...' before string constant
drivers/media/video/ov5642.c:1009:1: warning: data definition has no type or storage class
drivers/media/video/ov5642.c:1009:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/media/video/ov5642.c:1009:20: warning: function declaration isn't a prototype
drivers/media/video/ov5642.c:1010:15: error: expected declaration specifiers or '...' before string constant
drivers/media/video/ov5642.c:1010:1: warning: data definition has no type or storage class
drivers/media/video/ov5642.c:1010:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/media/video/ov5642.c:1010:15: warning: function declaration isn't a prototype
drivers/media/video/ov5642.c:1011:16: error: expected declaration specifiers or '...' before string constant
drivers/media/video/ov5642.c:1011:1: warning: data definition has no type or storage class
drivers/media/video/ov5642.c:1011:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/media/video/ov5642.c:1011:16: warning: function declaration isn't a prototype
drivers/media/video/ov5642.c: In function 'ov5642_mod_init':
drivers/media/video/ov5642.c:999:1: warning: control reaches end of non-void function

This is an interaction with the v4l-dvb tree.

I have added the following patch for today (Mauro, this could go into
your tree):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 29 Jul 2011 15:28:23 +1000
Subject: [PATCH] ov5642: include module.h for its facilities

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

diff --git a/drivers/media/video/ov5642.c b/drivers/media/video/ov5642.c
index 3cdae97..349a4ad 100644
--- a/drivers/media/video/ov5642.c
+++ b/drivers/media/video/ov5642.c
@@ -18,6 +18,7 @@
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/videodev2.h>
+#include <linux/module.h>
 
 #include <media/soc_camera.h>
 #include <media/soc_mediabus.h>
-- 
1.7.5.4

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

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

[Stephen Rothwell]

Hi Paul,

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

drivers/media/rc/ir-raw.c: In function 'init_decoders':
drivers/media/rc/ir-raw.c:354:2: error: implicit declaration of function 'request_module'

I have added this patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 29 Jul 2011 15:21:27 +1000
Subject: [PATCH] ir-raw.c: include modules .h for request_module

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/media/rc/ir-raw.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/media/rc/ir-raw.c b/drivers/media/rc/ir-raw.c
index 56adca8..ba817d2 100644
--- a/drivers/media/rc/ir-raw.c
+++ b/drivers/media/rc/ir-raw.c
@@ -14,7 +14,7 @@
 
 #include <linux/kthread.h>
 #include <linux/mutex.h>
-#include <linux/export.h>
+#include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/freezer.h>
 #include "rc-core-priv.h"
-- 
1.7.5.4


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

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

[Stephen Rothwell]

Hi Paul,

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

drivers/input/misc/kxtj9.c:644:1: warning: data definition has no type or storage class
drivers/input/misc/kxtj9.c:644:1: warning: type defaults to 'int' in declaration of 'MODULE_DEVICE_TABLE'
drivers/input/misc/kxtj9.c:644:1: warning: parameter names (without types) in function declaration
drivers/input/misc/kxtj9.c:649:12: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/input/misc/kxtj9.c:669:20: error: expected declaration specifiers or '...' before string constant
drivers/input/misc/kxtj9.c:669:1: warning: data definition has no type or storage class
drivers/input/misc/kxtj9.c:669:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
drivers/input/misc/kxtj9.c:669:20: warning: function declaration isn't a prototype
drivers/input/misc/kxtj9.c:670:15: error: expected declaration specifiers or '...' before string constant
drivers/input/misc/kxtj9.c:670:1: warning: data definition has no type or storage class
drivers/input/misc/kxtj9.c:670:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
drivers/input/misc/kxtj9.c:670:15: warning: function declaration isn't a prototype
drivers/input/misc/kxtj9.c:671:16: error: expected declaration specifiers or '...' before string constant
drivers/input/misc/kxtj9.c:671:1: warning: data definition has no type or storage class
drivers/input/misc/kxtj9.c:671:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
drivers/input/misc/kxtj9.c:671:16: warning: function declaration isn't a prototype
drivers/input/misc/kxtj9.c: In function 'kxtj9_init':
drivers/input/misc/kxtj9.c:660:1: warning: control reaches end of non-void function

I have added this patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 29 Jul 2011 15:06:46 +1000
Subject: [PATCH] kxtj9: explictly include module.h

since some of its facilities are used.

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

diff --git a/drivers/input/misc/kxtj9.c b/drivers/input/misc/kxtj9.c
index c456f63..783597a 100644
--- a/drivers/input/misc/kxtj9.c
+++ b/drivers/input/misc/kxtj9.c
@@ -21,6 +21,7 @@
 #include <linux/i2c.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/input/kxtj9.h>
 #include <linux/input-polldev.h>
-- 
1.7.5.4

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

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

[Stephen Rothwell]

Hi Paul,

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

kernel/jump_label.c: In function '__jump_label_mod_text_reserved':
kernel/jump_label.c:171:2: error: implicit declaration of function '__module_text_address'
kernel/jump_label.c:171:6: warning: assignment makes pointer from integer without a cast
kernel/jump_label.c:175:2: warning: comparison between pointer and integer
kernel/jump_label.c:177:39: error: dereferencing pointer to incomplete type
kernel/jump_label.c:178:8: error: dereferencing pointer to incomplete type
kernel/jump_label.c:178:28: error: dereferencing pointer to incomplete type
kernel/jump_label.c: In function '__jump_label_mod_update':
kernel/jump_label.c:190:10: error: dereferencing pointer to incomplete type
kernel/jump_label.c:190:28: error: dereferencing pointer to incomplete type
kernel/jump_label.c: In function 'jump_label_apply_nops':
kernel/jump_label.c:206:37: error: dereferencing pointer to incomplete type
kernel/jump_label.c:207:49: error: dereferencing pointer to incomplete type
kernel/jump_label.c: In function 'jump_label_add_module':
kernel/jump_label.c:220:37: error: dereferencing pointer to incomplete type
kernel/jump_label.c:221:49: error: dereferencing pointer to incomplete type
kernel/jump_label.c:238:3: error: implicit declaration of function '__module_address'
kernel/jump_label.c:238:35: warning: comparison between pointer and integer
kernel/jump_label.c: In function 'jump_label_del_module':
kernel/jump_label.c:264:37: error: dereferencing pointer to incomplete type
kernel/jump_label.c:265:49: error: dereferencing pointer to incomplete type
kernel/jump_label.c:276:35: warning: comparison between pointer and integer
kernel/jump_label.c: In function 'jump_label_invalidate_module_init':
kernel/jump_label.c:296:37: error: dereferencing pointer to incomplete type
kernel/jump_label.c:297:49: error: dereferencing pointer to incomplete type
kernel/jump_label.c:301:3: error: implicit declaration of function 'within_module_init'
kernel/jump_label.c: In function 'jump_label_module_notify':
kernel/jump_label.c:314:7: error: 'MODULE_STATE_COMING' undeclared (first use in this function)
kernel/jump_label.c:314:7: note: each undeclared identifier is reported only once for each function it appears in
kernel/jump_label.c:321:7: error: 'MODULE_STATE_GOING' undeclared (first use in this function)
kernel/jump_label.c:326:7: error: 'MODULE_STATE_LIVE' undeclared (first use in this function)
kernel/jump_label.c: In function 'jump_label_init_module':
kernel/jump_label.c:343:2: error: implicit declaration of function 'register_module_notifier'
kernel/jump_label.c: In function 'jump_label_update':
kernel/jump_label.c:381:23: warning: initialization makes pointer from integer without a cast
kernel/jump_label.c:386:13: error: dereferencing pointer to incomplete type
kernel/jump_label.c:386:33: error: dereferencing pointer to incomplete type
kernel/jump_label.c: In function '__jump_label_mod_text_reserved':
kernel/jump_label.c:180:1: warning: control reaches end of non-void function

Caused by commit d03b684f1773 ("kernel: Map most files to use export.h
instead of module.h").

I have added this commit for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 29 Jul 2011 15:03:54 +1000
Subject: [PATCH] Partial revert of commit d03b684f1773

"kernel: Map most files to use export.h instead of module.h"

This file need module.h

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

diff --git a/kernel/jump_label.c b/kernel/jump_label.c
index d636f85..a8ce450 100644
--- a/kernel/jump_label.c
+++ b/kernel/jump_label.c
@@ -7,7 +7,7 @@
  */
 #include <linux/memory.h>
 #include <linux/uaccess.h>
-#include <linux/export.h>
+#include <linux/module.h>
 #include <linux/list.h>
 #include <linux/slab.h>
 #include <linux/sort.h>
-- 
1.7.5.4

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

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

[Stephen Rothwell]

Hi Paul,

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

arch/powerpc/platforms/cell/spu_syscalls.c: In function 'spufs_calls_get':
arch/powerpc/platforms/cell/spu_syscalls.c:42:2: error: implicit declaration of function 'try_module_get'
arch/powerpc/platforms/cell/spu_syscalls.c: In function 'spufs_calls_put':
arch/powerpc/platforms/cell/spu_syscalls.c:54:2: error: implicit declaration of function 'module_put'

Caused by commit f7f927183dba ("powerpc: various straight conversions
from module.h --> export.h").  This file should not be modified.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 29 Jul 2011 14:53:16 +1000
Subject: [PATCH] Partial revert of f7f927183dba

"powerpc: various straight conversions from module.h --> export.h"

This file needs module.h.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/powerpc/platforms/cell/spu_syscalls.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/platforms/cell/spu_syscalls.c b/arch/powerpc/platforms/cell/spu_syscalls.c
index 60fc5ec..75530d9 100644
--- a/arch/powerpc/platforms/cell/spu_syscalls.c
+++ b/arch/powerpc/platforms/cell/spu_syscalls.c
@@ -22,7 +22,7 @@
  */
 #include <linux/file.h>
 #include <linux/fs.h>
-#include <linux/export.h>
+#include <linux/module.h>
 #include <linux/syscalls.h>
 #include <linux/rcupdate.h>
 
-- 
1.7.5.4

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