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

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

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