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

Commit 9dda1658 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/asm' into x86/core, to prepare for new patch 



Collect all changes to arch/x86/entry/entry_64.S, before applying
patch that changes most of the file.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents b72e7464 a49976d1

Documentation/x86/entry_64.txt

+2 −2
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ Some of these entries are: 


 - system_call: syscall instruction from 64-bit code.



 - ia32_syscall: int 0x80 from 32-bit or 64-bit code; compat syscall

 - entry_INT80_compat: int 0x80 from 32-bit or 64-bit code; compat syscall

   either way.



 - ia32_syscall, ia32_sysenter: syscall and sysenter from 32-bit

 - entry_INT80_compat, ia32_sysenter: syscall and sysenter from 32-bit

   code



 - interrupt: An array of entries.  Every IDT vector that doesn't

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -10893,7 +10893,7 @@ M: Andy Lutomirski <luto@amacapital.net> 
L:	linux-kernel@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/vdso

S:	Maintained

F:	arch/x86/vdso/

F:	arch/x86/entry/vdso/



XC2028/3028 TUNER DRIVER

M:	Mauro Carvalho Chehab <mchehab@osg.samsung.com>

arch/x86/Kbuild

+4 −1
Original line number Diff line number Diff line 


obj-y += entry/



obj-$(CONFIG_KVM) += kvm/



# Xen paravirtualization support
@@ -11,7 +14,7 @@ obj-y += kernel/ 
obj-y += mm/



obj-y += crypto/

obj-y += vdso/



obj-$(CONFIG_IA32_EMULATION) += ia32/



obj-y += platform/

arch/x86/Makefile

+4 −10
Original line number Diff line number Diff line
@@ -149,12 +149,6 @@ endif 
sp-$(CONFIG_X86_32) := esp

sp-$(CONFIG_X86_64) := rsp



# do binutils support CFI?

cfi := $(call as-instr,.cfi_startproc\n.cfi_rel_offset $(sp-y)$(comma)0\n.cfi_endproc,-DCONFIG_AS_CFI=1)

# is .cfi_signal_frame supported too?

cfi-sigframe := $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONFIG_AS_CFI_SIGNAL_FRAME=1)

cfi-sections := $(call as-instr,.cfi_sections .debug_frame,-DCONFIG_AS_CFI_SECTIONS=1)



# does binutils support specific instructions?

asinstr := $(call as-instr,fxsaveq (%rax),-DCONFIG_AS_FXSAVEQ=1)

asinstr += $(call as-instr,pshufb %xmm0$(comma)%xmm0,-DCONFIG_AS_SSSE3=1)
@@ -162,8 +156,8 @@ asinstr += $(call as-instr,crc32l %eax$(comma)%eax,-DCONFIG_AS_CRC32=1) 
avx_instr := $(call as-instr,vxorps %ymm0$(comma)%ymm1$(comma)%ymm2,-DCONFIG_AS_AVX=1)

avx2_instr :=$(call as-instr,vpbroadcastb %xmm0$(comma)%ymm1,-DCONFIG_AS_AVX2=1)



KBUILD_AFLAGS += $(cfi) $(cfi-sigframe) $(cfi-sections) $(asinstr) $(avx_instr) $(avx2_instr)

KBUILD_CFLAGS += $(cfi) $(cfi-sigframe) $(cfi-sections) $(asinstr) $(avx_instr) $(avx2_instr)

KBUILD_AFLAGS += $(asinstr) $(avx_instr) $(avx2_instr)

KBUILD_CFLAGS += $(asinstr) $(avx_instr) $(avx2_instr)



LDFLAGS := -m elf_$(UTS_MACHINE)
@@ -187,7 +181,7 @@ archscripts: scripts_basic 
# Syscall table generation



archheaders:

	$(Q)$(MAKE) $(build)=arch/x86/syscalls all

	$(Q)$(MAKE) $(build)=arch/x86/entry/syscalls all



archprepare:

ifeq ($(CONFIG_KEXEC_FILE),y)
@@ -250,7 +244,7 @@ install: 


PHONY += vdso_install

vdso_install:

	$(Q)$(MAKE) $(build)=arch/x86/vdso $@

	$(Q)$(MAKE) $(build)=arch/x86/entry/vdso $@



archclean:

	$(Q)rm -rf $(objtree)/arch/i386

arch/x86/entry/Makefile

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#

# Makefile for the x86 low level entry code

#

obj-y				:= entry_$(BITS).o thunk_$(BITS).o syscall_$(BITS).o



obj-y				+= vdso/

obj-y				+= vsyscall/



obj-$(CONFIG_IA32_EMULATION)	+= entry_64_compat.o syscall_32.o