Subject: [PATCH] Fix build with KALLSYMS disabled.

With KALLSYMS disabled, but some debug features enabled, build will fail
because the layout_symtab function uses the wrong type for ELF headers, and
some variables are not declared. Fix that.

Signed-off-by: Diego Elio 'Flameeyes' Pettenò <[email protected]>
---
kernel/module.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/kernel/module.c b/kernel/module.c
index 5a29397..8dc6017 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1992,7 +1992,7 @@ 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)
@@ -2081,9 +2081,7 @@ 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",
--
1.6.5.rc1


2009-09-25 17:17:59

by Paulo Marques

[permalink] [raw]
Subject: Re: [PATCH] Fix build with KALLSYMS disabled.

Diego Elio 'Flameeyes' Petten? wrote:
> With KALLSYMS disabled, but some debug features enabled, build will fail
> because the layout_symtab function uses the wrong type for ELF headers, and
> some variables are not declared. Fix that.

Hi, Diego

Thanks for the patch, but it seems it arrived about 12 hours too late ;)

http://lkml.org/lkml/2009/9/24/558

--
Paulo Marques - http://www.grupopie.com

"Very funny Scotty. Now beam up my clothes."

Subject: Re: [PATCH] Fix build with KALLSYMS disabled.

Il giorno Fri, 25/09/2009 alle 17.14 +0100, Paulo Marques ha scritto:
> Thanks for the patch, but it seems it arrived about 12 hours too
> late ;)
>
Heh, I guess I was too hasty in sending it before I had a working
browser.

--
Diego Elio Pettenò — “Flameeyes”
http://blog.flameeyes.eu/

If you found a .asc file in this mail and know not what it is,
it's a GnuPG digital signature: http://www.gnupg.org/


Attachments:
signature.asc (198.00 B)
Questa ? una parte del messaggio firmata digitalmente