diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2013-02-15 17:25:08 (GMT) |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-02-15 17:25:08 (GMT) |
commit | 0da3e7f526fde7a6522a3038b7ce609fc50f6707 (patch) | |
tree | c6e2dacd96fe7eac8312f3d7c22e0995dc423879 /arch/x86/tools | |
parent | 95c9608478d639dcffc14ea47b31bff021a99ed1 (diff) | |
parent | 68d00bbebb5a48b7a9056a8c03476a71ecbc30a6 (diff) | |
download | linux-fsl-qoriq-0da3e7f526fde7a6522a3038b7ce609fc50f6707.tar.xz |
Merge branch 'x86/mm2' into x86/mm
x86/mm2 is testing out fine, but has developed conflicts with x86/mm
due to patches in adjacent code. Merge them so we can drop x86/mm2
and have a unified branch.
Resolved Conflicts:
arch/x86/kernel/setup.c
Diffstat (limited to 'arch/x86/tools')
-rw-r--r-- | arch/x86/tools/relocs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c index 5a1847d..79d67bd 100644 --- a/arch/x86/tools/relocs.c +++ b/arch/x86/tools/relocs.c @@ -814,12 +814,14 @@ int main(int argc, char **argv) read_relocs(fp); if (show_absolute_syms) { print_absolute_symbols(); - return 0; + goto out; } if (show_absolute_relocs) { print_absolute_relocs(); - return 0; + goto out; } emit_relocs(as_text, use_real_mode); +out: + fclose(fp); return 0; } |