summaryrefslogtreecommitdiffstats
path: root/arch/x86/boot
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-05-10 00:24:09 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-05-10 00:24:09 +0200
commit1f2ee6496b1f71e9d5aa2448745e65fbafdc3bd5 (patch)
tree3f143311afca5e316afd06c2fc4f7d73b19cdcf0 /arch/x86/boot
parent[ARM] 5033/1: Unbreak corgi_ssp by registering ssp drivers earlier. (diff)
parent[ARM] Orion: clean up addr-map.c after window setting code purge (diff)
downloadlinux-1f2ee6496b1f71e9d5aa2448745e65fbafdc3bd5.tar.xz
linux-1f2ee6496b1f71e9d5aa2448745e65fbafdc3bd5.zip
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into fixes
Diffstat (limited to 'arch/x86/boot')
-rw-r--r--arch/x86/boot/compressed/relocs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/relocs.c b/arch/x86/boot/compressed/relocs.c
index d01ea42187e6..edaadea90aaf 100644
--- a/arch/x86/boot/compressed/relocs.c
+++ b/arch/x86/boot/compressed/relocs.c
@@ -191,7 +191,7 @@ static void read_ehdr(FILE *fp)
die("Cannot read ELF header: %s\n",
strerror(errno));
}
- if (memcmp(ehdr.e_ident, ELFMAG, 4) != 0) {
+ if (memcmp(ehdr.e_ident, ELFMAG, SELFMAG) != 0) {
die("No ELF magic\n");
}
if (ehdr.e_ident[EI_CLASS] != ELFCLASS32) {