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

[PATCH] zcache: include module.h for MODULE_LICENSE

[Thadeu Lima de Souza Cascardo]

The oncoming cleanup of module.h usage requires the explicit inclusion
of module.h when it was otherwise being included indirectly. Otherwise,
building zcache will fail.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
---
 drivers/staging/zcache/zcache-main.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/staging/zcache/zcache-main.c b/drivers/staging/zcache/zcache-main.c
index a58a03f..66469ac 100644
--- a/drivers/staging/zcache/zcache-main.c
+++ b/drivers/staging/zcache/zcache-main.c
@@ -19,6 +19,7 @@
  *   http://marc.info/?l=linux-mm&m=127811271605009
  */
 
+#include <linux/module.h>
 #include <linux/cpu.h>
 #include <linux/highmem.h>
 #include <linux/list.h>
-- 
1.7.5.4

Re: [PATCH] zcache: include module.h for MODULE_LICENSE

[Greg KH]

On Wed, Aug 03, 2011 at 11:00:40AM -0300, Thadeu Lima de Souza Cascardo wrote:
> The oncoming cleanup of module.h usage requires the explicit inclusion
> of module.h when it was otherwise being included indirectly. Otherwise,
> building zcache will fail.
> 
> Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>

Thanks, but you forgot the Reported-by: tag for this patch that you
should have added.  I've added it this time but please be more careful
next time.

greg k-h

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