Commit da849abe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, binutils, xen: Fix another wrong size directive
  x86: Remove dead config option X86_CPU
  x86: Really print supported CPUs if PROCESSOR_SELECT=y
  x86: Fix a bogus unwind annotation in lib/semaphore_32.S
  um, x86-64: Fix UML build after adding CFI annotations to lib/rwsem_64.S
  x86: Remove unused bits from lib/thunk_*.S
  x86: Use {push,pop}_cfi in more places
  x86-64: Add CFI annotations to lib/rwsem_64.S
  x86, asm: Cleanup unnecssary macros in asm-offsets.c
  x86, system.h: Drop unused __SAVE/__RESTORE macros
  x86: Use bitmap library functions
  x86: Partly unify asm-offsets_{32,64}.c
  x86: Reduce back the alignment of the per-CPU data section
parents 21a32816 371c394a

arch/um/Kconfig.x86

+5 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ endmenu 


config UML_X86

	def_bool y

	select GENERIC_FIND_FIRST_BIT

	select GENERIC_FIND_NEXT_BIT



config 64BIT

	bool
@@ -19,6 +21,9 @@ config X86_32 
	def_bool !64BIT

	select HAVE_AOUT



config X86_64

	def_bool 64BIT



config RWSEM_XCHGADD_ALGORITHM

	def_bool X86_XADD

arch/x86/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ config X86 
	select HAVE_TEXT_POKE_SMP

	select HAVE_GENERIC_HARDIRQS

	select HAVE_SPARSE_IRQ

	select GENERIC_FIND_FIRST_BIT

	select GENERIC_FIND_NEXT_BIT

	select GENERIC_IRQ_PROBE

	select GENERIC_PENDING_IRQ if SMP

	select USE_GENERIC_SMP_HELPERS if SMP

arch/x86/Kconfig.cpu

+0 −5
Original line number Diff line number Diff line
@@ -294,11 +294,6 @@ config X86_GENERIC 


endif



config X86_CPU

	def_bool y

	select GENERIC_FIND_FIRST_BIT

	select GENERIC_FIND_NEXT_BIT



#

# Define implied options from the CPU selection here

config X86_INTERNODE_CACHE_SHIFT

arch/x86/ia32/ia32entry.S

+9 −18
Original line number Diff line number Diff line
@@ -128,26 +128,20 @@ ENTRY(ia32_sysenter_target) 
	 */

	ENABLE_INTERRUPTS(CLBR_NONE)

 	movl	%ebp,%ebp		/* zero extension */

	pushq	$__USER32_DS

	CFI_ADJUST_CFA_OFFSET 8

	pushq_cfi $__USER32_DS

	/*CFI_REL_OFFSET ss,0*/

	pushq	%rbp

	CFI_ADJUST_CFA_OFFSET 8

	pushq_cfi %rbp

	CFI_REL_OFFSET rsp,0

	pushfq

	CFI_ADJUST_CFA_OFFSET 8

	pushfq_cfi

	/*CFI_REL_OFFSET rflags,0*/

	movl	8*3-THREAD_SIZE+TI_sysenter_return(%rsp), %r10d

	CFI_REGISTER rip,r10

	pushq	$__USER32_CS

	CFI_ADJUST_CFA_OFFSET 8

	pushq_cfi $__USER32_CS

	/*CFI_REL_OFFSET cs,0*/

	movl	%eax, %eax

	pushq	%r10

	CFI_ADJUST_CFA_OFFSET 8

	pushq_cfi %r10

	CFI_REL_OFFSET rip,0

	pushq	%rax

	CFI_ADJUST_CFA_OFFSET 8

	pushq_cfi %rax

	cld

	SAVE_ARGS 0,0,1

 	/* no need to do an access_ok check here because rbp has been
@@ -184,11 +178,9 @@ sysexit_from_sys_call: 
	xorq	%r9,%r9

	xorq	%r10,%r10

	xorq	%r11,%r11

	popfq

	CFI_ADJUST_CFA_OFFSET -8

	popfq_cfi

	/*CFI_RESTORE rflags*/

	popq	%rcx				/* User %esp */

	CFI_ADJUST_CFA_OFFSET -8

	popq_cfi %rcx				/* User %esp */

	CFI_REGISTER rsp,rcx

	TRACE_IRQS_ON

	ENABLE_INTERRUPTS_SYSEXIT32
@@ -423,8 +415,7 @@ ENTRY(ia32_syscall) 
	 */

	ENABLE_INTERRUPTS(CLBR_NONE)

	movl %eax,%eax

	pushq %rax

	CFI_ADJUST_CFA_OFFSET 8

	pushq_cfi %rax

	cld

	/* note the registers are not zero extended to the sf.

	   this could be a problem. */

arch/x86/include/asm/frame.h

+2 −4
Original line number Diff line number Diff line
@@ -7,14 +7,12 @@ 
   frame pointer later */

#ifdef CONFIG_FRAME_POINTER

	.macro FRAME

	pushl %ebp

	CFI_ADJUST_CFA_OFFSET 4

	pushl_cfi %ebp

	CFI_REL_OFFSET ebp,0

	movl %esp,%ebp

	.endm

	.macro ENDFRAME

	popl %ebp

	CFI_ADJUST_CFA_OFFSET -4

	popl_cfi %ebp

	CFI_RESTORE ebp

	.endm

#else

CRA Git | Maintained and supported by SUSTech CRA and CCSE