From: Michal Suchanek <msuchanek@suse.de>
To: linuxppc-dev@lists.ozlabs.org
Cc: Michal Suchanek <msuchanek@suse.de>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Nicholas Piggin <npiggin@gmail.com>,
Christophe Leroy <christophe.leroy@c-s.fr>,
Breno Leitao <leitao@debian.org>, Arnd Bergmann <arnd@arndb.de>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Firoz Khan <firoz.khan@linaro.org>,
Thomas Gleixner <tglx@linutronix.de>,
Joel Stanley <joel@jms.id.au>,
Hari Bathini <hbathini@linux.ibm.com>,
Michael Neuling <mikey@neuling.org>,
Andrew Donnellan <andrew.donnellan@au1.ibm.com>,
Russell Currey <ruscur@russell.cc>,
Diana Craciun <diana.craciun@nxp.com>,
"Eric W. Biederman" <ebiederm@xmission.com>,
David Hildenbrand <david@redhat.com>,
Allison Randal <allison@lohutok.net>,
Andrew Morton <akpm@linux-foundation.org>,
Madhavan Srinivasan <maddy@linux.vnet.ibm.com>,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH v9 1/8] powerpc: Add back __ARCH_WANT_SYS_LLSEEK macro
Date: Fri, 13 Sep 2019 14:57:55 +0200 [thread overview]
Message-ID: <2e5c00c054f5a1c8ea4b5944685940af0665bfc1.1568319275.git.msuchanek@suse.de> (raw)
In-Reply-To: <cover.1568319275.git.msuchanek@suse.de>
This partially reverts commit caf6f9c8a326 ("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.
Link: https://lore.kernel.org/lkml/20190828151552.GA16855@infradead.org/
Link: https://lore.kernel.org/lkml/20190829214319.498c7de2@naga/
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
---
arch/powerpc/include/asm/unistd.h | 1 +
fs/read_write.c | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/include/asm/unistd.h b/arch/powerpc/include/asm/unistd.h
index b0720c7c3fcf..700fcdac2e3c 100644
--- a/arch/powerpc/include/asm/unistd.h
+++ b/arch/powerpc/include/asm/unistd.h
@@ -31,6 +31,7 @@
#define __ARCH_WANT_SYS_SOCKETCALL
#define __ARCH_WANT_SYS_FADVISE64
#define __ARCH_WANT_SYS_GETPGRP
+#define __ARCH_WANT_SYS_LLSEEK
#define __ARCH_WANT_SYS_NICE
#define __ARCH_WANT_SYS_OLD_GETRLIMIT
#define __ARCH_WANT_SYS_OLD_UNAME
diff --git a/fs/read_write.c b/fs/read_write.c
index 5bbf587f5bc1..89aa2701dbeb 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -331,7 +331,8 @@ COMPAT_SYSCALL_DEFINE3(lseek, unsigned int, fd, compat_off_t, offset, unsigned i
}
#endif
-#if !defined(CONFIG_64BIT) || defined(CONFIG_COMPAT)
+#if !defined(CONFIG_64BIT) || defined(CONFIG_COMPAT) || \
+ defined(__ARCH_WANT_SYS_LLSEEK)
SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned long, offset_high,
unsigned long, offset_low, loff_t __user *, result,
unsigned int, whence)
--
2.23.0
WARNING: multiple messages have this Message-ID (diff)
From: Michal Suchanek <msuchanek@suse.de>
To: linuxppc-dev@lists.ozlabs.org
Cc: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>,
David Hildenbrand <david@redhat.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
Paul Mackerras <paulus@samba.org>,
Breno Leitao <leitao@debian.org>,
Michael Neuling <mikey@neuling.org>,
Diana Craciun <diana.craciun@nxp.com>,
Firoz Khan <firoz.khan@linaro.org>,
Hari Bathini <hbathini@linux.ibm.com>,
Michal Suchanek <msuchanek@suse.de>,
Joel Stanley <joel@jms.id.au>, Arnd Bergmann <arnd@arndb.de>,
Nicholas Piggin <npiggin@gmail.com>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Thomas Gleixner <tglx@linutronix.de>,
Allison Randal <allison@lohutok.net>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-kernel@vger.kernel.org,
"Eric W. Biederman" <ebiederm@xmission.com>,
Andrew Donnellan <andrew.donnellan@au1.ibm.com>,
linux-fsdevel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH v9 1/8] powerpc: Add back __ARCH_WANT_SYS_LLSEEK macro
Date: Fri, 13 Sep 2019 14:57:55 +0200 [thread overview]
Message-ID: <2e5c00c054f5a1c8ea4b5944685940af0665bfc1.1568319275.git.msuchanek@suse.de> (raw)
In-Reply-To: <cover.1568319275.git.msuchanek@suse.de>
This partially reverts commit caf6f9c8a326 ("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.
Link: https://lore.kernel.org/lkml/20190828151552.GA16855@infradead.org/
Link: https://lore.kernel.org/lkml/20190829214319.498c7de2@naga/
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
---
arch/powerpc/include/asm/unistd.h | 1 +
fs/read_write.c | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/include/asm/unistd.h b/arch/powerpc/include/asm/unistd.h
index b0720c7c3fcf..700fcdac2e3c 100644
--- a/arch/powerpc/include/asm/unistd.h
+++ b/arch/powerpc/include/asm/unistd.h
@@ -31,6 +31,7 @@
#define __ARCH_WANT_SYS_SOCKETCALL
#define __ARCH_WANT_SYS_FADVISE64
#define __ARCH_WANT_SYS_GETPGRP
+#define __ARCH_WANT_SYS_LLSEEK
#define __ARCH_WANT_SYS_NICE
#define __ARCH_WANT_SYS_OLD_GETRLIMIT
#define __ARCH_WANT_SYS_OLD_UNAME
diff --git a/fs/read_write.c b/fs/read_write.c
index 5bbf587f5bc1..89aa2701dbeb 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -331,7 +331,8 @@ COMPAT_SYSCALL_DEFINE3(lseek, unsigned int, fd, compat_off_t, offset, unsigned i
}
#endif
-#if !defined(CONFIG_64BIT) || defined(CONFIG_COMPAT)
+#if !defined(CONFIG_64BIT) || defined(CONFIG_COMPAT) || \
+ defined(__ARCH_WANT_SYS_LLSEEK)
SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned long, offset_high,
unsigned long, offset_low, loff_t __user *, result,
unsigned int, whence)
--
2.23.0
next prev parent reply other threads:[~2019-09-13 12:58 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-13 12:57 [PATCH v9 0/8] Disable compat cruft on ppc64le v9 Michal Suchanek
2019-09-13 12:57 ` Michal Suchanek
2019-09-13 12:57 ` Michal Suchanek [this message]
2019-09-13 12:57 ` [PATCH v9 1/8] powerpc: Add back __ARCH_WANT_SYS_LLSEEK macro Michal Suchanek
2019-09-13 12:57 ` [PATCH v9 2/8] powerpc: move common register copy functions from signal_32.c to signal.c Michal Suchanek
2019-09-13 12:57 ` Michal Suchanek
2019-09-13 12:57 ` [PATCH v9 3/8] powerpc/perf: consolidate read_user_stack_32 Michal Suchanek
2019-09-13 12:57 ` Michal Suchanek
2019-09-13 12:57 ` [PATCH v9 4/8] powerpc/perf: consolidate valid_user_sp Michal Suchanek
2019-09-13 12:57 ` Michal Suchanek
2019-09-13 12:57 ` [PATCH v9 5/8] powerpc/perf: remove current_is_64bit() Michal Suchanek
2019-09-13 12:57 ` Michal Suchanek
2019-09-13 12:58 ` [PATCH v9 6/8] powerpc/64: make buildable without CONFIG_COMPAT Michal Suchanek
2019-09-13 12:58 ` Michal Suchanek
2019-09-13 12:58 ` [PATCH v9 7/8] powerpc/64: Make COMPAT user-selectable disabled on littleendian by default Michal Suchanek
2019-09-13 12:58 ` Michal Suchanek
2019-09-13 12:58 ` [PATCH v9 8/8] powerpc/perf: split callchain.c by bitness Michal Suchanek
2019-09-13 12:58 ` Michal Suchanek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2e5c00c054f5a1c8ea4b5944685940af0665bfc1.1568319275.git.msuchanek@suse.de \
--to=msuchanek@suse.de \
--cc=akpm@linux-foundation.org \
--cc=allison@lohutok.net \
--cc=andrew.donnellan@au1.ibm.com \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=christophe.leroy@c-s.fr \
--cc=david@redhat.com \
--cc=diana.craciun@nxp.com \
--cc=ebiederm@xmission.com \
--cc=firoz.khan@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=hbathini@linux.ibm.com \
--cc=heiko.carstens@de.ibm.com \
--cc=joel@jms.id.au \
--cc=leitao@debian.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=maddy@linux.vnet.ibm.com \
--cc=mikey@neuling.org \
--cc=mpe@ellerman.id.au \
--cc=npiggin@gmail.com \
--cc=paulus@samba.org \
--cc=ruscur@russell.cc \
--cc=tglx@linutronix.de \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.