History

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: initramfs: Fix build break on symbol-prefixed archs initramfs: fix initramfs size calculation initramfs: generalize initramfs_data.xxx.S variants scripts/kallsyms: Enable error messages while hush up unnecessary warnings scripts/setlocalversion: update comment kbuild: Use a single clean rule for kernel and external modules kbuild: Do not run make clean in $(srctree) scripts/mod/modpost.c: fix commentary accordingly to last changes kbuild: Really don't clean bounds.h and asm-offsets.h

Linus Torvalds committed 16 years ago

Commit c9e2a722 parents 9aca0e7 d63f6d116 files · +61 −163Browse files

Showing the changes to scripts/mod (1 of 16 files). Show all

Unified · Split

scripts/mod/modpost.c+4−1
@@ -1208,6 +1208,9 @@ static Elf_Sym *find_elf_symbol2(struct elf_info *elf, Elf_Addr addr, · 1207 unmodified lines
1208 * .cpuinit.data => __cpudata1208 * .cpuinit.data => __cpudata
1209 * .memexitconst => __memconst1209 * .memexitconst => __memconst
1210 * etc.1210 * etc.
1211 *
1212 * The memory of returned value has been allocated on a heap. The user of this
1213 * method should free it after usage.
1211*/1214*/
1212static char *sec2annotation(const char *s)1215static char *sec2annotation(const char *s)
1213{1216{
@@ -1230,7 +1233,7 @@ static char *sec2annotation(const char *s) · 16 unmodified lines
1230 strcat(p, "data ");1233 strcat(p, "data ");
1231 else1234 else
1232 strcat(p, " ");1235 strcat(p, " ");
1233 return r; /* we leak her but we do not care */1236 return r;
1234 } else {1237 } else {
1235 return strdup("");1238 return strdup("");
1236 }1239 }