Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a16dda8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 vdso changes from Ingo Molnar:
 "Misc vDSO updates"

* 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/vdso: Remove x32 intermediates during 'make clean'
  x86/vdso: Teach 'make clean' to remove generated vdso-image-*.c files
  x86/vdso32/syscall.S: Do not load __USER32_DS to %ss
  x86/vdso: Fix the x86 vdso2c tool includes
parents ec1bc8e4 115db5c6

arch/x86/vdso/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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*

arch/x86/vdso/vdso32/syscall.S

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ __kernel_vsyscall: 
.Lpush_ebp:

	movl	%ecx, %ebp

	syscall

	movl	$__USER32_DS, %ecx

	movl	%ecx, %ss

	movl	%ebp, %ecx

	popl	%ebp

.Lpop_ebp: