linux-kernel - linux-next: build failure after merge of the final tree (rr 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]

Message-Id: <20100604144933.86b3f2a8.sfr@canb.auug.org.au>
Date:	Fri, 4 Jun 2010 14:49:33 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Rusty Russell <rusty@...tcorp.com.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: build failure after merge of the final tree (rr tree
 related)

Hi Rusty,

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

kernel/module.c: In function 'post_relocation':
kernel/module.c:2526: error: 'struct module' has no member named 'percpu_size'

Caused by commit fc77407bc287ed250f9355fda435df5f78b45885 ("module:
simplify per-cpu handling a little").

This build has CONFIG_SMP not set ... I applied the following patch:

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Fri, 4 Jun 2010 14:41:21 +1000
Subject: [PATCH] module: don't reference percpu stuff in UP

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

diff --git a/kernel/module.c b/kernel/module.c
index 69a3f12..da0213a 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2523,7 +2523,9 @@ static int post_relocation(struct module *mod, const struct load_info *info)
 	sort_extable(mod->extable, mod->extable + mod->num_exentries);
 
 	/* Copy relocated percpu area over. */
+#ifdef CONFIG_SMP
 	percpu_modcopy(mod, info->orig_percpu, mod->percpu_size);
+#endif
 
 	/* Setup kallsyms-specific fields. */
 	add_kallsyms(mod, info);
-- 
1.7.1


-- 
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/