diff options
author | James Morris <jmorris@namei.org> | 2008-11-06 00:12:34 +0100 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-11-06 00:12:34 +0100 |
commit | e21e696edb498c7f7eed42ba3096f6bbe13927b6 (patch) | |
tree | 73b0bc28e45b0268f05c4b384a17bfb2140a73bc /kernel/kallsyms.c | |
parent | selinux: recognize netlink messages for 'ip addrlabel' (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
download | linux-e21e696edb498c7f7eed42ba3096f6bbe13927b6.tar.xz linux-e21e696edb498c7f7eed42ba3096f6bbe13927b6.zip |
Merge branch 'master' into next
Diffstat (limited to 'kernel/kallsyms.c')
-rw-r--r-- | kernel/kallsyms.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c index 38fc10ac7541..5072cf1685a2 100644 --- a/kernel/kallsyms.c +++ b/kernel/kallsyms.c @@ -260,7 +260,6 @@ const char *kallsyms_lookup(unsigned long addr, /* see if it's in a module */ return module_address_lookup(addr, symbolsize, offset, modname, namebuf); - return NULL; } int lookup_symbol_name(unsigned long addr, char *symname) |