aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-02 16:22:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-02 16:22:55 -0700
commit5f16a8cf2da76f75e127a370e4dcfe223107922f (patch)
treee9cfa72df7847b178e56a36a28f0a589890f2fde /arch/x86
parentMerge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff)
parentx86/boot: Close opened file descriptor (diff)
downloadlinux-dev-5f16a8cf2da76f75e127a370e4dcfe223107922f.tar.xz
linux-dev-5f16a8cf2da76f75e127a370e4dcfe223107922f.zip
Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 boot build fix from Ingo Molnar: "Small fixlet for the build process" * 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/boot: Close opened file descriptor
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/boot/tools/build.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/boot/tools/build.c b/arch/x86/boot/tools/build.c
index 94c544650020..c941d6a8887f 100644
--- a/arch/x86/boot/tools/build.c
+++ b/arch/x86/boot/tools/build.c
@@ -243,6 +243,7 @@ static void parse_zoffset(char *fname)
c = fread(buf, 1, sizeof(buf) - 1, file);
if (ferror(file))
die("read-error on `zoffset.h'");
+ fclose(file);
buf[c] = 0;
p = (char *)buf;