Skip to content

Commit

Permalink
x86/speculation: Fix up array_index_nospec_mask() asm constraint
Browse files Browse the repository at this point in the history
Allow the compiler to handle @size as an immediate value or memory
directly rather than allocating a register.

Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/151797010204.1289.1510000292250184993.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
Dan Williams authored and Ingo Molnar committed Feb 15, 2018
1 parent 3b3a371 commit be3233f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/x86/include/asm/barrier.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit be3233f

Please sign in to comment.