diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-24 19:05:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-24 19:05:45 -0800 |
| commit | 10cc5d483ebc00e82d9a38d3419b2edc8b79b64d (patch) | |
| tree | 82115688b0a9ccb7812b49ef65f2a2c3e690988d /arch/alpha/boot/stdio.c | |
| parent | d6b9cf417c62601f26fa47f97d6c0681704bf0e3 (diff) | |
| parent | beb9797ee8b0c19598ffccdfae24afa6e0066f6a (diff) | |
Merge branch 'work.alpha' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull alpha updates from Al Viro:
"FEN (floating-point enable) fault fix deals with a really old oopsable
braino, the rest is alpha/boot compile fixes and minor cleaning up"
* 'work.alpha' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
alpha/boot/misc: trim unused declarations
alpha/boot/tools/objstrip: fix the check for ELF header
alpha/boot: fix the breakage from -isystem series...
alpha: fix FEN fault handling
Diffstat (limited to 'arch/alpha/boot/stdio.c')
| -rw-r--r-- | arch/alpha/boot/stdio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/boot/stdio.c b/arch/alpha/boot/stdio.c index 60f73ccd2e89..a5abeaf94791 100644 --- a/arch/alpha/boot/stdio.c +++ b/arch/alpha/boot/stdio.c @@ -2,8 +2,8 @@ /* * Copyright (C) Paul Mackerras 1997. */ -#include <stdarg.h> -#include <stddef.h> +#include <linux/string.h> +#include <linux/stdarg.h> size_t strnlen(const char * s, size_t count) { |