diff options
author | Colin Cross <ccross@android.com> | 2010-10-15 12:04:05 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2010-10-15 12:04:05 -0700 |
commit | 9ab3d8b9fcc83cb2eab5cc9834b742d437915a2e (patch) | |
tree | 0a4dc68f031cba95cd36ededfb9b30de60fe1145 /lib | |
parent | c8b43bb8ec47fc7e75f4474b454d459a22d9f233 (diff) | |
parent | 89c37cce1c850fe046df50ccb923a8eccbf259b6 (diff) |
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'lib')
-rw-r--r-- | lib/bug.c | 6 | ||||
-rw-r--r-- | lib/list_sort.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/bug.c b/lib/bug.c index 7cdfad88128f..19552096d16b 100644 --- a/lib/bug.c +++ b/lib/bug.c @@ -72,8 +72,8 @@ static const struct bug_entry *module_find_bug(unsigned long bugaddr) return NULL; } -int module_bug_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, - struct module *mod) +void module_bug_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, + struct module *mod) { char *secstrings; unsigned int i; @@ -97,8 +97,6 @@ int module_bug_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, * could potentially lead to deadlock and thus be counter-productive. */ list_add(&mod->bug_list, &module_bug_list); - - return 0; } void module_bug_cleanup(struct module *mod) diff --git a/lib/list_sort.c b/lib/list_sort.c index 4b5cb794c38b..a7616fa3162e 100644 --- a/lib/list_sort.c +++ b/lib/list_sort.c @@ -70,7 +70,7 @@ static void merge_and_restore_back_links(void *priv, * element comparison is needed, so the client's cmp() * routine can invoke cond_resched() periodically. */ - (*cmp)(priv, tail, tail); + (*cmp)(priv, tail->next, tail->next); tail->next->prev = tail; tail = tail->next; |