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,
Greg Ungerer <gerg@uclinux.org>, Jonas Bonn <jonas@southpole.se>,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: linux-next: manual merge of the rr tree with the tree
Date: Tue, 5 Jul 2011 13:59:32 +1000 [thread overview]
Message-ID: <20110705135932.de7f0526.sfr@canb.auug.org.au> (raw)
Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
arch/m68k/kernel/module_mm.c arch/m68k/kernel/module_no.c between commit
4528acce2607 ("m68k: merge the non-mmu and mmu versions of module.c")
from the m68knommu tree and commit 7b935befe6bc ("modules: make arch's
use default loader hooks") from the rr tree.
The former removes these files, so I did that.
I then added this merge fix up patch (which I can carry as necessary and
may not be coorrect):
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 5 Jul 2011 13:12:26 +1000
Subject: [PATCH] modules/m68k: make arch's use default loader hooks
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/m68k/kernel/module.c | 27 ---------------------------
1 files changed, 0 insertions(+), 27 deletions(-)
diff --git a/arch/m68k/kernel/module.c b/arch/m68k/kernel/module.c
index 146d646..34849c4 100644
--- a/arch/m68k/kernel/module.c
+++ b/arch/m68k/kernel/module.c
@@ -19,29 +19,6 @@
#ifdef CONFIG_MODULES
-void *module_alloc(unsigned long size)
-{
- if (size == 0)
- return NULL;
- return vmalloc(size);
-}
-
-
-/* Free memory returned from module_alloc */
-void module_free(struct module *mod, void *module_region)
-{
- vfree(module_region);
-}
-
-/* We don't need anything special. */
-int module_frob_arch_sections(Elf_Ehdr *hdr,
- Elf_Shdr *sechdrs,
- char *secstrings,
- struct module *mod)
-{
- return 0;
-}
-
int apply_relocate(Elf32_Shdr *sechdrs,
const char *strtab,
unsigned int symindex,
@@ -130,10 +107,6 @@ int module_finalize(const Elf_Ehdr *hdr,
return 0;
}
-void module_arch_cleanup(struct module *mod)
-{
-}
-
#endif /* CONFIG_MODULES */
void module_fixup(struct module *mod, struct m68k_fixup_info *start,
--
1.7.5.4
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
next reply other threads:[~2011-07-05 3:59 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-05 3:59 Stephen Rothwell [this message]
2011-07-06 15:57 ` linux-next: manual merge of the rr tree with the tree Jonas Bonn
2011-07-06 23:44 ` Greg Ungerer
2011-07-07 0:24 ` Stephen Rothwell
2011-07-07 1:07 ` Rusty Russell
2011-07-19 11:27 ` Jonathan Cameron
2011-07-21 7:55 ` Rusty Russell
2011-07-25 1:43 ` Stephen Rothwell
2011-07-25 2:09 ` Greg Ungerer
-- strict thread matches above, loose matches on Subject: below --
2009-06-16 3:06 Stephen Rothwell
2009-06-09 3:56 Stephen Rothwell
2009-06-09 9:52 ` 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=20110705135932.de7f0526.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=geert@linux-m68k.org \
--cc=gerg@uclinux.org \
--cc=jonas@southpole.se \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rusty@rustcorp.com.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).