x86: Load the 32-bit vdso in place, just like the 64-bit vdsos

[firefly-linux-kernel-4.4.55.git] / arch / x86 / vdso / vdso.S

diff --git a/arch/x86/vdso/vdso.S b/arch/x86/vdso/vdso.S
index 1e13eb8c9656f79b44d9907f0a9290c39978f7c1..c749d15da2e976107f9b9917ada9f4af9851228f 100644 (file)
--- a/arch/x86/vdso/vdso.S
+++ b/arch/x86/vdso/vdso.S
@@ -1,21 +1,3 @@
-#include <asm/page_types.h>
-#include <linux/linkage.h>
+#include "vdso_image.h"
 
-__PAGE_ALIGNED_DATA
-
-       .globl vdso_start, vdso_end
-       .align PAGE_SIZE
-vdso_start:
-       .incbin "arch/x86/vdso/vdso.so"
-vdso_end:
-       .align PAGE_SIZE /* extra data here leaks to userspace. */
-
-.previous
-
-       .globl vdso_pages
-       .bss
-       .align 8
-       .type vdso_pages, @object
-vdso_pages:
-       .zero (vdso_end - vdso_start + PAGE_SIZE - 1) / PAGE_SIZE * 8
-       .size vdso_pages, .-vdso_pages
+DEFINE_VDSO_IMAGE(vdso, "arch/x86/vdso/vdso.so")