linux-kernel - linux-next: build failure after merge of the final tree (moduleh/trivial trees 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:	Tue, 6 Mar 2012 17:58:44 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Paul Gortmaker <paul.gortmaker@...driver.com>,
	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jesper Juhl <jj@...osbits.net>
Subject: linux-next: build failure after merge of the final tree
 (moduleh/trivial trees related)

Hi all,

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

drivers/power/max8998_charger.c:198:12: error: 'THIS_MODULE' undeclared here (not in a function)
drivers/power/max8998_charger.c:207:20: error: expected declaration specifiers or '...' before string constant
drivers/power/max8998_charger.c:208:15: error: expected declaration specifiers or '...' before string constant
drivers/power/max8998_charger.c:209:16: error: expected declaration specifiers or '...' before string constant
drivers/power/max8998_charger.c:210:14: error: expected declaration specifiers or '...' before string constant

Caused by commit 13ae246db4a0 ("includecheck: delete any duplicate
instances of module.h") from the moduleh tree interacting with commit
ce64b8d85de9 ("power, max8998: Include linux/module.h just once in
drivers/power/max8998_charger.c") from the trivial tree.

They both removed different includes of module.h leaving none.

I have applied the following patch for today:

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Tue, 6 Mar 2012 17:56:45 +1100
Subject: [PATCH] power, max8998: we need at least one include of module.h

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

diff --git a/drivers/power/max8998_charger.c b/drivers/power/max8998_charger.c
index d6a8c16..5c5f281 100644
--- a/drivers/power/max8998_charger.c
+++ b/drivers/power/max8998_charger.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <linux/module.h>
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
-- 
1.7.9.1

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

Content of type "application/pgp-signature" skipped