Commit aa47f90c authored by Uros Bizjak's avatar Uros Bizjak Committed by Ingo Molnar
Browse files

x86/percpu, xen: Correct PER_CPU_VAR() usage to include symbol and its addend 



The PER_CPU_VAR() macro should be applied to a symbol and its addend.
Inconsistent usage is currently harmless, but needs to be corrected
before %rip-relative addressing is introduced to the PER_CPU_VAR() macro.

No functional changes intended.

Signed-off-by: default avatarUros Bizjak <ubizjak@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Reviewed-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: linux-kernel@vger.kernel.org
Cc: Brian Gerst <brgerst@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Sean Christopherson <seanjc@google.com>
parent 39d64ee5

arch/x86/xen/xen-asm.S

+5 −5
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
 * non-zero.

 */

SYM_FUNC_START(xen_irq_disable_direct)

	movb $1, PER_CPU_VAR(xen_vcpu_info) + XEN_vcpu_info_mask

	movb $1, PER_CPU_VAR(xen_vcpu_info + XEN_vcpu_info_mask)

	RET

SYM_FUNC_END(xen_irq_disable_direct)
@@ -69,7 +69,7 @@ SYM_FUNC_END(check_events) 
SYM_FUNC_START(xen_irq_enable_direct)

	FRAME_BEGIN

	/* Unmask events */

	movb $0, PER_CPU_VAR(xen_vcpu_info) + XEN_vcpu_info_mask

	movb $0, PER_CPU_VAR(xen_vcpu_info + XEN_vcpu_info_mask)



	/*

	 * Preempt here doesn't matter because that will deal with any
@@ -78,7 +78,7 @@ SYM_FUNC_START(xen_irq_enable_direct) 
	 */



	/* Test for pending */

	testb $0xff, PER_CPU_VAR(xen_vcpu_info) + XEN_vcpu_info_pending

	testb $0xff, PER_CPU_VAR(xen_vcpu_info + XEN_vcpu_info_pending)

	jz 1f



	call check_events
@@ -97,7 +97,7 @@ SYM_FUNC_END(xen_irq_enable_direct) 
 * x86 use opposite senses (mask vs enable).

 */

SYM_FUNC_START(xen_save_fl_direct)

	testb $0xff, PER_CPU_VAR(xen_vcpu_info) + XEN_vcpu_info_mask

	testb $0xff, PER_CPU_VAR(xen_vcpu_info + XEN_vcpu_info_mask)

	setz %ah

	addb %ah, %ah

	RET
@@ -113,7 +113,7 @@ SYM_FUNC_END(xen_read_cr2); 


SYM_FUNC_START(xen_read_cr2_direct)

	FRAME_BEGIN

	_ASM_MOV PER_CPU_VAR(xen_vcpu_info) + XEN_vcpu_info_arch_cr2, %_ASM_AX

	_ASM_MOV PER_CPU_VAR(xen_vcpu_info + XEN_vcpu_info_arch_cr2), %_ASM_AX

	FRAME_END

	RET

SYM_FUNC_END(xen_read_cr2_direct);