tree 2a2d4ec9ed95c95f044c8d69e87ab47195a1d2ed
parent e68ff9cd15552e46e0f993eace25af0947b1222d
parent 3ae36655b97a03fa1decf72f04078ef945647c1a
author Linus Torvalds <torvalds@linux-foundation.org> 1313207184 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1313207184 -0700

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

* 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-tip:
  x86-64: Rework vsyscall emulation and add vsyscall= parameter
  x86-64: Wire up getcpu syscall
  x86: Remove unnecessary compile flag tweaks for vsyscall code
  x86-64: Add vsyscall:emulate_vsyscall trace event
  x86-64: Add user_64bit_mode paravirt op
  x86-64, xen: Enable the vvar mapping
  x86-64: Work around gold bug 13023
  x86-64: Move the "user" vsyscall segment out of the data segment.
  x86-64: Pad vDSO to a page boundary