--- v7
+++ v6
@@ -10,17 +10,17 @@
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Jens Remus <jremus@linux.ibm.com>
---
- arch/x86/entry/vdso/common/vdso-layout.lds.S | 2 +-
- .../x86/entry/vdso/vdso64/vgetrandom-chacha.S | 2 --
- arch/x86/entry/vdso/vdso64/vsgx.S | 4 ---
- arch/x86/include/asm/linkage.h | 33 +++++++++++++++----
- arch/x86/include/asm/vdso.h | 1 -
+ arch/x86/entry/vdso/vdso-layout.lds.S | 2 +-
+ arch/x86/entry/vdso/vgetrandom-chacha.S | 2 --
+ arch/x86/entry/vdso/vsgx.S | 4 ---
+ arch/x86/include/asm/linkage.h | 33 ++++++++++++++++++++-----
+ arch/x86/include/asm/vdso.h | 1 -
5 files changed, 28 insertions(+), 14 deletions(-)
-diff --git a/arch/x86/entry/vdso/common/vdso-layout.lds.S b/arch/x86/entry/vdso/common/vdso-layout.lds.S
-index a1e30be3e83d..856b8b9d278c 100644
---- a/arch/x86/entry/vdso/common/vdso-layout.lds.S
-+++ b/arch/x86/entry/vdso/common/vdso-layout.lds.S
+diff --git a/arch/x86/entry/vdso/vdso-layout.lds.S b/arch/x86/entry/vdso/vdso-layout.lds.S
+index ec1ac191a057..60747905de2b 100644
+--- a/arch/x86/entry/vdso/vdso-layout.lds.S
++++ b/arch/x86/entry/vdso/vdso-layout.lds.S
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-#include <asm/vdso.h>
@@ -28,10 +28,10 @@
#include <asm/vdso/vsyscall.h>
#include <vdso/datapage.h>
-diff --git a/arch/x86/entry/vdso/vdso64/vgetrandom-chacha.S b/arch/x86/entry/vdso/vdso64/vgetrandom-chacha.S
+diff --git a/arch/x86/entry/vdso/vgetrandom-chacha.S b/arch/x86/entry/vdso/vgetrandom-chacha.S
index cc82da9216fb..a33212594731 100644
---- a/arch/x86/entry/vdso/vdso64/vgetrandom-chacha.S
-+++ b/arch/x86/entry/vdso/vdso64/vgetrandom-chacha.S
+--- a/arch/x86/entry/vdso/vgetrandom-chacha.S
++++ b/arch/x86/entry/vdso/vgetrandom-chacha.S
@@ -22,7 +22,6 @@ CONSTANTS: .octa 0x6b20657479622d323320646e61707865
* rcx: number of 64-byte blocks to write to output
*/
@@ -46,10 +46,10 @@
ret
- CFI_ENDPROC
SYM_FUNC_END(__arch_chacha20_blocks_nostack)
-diff --git a/arch/x86/entry/vdso/vdso64/vsgx.S b/arch/x86/entry/vdso/vdso64/vsgx.S
+diff --git a/arch/x86/entry/vdso/vsgx.S b/arch/x86/entry/vdso/vsgx.S
index 37a3d4c02366..c0342238c976 100644
---- a/arch/x86/entry/vdso/vdso64/vsgx.S
-+++ b/arch/x86/entry/vdso/vdso64/vsgx.S
+--- a/arch/x86/entry/vdso/vsgx.S
++++ b/arch/x86/entry/vdso/vsgx.S
@@ -24,8 +24,6 @@
.section .text, "ax"
@@ -142,7 +142,7 @@
/*
* Expose 'sym' to the startup code in arch/x86/boot/startup/, by emitting an
diff --git a/arch/x86/include/asm/vdso.h b/arch/x86/include/asm/vdso.h
-index e8afbe9faa5b..498ac423741c 100644
+index b7253ef3205a..c4290dadba66 100644
--- a/arch/x86/include/asm/vdso.h
+++ b/arch/x86/include/asm/vdso.h
@@ -2,7 +2,6 @@