Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86-64, vdso: Do not allocate memory for the vDSO
  clocksource: Change __ARCH_HAS_CLOCKSOURCE_DATA to a CONFIG option
  x86, vdso: Drop now wrong comment
  Document the vDSO and add a reference parser
  ia64: Replace clocksource.fsys_mmio with generic arch data
  x86-64: Move vread_tsc and vread_hpet into the vDSO
  clocksource: Replace vread with generic arch data
  x86-64: Add --no-undefined to vDSO build
  x86-64: Allow alternative patching in the vDSO
  x86: Make alternative instruction pointers relative
  x86-64: Improve vsyscall emulation CS and RIP handling
  x86-64: Emulate legacy vsyscalls
  x86-64: Fill unused parts of the vsyscall page with 0xcc
  x86-64: Remove vsyscall number 3 (venosys)
  x86-64: Map the HPET NX
  x86-64: Remove kernel.vsyscall64 sysctl
  x86-64: Give vvars their own page
  x86-64: Document some of entry_64.S
  x86-64: Fix alignment of jiffies variable

2 files changed, 8 insertions, 12 deletions

diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
index 6fec2d1cebe1..01c805ba5359 100644
--- a/arch/x86/lib/copy_page_64.S
+++ b/arch/x86/lib/copy_page_64.S
@@ -2,6 +2,7 @@
 
 #include <linux/linkage.h>
 #include <asm/dwarf2.h>
+#include <asm/alternative-asm.h>
 
         ALIGN
 copy_page_c:
@@ -110,10 +111,6 @@ ENDPROC(copy_page)
 2:
         .previous
         .section .altinstructions,"a"
-        .align 8
-        .quad copy_page
-        .quad 1b
-        .word X86_FEATURE_REP_GOOD
-        .byte .Lcopy_page_end - copy_page
-        .byte 2b - 1b
+        altinstruction_entry copy_page, 1b, X86_FEATURE_REP_GOOD,       \
+                .Lcopy_page_end-copy_page, 2b-1b
         .previous
diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
index d0ec9c2936d7..ee164610ec46 100644
--- a/arch/x86/lib/memmove_64.S
+++ b/arch/x86/lib/memmove_64.S
@@ -9,6 +9,7 @@
 #include <linux/linkage.h>
 #include <asm/dwarf2.h>
 #include <asm/cpufeature.h>
+#include <asm/alternative-asm.h>
 
 #undef memmove
 
@@ -214,11 +215,9 @@ ENTRY(memmove)
         .previous
 
         .section .altinstructions,"a"
-        .align 8
-        .quad .Lmemmove_begin_forward
-        .quad .Lmemmove_begin_forward_efs
-        .word X86_FEATURE_ERMS
-        .byte .Lmemmove_end_forward-.Lmemmove_begin_forward
-        .byte .Lmemmove_end_forward_efs-.Lmemmove_begin_forward_efs
+        altinstruction_entry .Lmemmove_begin_forward,           \
+                .Lmemmove_begin_forward_efs,X86_FEATURE_ERMS,   \
+                .Lmemmove_end_forward-.Lmemmove_begin_forward,  \
+                .Lmemmove_end_forward_efs-.Lmemmove_begin_forward_efs
         .previous
 ENDPROC(memmove)