From fb89de66f61e34246e6e0f842c825ab8f123be11 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Thu, 1 Oct 2009 15:43:54 -0700
Subject: [PATCH] --- yaml --- r: 166635 b: refs/heads/master c:
 3ae91c21dd29e413f4111978152c14061f0984b0 h: refs/heads/master i:   166633:
 e8320047efb063be5f71610c3c273c274e1f179e   166631:
 dfd5fd656fcfe1f35a92c45b1a9db25cd65a8b95 v: v3

---
 [refs]                | 2 +-
 trunk/kernel/module.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 34376e7a7686..f9bb679f3a58 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 817b33d38f81c8736d39283c35c886ae4668f1af
+refs/heads/master: 3ae91c21dd29e413f4111978152c14061f0984b0
diff --git a/trunk/kernel/module.c b/trunk/kernel/module.c
index fe748a86d452..8b7d8805819d 100644
--- a/trunk/kernel/module.c
+++ b/trunk/kernel/module.c
@@ -1992,12 +1992,14 @@ static inline unsigned long layout_symtab(struct module *mod,
 					  Elf_Shdr *sechdrs,
 					  unsigned int symindex,
 					  unsigned int strindex,
-					  const Elf_Hdr *hdr,
+					  const Elf_Ehdr *hdr,
 					  const char *secstrings,
 					  unsigned long *pstroffs,
 					  unsigned long *strmap)
 {
+	return 0;
 }
+
 static inline void add_kallsyms(struct module *mod,
 				Elf_Shdr *sechdrs,
 				unsigned int shnum,
@@ -2081,9 +2083,8 @@ static noinline struct module *load_module(void __user *umod,
 	struct module *mod;
 	long err = 0;
 	void *percpu = NULL, *ptr = NULL; /* Stops spurious gcc warning */
-#ifdef CONFIG_KALLSYMS
 	unsigned long symoffs, stroffs, *strmap;
-#endif
+
 	mm_segment_t old_fs;
 
 	DEBUGP("load_module: umod=%p, len=%lu, uargs=%p\n",