diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 10:51:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 10:51:29 -0700 |
| commit | 66125d934b39889372b8d75e4c192818656efb80 (patch) | |
| tree | 04d5cf3cd9c2654eaa86f2f400e1cd0242843510 /arch/alpha/boot | |
| parent | Merge tag 'ras-core-2020-06-12' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | alpha: Fix build around srm_sysrq_reboot_op (diff) | |
| download | linux-66125d934b39889372b8d75e4c192818656efb80.tar.gz linux-66125d934b39889372b8d75e4c192818656efb80.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha
Pull alpha updates from Matt Turner:
"A few changes for alpha. They're mostly small janitorial fixes but
there's also a build fix and most notably a patch from Mikulas that
fixes a hang on boot on the Avanti platform, which required quite a
bit of work and review"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
alpha: Fix build around srm_sysrq_reboot_op
alpha: c_next should increase position index
alpha: Replace sg++ with sg = sg_next(sg)
alpha: fix memory barriers so that they conform to the specification
alpha: remove unneeded semicolon in sys_eiger.c
alpha: remove unneeded semicolon in osf_sys.c
alpha: Replace strncmp with str_has_prefix
alpha: fix rtc port ranges
alpha: Kconfig: pedantic formatting
Diffstat (limited to 'arch/alpha/boot')
| -rw-r--r-- | arch/alpha/boot/tools/objstrip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/boot/tools/objstrip.c b/arch/alpha/boot/tools/objstrip.c index 825a16f5f622..08b430d25a31 100644 --- a/arch/alpha/boot/tools/objstrip.c +++ b/arch/alpha/boot/tools/objstrip.c @@ -148,7 +148,7 @@ main (int argc, char *argv[]) #ifdef __ELF__ elf = (struct elfhdr *) buf; - if (elf->e_ident[0] == 0x7f && strncmp((char *)elf->e_ident + 1, "ELF", 3) == 0) { + if (elf->e_ident[0] == 0x7f && str_has_prefix((char *)elf->e_ident + 1, "ELF")) { if (elf->e_type != ET_EXEC) { fprintf(stderr, "%s: %s is not an ELF executable\n", prog_name, inname); |