diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2022-03-14 22:48:41 +0300 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2022-03-15 12:32:48 +0300 |
| commit | 83a44a4f47ad20997aebb311fc678a13cde391d7 (patch) | |
| tree | 9bd556b1b2f2ea0dcdb481266767fe02f10dbc12 /fs/fuse/ioctl.c | |
| parent | ed53a0d971926e484d86cce617ec02a7ee85c3fe (diff) | |
| download | linux-83a44a4f47ad20997aebb311fc678a13cde391d7.tar.xz | |
x86: Remove toolchain check for X32 ABI capability
Commit 0bf6276392e9 ("x32: Warn and disable rather than error if
binutils too old") added a small test in arch/x86/Makefile because
binutils 2.22 or newer is needed to properly support elf32-x86-64. This
check is no longer necessary, as the minimum supported version of
binutils is 2.23, which is enforced at configuration time with
scripts/min-tool-version.sh.
Remove this check and replace all uses of CONFIG_X86_X32 with
CONFIG_X86_X32_ABI, as two symbols are no longer necessary.
[nathan: Rebase, fix up a few places where CONFIG_X86_X32 was still
used, and simplify commit message to satisfy -tip requirements]
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20220314194842.3452-2-nathan@kernel.org
Diffstat (limited to 'fs/fuse/ioctl.c')
| -rw-r--r-- | fs/fuse/ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/ioctl.c b/fs/fuse/ioctl.c index df58966bc874..33cde4bbccdc 100644 --- a/fs/fuse/ioctl.c +++ b/fs/fuse/ioctl.c @@ -170,7 +170,7 @@ long fuse_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg, #else if (flags & FUSE_IOCTL_COMPAT) { inarg.flags |= FUSE_IOCTL_32BIT; -#ifdef CONFIG_X86_X32 +#ifdef CONFIG_X86_X32_ABI if (in_x32_syscall()) inarg.flags |= FUSE_IOCTL_COMPAT_X32; #endif |