Skip to content

Commit 9e62cce

Browse files
hramrachmpe
authored andcommitted
powerpc: Add back __ARCH_WANT_SYS_LLSEEK macro
This partially reverts commit caf6f9c ("asm-generic: Remove unneeded __ARCH_WANT_SYS_LLSEEK macro") When CONFIG_COMPAT is disabled on ppc64 the kernel does not build. There is resistance to both removing the llseek syscall from the 64bit syscall tables and building the llseek interface unconditionally. Signed-off-by: Michal Suchanek <[email protected]> Reviewed-by: Arnd Bergmann <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/lkml/[email protected]/ Link: https://lore.kernel.org/lkml/20190829214319.498c7de2@naga/ Link: https://lore.kernel.org/r/dd4575c51e31766e87f7e7fa121d099ab78d3290.1584699455.git.msuchanek@suse.de
1 parent d3883fa commit 9e62cce

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

arch/powerpc/include/asm/unistd.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#define __ARCH_WANT_SYS_SOCKETCALL
3232
#define __ARCH_WANT_SYS_FADVISE64
3333
#define __ARCH_WANT_SYS_GETPGRP
34+
#define __ARCH_WANT_SYS_LLSEEK
3435
#define __ARCH_WANT_SYS_NICE
3536
#define __ARCH_WANT_SYS_OLD_GETRLIMIT
3637
#define __ARCH_WANT_SYS_OLD_UNAME

fs/read_write.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,8 @@ COMPAT_SYSCALL_DEFINE3(lseek, unsigned int, fd, compat_off_t, offset, unsigned i
331331
}
332332
#endif
333333

334-
#if !defined(CONFIG_64BIT) || defined(CONFIG_COMPAT)
334+
#if !defined(CONFIG_64BIT) || defined(CONFIG_COMPAT) || \
335+
defined(__ARCH_WANT_SYS_LLSEEK)
335336
SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned long, offset_high,
336337
unsigned long, offset_low, loff_t __user *, result,
337338
unsigned int, whence)

0 commit comments

Comments
 (0)