fixup vdso

thehajime · Sep 13, 2024 · 3f6f722 · 3f6f722
1 parent f66f0a7
commit 3f6f722
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 22 deletions.
diff --git a/arch/x86/um/vdso/Makefile b/arch/x86/um/vdso/Makefile
@@ -60,3 +60,4 @@ quiet_cmd_vdso = VDSO $@
  sh $(src)/checkundef.sh '$(NM)' '$@'
 
 VDSO_LDFLAGS = -fPIC -shared -Wl,--hash-style=sysv -z noexecstack
+CFLAGS_vma.o=-g -O0
diff --git a/arch/x86/um/vdso/vdso-layout.lds.S b/arch/x86/um/vdso/vdso-layout.lds.S
@@ -4,29 +4,9 @@
  * its virtual address, and with only one read-only segment.
  * This script controls its layout.
  */
-#include <asm/vdso.h>
 
 SECTIONS
 {
-#ifndef CONFIG_MMU
- /*
- * User/kernel shared data is before the vDSO. This may be a little
- * uglier than putting it after the vDSO, but it avoids issues with
- * non-allocatable things that dangle past the end of the PT_LOAD
- * segment.
- */
-
- vvar_start = . - 3 * PAGE_SIZE;
- vvar_page = vvar_start;
-
- /* Place all vvars at the offsets in asm/vvar.h. */
-#define EMIT_VVAR(name, offset) vvar_ ## name = vvar_page + offset;
-#define __VVAR_KERNEL_LDS
-#include <asm/vvar.h>
-#undef __VVAR_KERNEL_LDS
-#undef EMIT_VVAR
-#endif /* !CONFIG_MMU */
-
  . = VDSO_PRELINK + SIZEOF_HEADERS;
 
  .hash : { *(.hash) } :text

diff --git a/arch/x86/um/vdso/vdso.lds.S b/arch/x86/um/vdso/vdso.lds.S
@@ -12,8 +12,6 @@
 #define VDSO_PRELINK 0xffffffffff700000
 #include "vdso-layout.lds.S"
 
-ENTRY(__kernel_vsyscall);
-
 /*
  * This controls what userland symbols we export from the vDSO.
  */