Subject: linux-next: build failure after merge of the final tree (rr tree related)

From: Stephen Rothwell <[email-masked]>
Date: Fri, 4 Jun 2010 14:49:33 +1000

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 <[email-masked]>
Date: Fri, 4 Jun 2010 14:41:21 +1000
Subject: [PATCH] module: don't reference percpu stuff in UP

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 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                    [email-masked]
http://www.canb.auug.org.au/~sfr/