From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Andrew Morton <akpm@linux-foundation.org>,
"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>,
Helge Deller <deller@gmx.de>, Arnd Bergmann <arnd@arndb.de>,
Kees Cook <keescook@chromium.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>,
linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-ia64@vger.kernel.org, linux-parisc@vger.kernel.org,
linux-arch@vger.kernel.org, linux-mm@kvack.org
Subject: [PATCH v1 01/10] powerpc: Move 'struct ppc64_opd_entry' back into asm/elf.h
Date: Mon, 11 Oct 2021 17:25:28 +0200 [thread overview]
Message-ID: <8ff3ec195d695033b652e9971fba2dc5528f7151.1633964380.git.christophe.leroy@csgroup.eu> (raw)
In-Reply-To: <cover.1633964380.git.christophe.leroy@csgroup.eu>
'struct ppc64_opd_entry' doesn't belong to uapi/asm/elf.h
It was initially in module_64.c and commit 2d291e902791 ("Fix compile
failure with non modular builds") moved it into asm/elf.h
But it was by mistake added outside of __KERNEL__ section,
therefore commit c3617f72036c ("UAPI: (Scripted) Disintegrate
arch/powerpc/include/asm") moved it to uapi/asm/elf.h
Move it back into asm/elf.h, this brings it back in line with
IA64 and PARISC architectures.
Fixes: 2d291e902791 ("Fix compile failure with non modular builds")
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
arch/powerpc/include/asm/elf.h | 7 +++++++
arch/powerpc/include/uapi/asm/elf.h | 8 --------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
index b8425e3cfd81..64b523848cd7 100644
--- a/arch/powerpc/include/asm/elf.h
+++ b/arch/powerpc/include/asm/elf.h
@@ -176,4 +176,11 @@ do { \
/* Relocate the kernel image to @final_address */
void relocate(unsigned long final_address);
+/* There's actually a third entry here, but it's unused */
+struct ppc64_opd_entry
+{
+ unsigned long funcaddr;
+ unsigned long r2;
+};
+
#endif /* _ASM_POWERPC_ELF_H */
diff --git a/arch/powerpc/include/uapi/asm/elf.h b/arch/powerpc/include/uapi/asm/elf.h
index 860c59291bfc..308857123a08 100644
--- a/arch/powerpc/include/uapi/asm/elf.h
+++ b/arch/powerpc/include/uapi/asm/elf.h
@@ -289,12 +289,4 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG];
/* Keep this the last entry. */
#define R_PPC64_NUM 253
-/* There's actually a third entry here, but it's unused */
-struct ppc64_opd_entry
-{
- unsigned long funcaddr;
- unsigned long r2;
-};
-
-
#endif /* _UAPI_ASM_POWERPC_ELF_H */
--
2.31.1
WARNING: multiple messages have this Message-ID (diff)
From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Andrew Morton <akpm@linux-foundation.org>,
"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>,
Helge Deller <deller@gmx.de>, Arnd Bergmann <arnd@arndb.de>,
Kees Cook <keescook@chromium.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-arch@vger.kernel.org, linux-ia64@vger.kernel.org,
linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v1 01/10] powerpc: Move 'struct ppc64_opd_entry' back into asm/elf.h
Date: Mon, 11 Oct 2021 17:25:28 +0200 [thread overview]
Message-ID: <8ff3ec195d695033b652e9971fba2dc5528f7151.1633964380.git.christophe.leroy@csgroup.eu> (raw)
In-Reply-To: <cover.1633964380.git.christophe.leroy@csgroup.eu>
'struct ppc64_opd_entry' doesn't belong to uapi/asm/elf.h
It was initially in module_64.c and commit 2d291e902791 ("Fix compile
failure with non modular builds") moved it into asm/elf.h
But it was by mistake added outside of __KERNEL__ section,
therefore commit c3617f72036c ("UAPI: (Scripted) Disintegrate
arch/powerpc/include/asm") moved it to uapi/asm/elf.h
Move it back into asm/elf.h, this brings it back in line with
IA64 and PARISC architectures.
Fixes: 2d291e902791 ("Fix compile failure with non modular builds")
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
arch/powerpc/include/asm/elf.h | 7 +++++++
arch/powerpc/include/uapi/asm/elf.h | 8 --------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
index b8425e3cfd81..64b523848cd7 100644
--- a/arch/powerpc/include/asm/elf.h
+++ b/arch/powerpc/include/asm/elf.h
@@ -176,4 +176,11 @@ do { \
/* Relocate the kernel image to @final_address */
void relocate(unsigned long final_address);
+/* There's actually a third entry here, but it's unused */
+struct ppc64_opd_entry
+{
+ unsigned long funcaddr;
+ unsigned long r2;
+};
+
#endif /* _ASM_POWERPC_ELF_H */
diff --git a/arch/powerpc/include/uapi/asm/elf.h b/arch/powerpc/include/uapi/asm/elf.h
index 860c59291bfc..308857123a08 100644
--- a/arch/powerpc/include/uapi/asm/elf.h
+++ b/arch/powerpc/include/uapi/asm/elf.h
@@ -289,12 +289,4 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG];
/* Keep this the last entry. */
#define R_PPC64_NUM 253
-/* There's actually a third entry here, but it's unused */
-struct ppc64_opd_entry
-{
- unsigned long funcaddr;
- unsigned long r2;
-};
-
-
#endif /* _UAPI_ASM_POWERPC_ELF_H */
--
2.31.1
WARNING: multiple messages have this Message-ID (diff)
From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Andrew Morton <akpm@linux-foundation.org>,
"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>,
Helge Deller <deller@gmx.de>, Arnd Bergmann <arnd@arndb.de>,
Kees Cook <keescook@chromium.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>,
linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-ia64@vger.kernel.org, linux-parisc@vger.kernel.org,
linux-arch@vger.kernel.org, linux-mm@kvack.org
Subject: [PATCH v1 01/10] powerpc: Move 'struct ppc64_opd_entry' back into asm/elf.h
Date: Mon, 11 Oct 2021 15:25:28 +0000 [thread overview]
Message-ID: <8ff3ec195d695033b652e9971fba2dc5528f7151.1633964380.git.christophe.leroy@csgroup.eu> (raw)
In-Reply-To: <cover.1633964380.git.christophe.leroy@csgroup.eu>
'struct ppc64_opd_entry' doesn't belong to uapi/asm/elf.h
It was initially in module_64.c and commit 2d291e902791 ("Fix compile
failure with non modular builds") moved it into asm/elf.h
But it was by mistake added outside of __KERNEL__ section,
therefore commit c3617f72036c ("UAPI: (Scripted) Disintegrate
arch/powerpc/include/asm") moved it to uapi/asm/elf.h
Move it back into asm/elf.h, this brings it back in line with
IA64 and PARISC architectures.
Fixes: 2d291e902791 ("Fix compile failure with non modular builds")
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
arch/powerpc/include/asm/elf.h | 7 +++++++
arch/powerpc/include/uapi/asm/elf.h | 8 --------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
index b8425e3cfd81..64b523848cd7 100644
--- a/arch/powerpc/include/asm/elf.h
+++ b/arch/powerpc/include/asm/elf.h
@@ -176,4 +176,11 @@ do { \
/* Relocate the kernel image to @final_address */
void relocate(unsigned long final_address);
+/* There's actually a third entry here, but it's unused */
+struct ppc64_opd_entry
+{
+ unsigned long funcaddr;
+ unsigned long r2;
+};
+
#endif /* _ASM_POWERPC_ELF_H */
diff --git a/arch/powerpc/include/uapi/asm/elf.h b/arch/powerpc/include/uapi/asm/elf.h
index 860c59291bfc..308857123a08 100644
--- a/arch/powerpc/include/uapi/asm/elf.h
+++ b/arch/powerpc/include/uapi/asm/elf.h
@@ -289,12 +289,4 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG];
/* Keep this the last entry. */
#define R_PPC64_NUM 253
-/* There's actually a third entry here, but it's unused */
-struct ppc64_opd_entry
-{
- unsigned long funcaddr;
- unsigned long r2;
-};
-
-
#endif /* _UAPI_ASM_POWERPC_ELF_H */
--
2.31.1
next prev parent reply other threads:[~2021-10-11 15:27 UTC|newest]
Thread overview: 114+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-11 15:25 [PATCH v1 00/10] Fix LKDTM for PPC64/IA64/PARISC Christophe Leroy
2021-10-11 15:25 ` Christophe Leroy
2021-10-11 15:25 ` Christophe Leroy
2021-10-11 15:25 ` Christophe Leroy [this message]
2021-10-11 15:25 ` [PATCH v1 01/10] powerpc: Move 'struct ppc64_opd_entry' back into asm/elf.h Christophe Leroy
2021-10-11 15:25 ` Christophe Leroy
2021-10-12 7:10 ` Michael Ellerman
2021-10-12 7:10 ` Michael Ellerman
2021-10-12 7:10 ` Michael Ellerman
2021-10-12 8:02 ` Arnd Bergmann
2021-10-12 8:02 ` Arnd Bergmann
2021-10-12 8:02 ` Arnd Bergmann
2021-10-13 6:59 ` Kees Cook
2021-10-13 6:59 ` Kees Cook
2021-10-13 6:59 ` Kees Cook
2021-10-11 15:25 ` [PATCH v1 02/10] powerpc: Rename 'funcaddr' to 'addr' in 'struct ppc64_opd_entry' Christophe Leroy
2021-10-11 15:25 ` Christophe Leroy
2021-10-11 15:25 ` Christophe Leroy
2021-10-13 6:59 ` Kees Cook
2021-10-13 6:59 ` Kees Cook
2021-10-13 6:59 ` Kees Cook
2021-10-11 15:25 ` [PATCH v1 03/10] ia64: Rename 'ip' to 'addr' in 'struct fdesc' Christophe Leroy
2021-10-11 15:25 ` Christophe Leroy
2021-10-11 15:25 ` Christophe Leroy
2021-10-13 6:59 ` Kees Cook
2021-10-13 6:59 ` Kees Cook
2021-10-13 6:59 ` Kees Cook
2021-10-11 15:25 ` [PATCH v1 04/10] asm-generic: Use HAVE_DEREFERENCE_FUNCTION_DESCRIPTOR to define associated stubs Christophe Leroy
2021-10-11 15:25 ` Christophe Leroy
2021-10-11 15:25 ` Christophe Leroy
2021-10-12 6:02 ` Helge Deller
2021-10-12 6:02 ` [PATCH v1 04/10] asm-generic: Use HAVE_DEREFERENCE_FUNCTION_DESCRIPTOR to define associated stub Helge Deller
2021-10-12 6:02 ` [PATCH v1 04/10] asm-generic: Use HAVE_DEREFERENCE_FUNCTION_DESCRIPTOR to define associated stubs Helge Deller
2021-10-12 6:11 ` Christophe Leroy
2021-10-12 6:11 ` [PATCH v1 04/10] asm-generic: Use HAVE_DEREFERENCE_FUNCTION_DESCRIPTOR to define associated stub Christophe Leroy
2021-10-12 6:11 ` [PATCH v1 04/10] asm-generic: Use HAVE_DEREFERENCE_FUNCTION_DESCRIPTOR to define associated stubs Christophe Leroy
2021-10-12 6:48 ` Helge Deller
2021-10-12 6:48 ` [PATCH v1 04/10] asm-generic: Use HAVE_DEREFERENCE_FUNCTION_DESCRIPTOR to define associated stub Helge Deller
2021-10-12 6:48 ` [PATCH v1 04/10] asm-generic: Use HAVE_DEREFERENCE_FUNCTION_DESCRIPTOR to define associated stubs Helge Deller
2021-10-13 7:00 ` Kees Cook
2021-10-13 7:00 ` [PATCH v1 04/10] asm-generic: Use HAVE_DEREFERENCE_FUNCTION_DESCRIPTOR to define associated stub Kees Cook
2021-10-13 7:00 ` [PATCH v1 04/10] asm-generic: Use HAVE_DEREFERENCE_FUNCTION_DESCRIPTOR to define associated stubs Kees Cook
2021-10-14 7:20 ` Christophe Leroy
2021-10-14 7:20 ` [PATCH v1 04/10] asm-generic: Use HAVE_DEREFERENCE_FUNCTION_DESCRIPTOR to define associated stub Christophe Leroy
2021-10-14 7:20 ` [PATCH v1 04/10] asm-generic: Use HAVE_DEREFERENCE_FUNCTION_DESCRIPTOR to define associated stubs Christophe Leroy
2021-10-11 15:25 ` [PATCH v1 05/10] asm-generic: Define 'funct_descr_t' to commonly describe function descriptors Christophe Leroy
2021-10-11 15:25 ` Christophe Leroy
2021-10-11 15:25 ` Christophe Leroy
2021-10-13 7:01 ` Kees Cook
2021-10-13 7:01 ` Kees Cook
2021-10-13 7:01 ` Kees Cook
2021-10-13 7:23 ` Christophe Leroy
2021-10-13 7:23 ` Christophe Leroy
2021-10-13 7:23 ` Christophe Leroy
2021-10-13 7:27 ` Kees Cook
2021-10-13 7:27 ` Kees Cook
2021-10-13 7:27 ` Kees Cook
2021-10-11 15:25 ` [PATCH v1 06/10] asm-generic: Refactor dereference_[kernel]_function_descriptor() Christophe Leroy
2021-10-11 15:25 ` Christophe Leroy
2021-10-11 15:25 ` Christophe Leroy
2021-10-13 7:02 ` Kees Cook
2021-10-13 7:02 ` Kees Cook
2021-10-13 7:02 ` Kees Cook
2021-10-13 11:20 ` Christophe Leroy
2021-10-13 11:20 ` Christophe Leroy
2021-10-13 11:20 ` Christophe Leroy
2021-10-13 11:34 ` Arnd Bergmann
2021-10-13 11:34 ` Arnd Bergmann
2021-10-13 11:34 ` Arnd Bergmann
2021-10-11 15:25 ` [PATCH v1 07/10] lkdtm: Force do_nothing() out of line Christophe Leroy
2021-10-11 15:25 ` Christophe Leroy
2021-10-11 15:25 ` Christophe Leroy
2021-10-13 7:02 ` Kees Cook
2021-10-13 7:02 ` Kees Cook
2021-10-13 7:02 ` Kees Cook
2021-10-11 15:25 ` [PATCH v1 08/10] lkdtm: Really write into kernel text in WRITE_KERN Christophe Leroy
2021-10-11 15:25 ` Christophe Leroy
2021-10-11 15:25 ` Christophe Leroy
2021-10-13 7:05 ` Kees Cook
2021-10-13 7:05 ` Kees Cook
2021-10-13 7:05 ` Kees Cook
2021-10-13 7:29 ` Christophe Leroy
2021-10-13 7:29 ` Christophe Leroy
2021-10-13 7:29 ` Christophe Leroy
2021-10-11 15:25 ` [PATCH v1 09/10] lkdtm: Fix lkdtm_EXEC_RODATA() Christophe Leroy
2021-10-11 15:25 ` Christophe Leroy
2021-10-11 15:25 ` Christophe Leroy
2021-10-13 7:09 ` Kees Cook
2021-10-13 7:09 ` Kees Cook
2021-10-13 7:09 ` Kees Cook
2021-10-13 7:35 ` Christophe Leroy
2021-10-13 7:35 ` Christophe Leroy
2021-10-13 7:35 ` Christophe Leroy
2021-10-13 7:23 ` Kees Cook
2021-10-13 7:23 ` Kees Cook
2021-10-13 7:23 ` Kees Cook
2021-10-13 7:39 ` Christophe Leroy
2021-10-13 7:39 ` Christophe Leroy
2021-10-13 7:39 ` Christophe Leroy
2021-10-13 7:48 ` Christophe Leroy
2021-10-13 7:48 ` Christophe Leroy
2021-10-13 7:48 ` Christophe Leroy
2021-10-13 12:45 ` Christophe Leroy
2021-10-13 12:45 ` Christophe Leroy
2021-10-13 12:45 ` Christophe Leroy
2021-10-11 15:25 ` [PATCH v1 10/10] lkdtm: Fix execute_[user]_location() Christophe Leroy
2021-10-11 15:25 ` Christophe Leroy
2021-10-11 15:25 ` Christophe Leroy
2021-10-13 7:16 ` Kees Cook
2021-10-13 7:16 ` Kees Cook
2021-10-13 7:16 ` Kees Cook
2021-10-13 12:00 ` Christophe Leroy
2021-10-13 12:00 ` Christophe Leroy
2021-10-13 12:00 ` Christophe Leroy
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=8ff3ec195d695033b652e9971fba2dc5528f7151.1633964380.git.christophe.leroy@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=James.Bottomley@HansenPartnership.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=deller@gmx.de \
--cc=gregkh@linuxfoundation.org \
--cc=keescook@chromium.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
/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.