From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Wed, 28 Jan 2009 22:35:03 +0000 (-0800)
Subject: x86: fix paravirt clobber in entry_64.S
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b8aa287f77be943e37a84fa4657e27df95269bfb;p=deliverable%2Flinux.git

x86: fix paravirt clobber in entry_64.S

Impact: Fix latent bug

The clobber is trying to say that anything except RDI is available for
clobbering, but actually clobbers everything.  This hasn't mattered
because the clobbers were basically ignored, but subsequent patches
will rely on them.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---

diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index a52703864a16..e4c9710cae52 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -1140,7 +1140,7 @@ ENTRY(native_load_gs_index)
 	CFI_STARTPROC
 	pushf
 	CFI_ADJUST_CFA_OFFSET 8
-	DISABLE_INTERRUPTS(CLBR_ANY | ~(CLBR_RDI))
+	DISABLE_INTERRUPTS(CLBR_ANY & ~CLBR_RDI)
 	SWAPGS
 gs_change:
 	movl %edi,%gs