linux-kernel - linux-next: build failure after merge of the final tree (moduleh tree related)

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 29 Sep 2011 16:40:28 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Paul Gortmaker <paul.gortmaker@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: build failure after merge of the final tree (moduleh
 tree related)

Hi all,

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

drivers/staging/cxt1e1/linux.c:113:32: error: expected ')' before 'int'
drivers/staging/cxt1e1/linux.c:117:30: error: expected ')' before 'int'
drivers/staging/cxt1e1/linux.c:121:30: error: expected ')' before 'int'
drivers/staging/cxt1e1/linux.c:125:31: error: expected ')' before 'int'
drivers/staging/cxt1e1/linux.c:129:31: error: expected ')' before 'int'

Caused by the module split.  The fix in the moduleh tree (commit
6eee8b750254 ("staging: Add module.h to more drivers implicitly using
i")) is incorrect in that module.h has been included too late.

I have applied the following patch for today.

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Thu, 29 Sep 2011 16:36:21 +1000
Subject: [PATCH] staging: move the module.h include in cxt1e1/linux.c

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 drivers/staging/cxt1e1/linux.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/cxt1e1/linux.c b/drivers/staging/cxt1e1/linux.c
index e7029af..6e574fe 100644
--- a/drivers/staging/cxt1e1/linux.c
+++ b/drivers/staging/cxt1e1/linux.c
@@ -15,6 +15,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/types.h>
+#include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/hdlc.h>
 #include <linux/if_arp.h>
@@ -163,7 +164,6 @@ mkret (int bsd)
 
 /***************************************************************************/
 #include <linux/workqueue.h>
-#include <linux/module.h>
 
 /***
  * One workqueue (wq) per port (since musycc allows simultaneous group
-- 
1.7.6.3

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/