OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3b3a371
)
x86/speculation: Fix up array_index_nospec_mask() asm constraint
author
Dan Williams
<dan.j.williams@intel.com>
Wed, 7 Feb 2018 02:22:40 +0000
(18:22 -0800)
committer
Ingo Molnar
<mingo@kernel.org>
Thu, 15 Feb 2018 00:15:50 +0000
(
01:15
+0100)
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>
arch/x86/include/asm/barrier.h
patch
|
blob
|
history
diff --git
a/arch/x86/include/asm/barrier.h
b/arch/x86/include/asm/barrier.h
index
30d4061
..
e1259f0
100644
(file)
--- 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;
}