From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Rusty Russell <rusty@rustcorp•com.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: build failure after merge of the final tree (rr tree related)
Date: Fri, 4 Jun 2010 14:49:33 +1000 [thread overview]
Message-ID: <20100604144933.86b3f2a8.sfr@canb.auug.org.au> (raw)
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@canb•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@canb•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@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
next reply other threads:[~2010-06-04 4:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-04 4:49 Stephen Rothwell [this message]
2010-06-04 5:36 ` linux-next: build failure after merge of the final tree (rr tree related) Rusty Russell
-- strict thread matches above, loose matches on Subject: below --
2011-07-05 6:44 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100604144933.86b3f2a8.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rusty@rustcorp$(echo .)com.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox