linux-kernel - linux-next: manual merge of the rr tree with the tree

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: <20110705135932.de7f0526.sfr@canb.auug.org.au>
Date:	Tue, 5 Jul 2011 13:59:32 +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,
	Greg Ungerer <gerg@...inux.org>,
	Jonas Bonn <jonas@...thpole.se>,
	Geert Uytterhoeven <geert@...ux-m68k.org>
Subject: linux-next: manual merge of the rr tree with the  tree

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@...b.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@...b.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@...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/