Merge branch 'x86/cpufeature' into irq/numa

[sfrench/cifs-2.6.git] / arch / x86 / vdso / vdso.S

diff --git a/arch/x86/vdso/vdso.S b/arch/x86/vdso/vdso.S
index 4b1620a1529e82863a18a96fc8507afbc1734b5d..1d3aa6b8718115fa8f7cadc65c04145b8b79bbcd 100644 (file)
--- a/arch/x86/vdso/vdso.S
+++ b/arch/x86/vdso/vdso.S
@@ -1,2 +1,10 @@
-       .section ".vdso","a"
+#include <linux/init.h>
+
+__INITDATA
+
+       .globl vdso_start, vdso_end
+vdso_start:
        .incbin "arch/x86/vdso/vdso.so"
+vdso_end:
+
+__FINIT