[GIT PULL] x86/vdso changes for 4.1

Andy Lutomirski
2015-03-26T01:11:43Z

Hi Ingo,

Here are my queued vdso changes for 4.1. There's nothing particularly
interesting. The change "x86, vdso: Remove x32 intermediates during
'make clean'" isn't on any mailing lists, but it's utterly trivial (I
just noticed that one of the other patches here was slightly
incomplete while tidying this up for the pull request).

Please pull into your favorite branch.

My kvmclock rewrite is once again deferred because KVM still hasn't
fixed a bug I need fixed first. Grump. On the off chance that the
bug gets fixed very soon and I can get my patch reviewed quickly, I
just might send you another pull request. Otherwise 4.2 (or 4.3
or...?) it is.

Thanks,
Andy

The following changes since commit b57c0b5175ddbe9b477801f9994a5b330702c1ba:

Merge tag 'pr-20150201-x86-entry' of
git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux into x86/asm
(2015-02-03 12:24:08 +0100)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux.git
tags/pr-x86-vdso-20150325

for you to fetch changes up to 7fa2ad4a63bc6f52e214125900d54165ef06cc10:

x86, vdso: Remove x32 intermediates during 'make clean' (2015-03-25
17:55:07 -0700)

----------------------------------------------------------------
x86/vdso changes for 4.1

This boring build stuff plus Denys' deletion of pointless SS code.
The interesting change I have queued up is unlikely to be ready for
4.1, so it's not included here.

----------------------------------------------------------------
Andrey Skvortsov (1):
x86, vdso: teach 'make clean' remove generated vdso-image-*.c files

Andy Lutomirski (1):
x86, vdso: Remove x32 intermediates during 'make clean'

Denys Vlasenko (1):
x86: vdso32/syscall.S: do not load __USER32_DS to %ss

Tommi Kyntola (1):
x86,vdso: fix the x86 vdso2c tool includes

arch/x86/vdso/Makefile | 4 ++--
arch/x86/vdso/vdso32/syscall.S | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
index 09297c8e1fcd..706d4670351d 100644
--- a/arch/x86/vdso/Makefile
+++ b/arch/x86/vdso/Makefile
@@ -50,7 +50,7 @@ VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
$(obj)/vdso64.so.dbg: $(src)/vdso.lds $(vobjs) FORCE
$(call if_changed,vdso)

-HOST_EXTRACFLAGS += -I$(srctree)/tools/include
+HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi
hostprogs-y += vdso2c

quiet_cmd_vdso2c = VDSO2C $@
@@ -205,4 +205,4 @@ $(vdso_img_insttargets): install_%: $(obj)/%.dbg
$(MODLIB)/vdso FORCE
PHONY += vdso_install $(vdso_img_insttargets)
vdso_install: $(vdso_img_insttargets) FORCE

-clean-files := vdso32-syscall* vdso32-sysenter* vdso32-int80* vdso64*
+clean-files := vdso32-syscall* vdso32-sysenter* vdso32-int80* vdso64*
vdso-image-*.c vdsox32.so*
diff --git a/arch/x86/vdso/vdso32/syscall.S b/arch/x86/vdso/vdso32/syscall.S
index 5415b5613d55..6b286bb5251c 100644
--- a/arch/x86/vdso/vdso32/syscall.S
+++ b/arch/x86/vdso/vdso32/syscall.S
@@ -19,8 +19,6 @@ __kernel_vsyscall:
.Lpush_ebp:
movl %ecx, %ebp
syscall
- movl $__USER32_DS, %ecx
- movl %ecx, %ss
movl %ebp, %ecx
popl %ebp