Commit ac0da8d8 authored by Linus Torvalds's avatar Linus Torvalds

Merge http://linux-isdn.bkbits.net/linux-2.5.make

into home.transmeta.com:/home/torvalds/v2.5/linux
parents f7827443 5966b379
...@@ -43,7 +43,7 @@ __obj-m = $(filter-out export.o,$(obj-m)) ...@@ -43,7 +43,7 @@ __obj-m = $(filter-out export.o,$(obj-m))
multi-used-y := $(sort $(foreach m,$(__obj-y), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m)))) multi-used-y := $(sort $(foreach m,$(__obj-y), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m))))
multi-used-m := $(sort $(foreach m,$(__obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m)))) multi-used-m := $(sort $(foreach m,$(__obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m))))
multi-used := $(multi-used-y) $(multi-used-m) multi-used := $(multi-used-y) $(multi-used-m)
single-used-m := $(filter-out $(multi-used-m),$(obj-m)) single-used-m := $(sort $(filter-out $(multi-used-m),$(obj-m)))
# Build list of the parts of our composite objects, our composite # Build list of the parts of our composite objects, our composite
# objects depend on those (obviously) # objects depend on those (obviously)
......
...@@ -114,11 +114,11 @@ write_src(void) ...@@ -114,11 +114,11 @@ write_src(void)
printf(".globl kallsyms_num_syms\n"); printf(".globl kallsyms_num_syms\n");
printf("\t.align 8\n"); printf("\t.align 8\n");
printf("kallsyms_num_syms:\n");
printf("\t.long\t%d\n", valid); printf("\t.long\t%d\n", valid);
printf("\n"); printf("\n");
printf(".globl kallsyms_names\n"); printf(".globl kallsyms_names\n");
printf(".data\n");
printf("\t.align 8\n"); printf("\t.align 8\n");
printf("kallsyms_names:\n"); printf("kallsyms_names:\n");
for (i = 0, last_addr = 0; i < cnt; i++) { for (i = 0, last_addr = 0; i < cnt; i++) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment