x86/speculation: Fix up array_index_nospec_mask() asm constraint

"Linux Kernel Mailing List" <[email protected]> Thu, 15 Feb 2018 01:31:43 +0000 (UTC)
Newsgroups gmane.linux.kernel.commits.head
Message-ID <[email protected]>
Web:        https://git.kernel.org/torvalds/c/be3233fbfcb8f5acb6e3bcd0895c3ef9e100d470
Commit:     be3233fbfcb8f5acb6e3bcd0895c3ef9e100d470
Parent:     3b3a371cc9bc980429baabe0a8e5f307f3d1f463
Refname:    refs/heads/master
Author:     Dan Williams <[email protected]>
AuthorDate: Tue Feb 6 18:22:40 2018 -0800
Committer:  Ingo Molnar <[email protected]>
CommitDate: Thu Feb 15 01:15:50 2018 +0100

    x86/speculation: Fix up array_index_nospec_mask() asm constraint
    
    Allow the compiler to handle @size as an immediate value or memory
    directly rather than allocating a register.
    
    Reported-by: Linus Torvalds <[email protected]>
    Signed-off-by: Dan Williams <[email protected]>
    Cc: Andy Lutomirski <[email protected]>
    Cc: Peter Zijlstra <[email protected]>
    Cc: Thomas Gleixner <[email protected]>
    Link: http://lkml.kernel.org/r/151797010204.1289.1510000292250184993.stgit@dwillia2-desk3.amr.corp.intel.com
    Signed-off-by: Ingo Molnar <[email protected]>
---
 arch/x86/include/asm/barrier.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h
index 30d406146016..e1259f043ae9 100644
--- a/arch/x86/include/asm/barrier.h
+++ b/arch/x86/include/asm/barrier.h
@@ -40,7 +40,7 @@ static inline unsigned long array_index_mask_nospec(unsigned long index,
 
 	asm ("cmp %1,%2; sbb %0,%0;"
 			:"=r" (mask)
-			:"r"(size),"r" (index)
+			:"g"(size),"r" (index)
 			:"cc");
 	return mask;
 }
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html