x86_64: move vdso

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86_64/vdso/.gitignore b/arch/x86/vdso/.gitignore
similarity index 100%
rename from arch/x86_64/vdso/.gitignore
rename to arch/x86/vdso/.gitignore

diff --git a/arch/x86_64/vdso/Makefile b/arch/x86/vdso/Makefile
similarity index 100%
rename from arch/x86_64/vdso/Makefile
rename to arch/x86/vdso/Makefile

diff --git a/arch/x86_64/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c
similarity index 100%
rename from arch/x86_64/vdso/vclock_gettime.c
rename to arch/x86/vdso/vclock_gettime.c

diff --git a/arch/x86_64/vdso/vdso-note.S b/arch/x86/vdso/vdso-note.S
similarity index 100%
rename from arch/x86_64/vdso/vdso-note.S
rename to arch/x86/vdso/vdso-note.S

diff --git a/arch/x86_64/vdso/vdso-start.S b/arch/x86/vdso/vdso-start.S
similarity index 100%
rename from arch/x86_64/vdso/vdso-start.S
rename to arch/x86/vdso/vdso-start.S

diff --git a/arch/x86/vdso/vdso.S b/arch/x86/vdso/vdso.S
new file mode 100644 (file)
index 0000000..4b1620a
--- /dev/null
+++ b/arch/x86/vdso/vdso.S
@@ -0,0 +1,2 @@
+       .section ".vdso","a"
+       .incbin "arch/x86/vdso/vdso.so"

diff --git a/arch/x86_64/vdso/vdso.lds.S b/arch/x86/vdso/vdso.lds.S
similarity index 100%
rename from arch/x86_64/vdso/vdso.lds.S
rename to arch/x86/vdso/vdso.lds.S

diff --git a/arch/x86_64/vdso/vextern.h b/arch/x86/vdso/vextern.h
similarity index 100%
rename from arch/x86_64/vdso/vextern.h
rename to arch/x86/vdso/vextern.h

diff --git a/arch/x86_64/vdso/vgetcpu.c b/arch/x86/vdso/vgetcpu.c
similarity index 100%
rename from arch/x86_64/vdso/vgetcpu.c
rename to arch/x86/vdso/vgetcpu.c

diff --git a/arch/x86_64/vdso/vma.c b/arch/x86/vdso/vma.c
similarity index 100%
rename from arch/x86_64/vdso/vma.c
rename to arch/x86/vdso/vma.c

diff --git a/arch/x86_64/vdso/voffset.h b/arch/x86/vdso/voffset.h
similarity index 100%
rename from arch/x86_64/vdso/voffset.h
rename to arch/x86/vdso/voffset.h

diff --git a/arch/x86_64/vdso/vvar.c b/arch/x86/vdso/vvar.c
similarity index 100%
rename from arch/x86_64/vdso/vvar.c
rename to arch/x86/vdso/vvar.c

diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile
index ae48f17..d322592 100644 (file)
--- a/arch/x86_64/Makefile
+++ b/arch/x86_64/Makefile
@@ -77,7 +77,7 @@ libs-y                                        += arch/x86/lib/
 core-y                                 += arch/x86_64/kernel/ \
                                           arch/x86_64/mm/ \
                                           arch/x86/crypto/ \
-                                          arch/x86_64/vdso/
+                                          arch/x86/vdso/
 core-$(CONFIG_IA32_EMULATION)          += arch/x86_64/ia32/
 drivers-$(CONFIG_PCI)                  += arch/x86_64/pci/
 drivers-$(CONFIG_OPROFILE)             += arch/x86/oprofile/

diff --git a/arch/x86_64/vdso/vdso.S b/arch/x86_64/vdso/vdso.S
deleted file mode 100644 (file)
index 92e80c1..0000000
--- a/arch/x86_64/vdso/vdso.S
+++ /dev/null
@@ -1,2 +0,0 @@
-       .section ".vdso","a"
-       .incbin "arch/x86_64/vdso/vdso.so"