Messages in this thread Patch in this message | | | Date | Mon, 13 Apr 2015 11:53:17 +0200 | From | Ingo Molnar <> | Subject | [GIT PULL] x86/vdso changes for v4.1 |
| |
Linus,
Please pull the latest x86-vdso-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-vdso-for-linus
# HEAD: 115db5c68bd4ed7fbcb73f300e666ff127b359b6 x86/vdso: Remove x32 intermediates during 'make clean'
Misc vDSO updates.
Thanks,
Ingo
------------------> Andrey Skvortsov (1): x86/vdso: Teach 'make clean' to 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 7b9be9822724..275a3a8b78af 100644 --- a/arch/x86/vdso/Makefile +++ b/arch/x86/vdso/Makefile @@ -51,7 +51,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 $@ @@ -206,4 +206,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 @@ .Lpush_ebp: movl %ecx, %ebp syscall - movl $__USER32_DS, %ecx - movl %ecx, %ss movl %ebp, %ecx popl %ebp .Lpop_ebp:
| |