git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'release' and 'throttling-domains' into release
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
lib
/
copy_user_nocache_64.S
diff --git
a/arch/x86/lib/copy_user_nocache_64.S
b/arch/x86/lib/copy_user_nocache_64.S
index 4620efb12f132a59cd6a2fdf8758fa5e0e88f596..5196762b3b0ea3017cbb43e97f253c68055a1a7f 100644
(file)
--- a/
arch/x86/lib/copy_user_nocache_64.S
+++ b/
arch/x86/lib/copy_user_nocache_64.S
@@
-117,6
+117,7
@@
ENTRY(__copy_user_nocache)
popq %rbx
CFI_ADJUST_CFA_OFFSET -8
CFI_RESTORE rbx
+ sfence
ret
CFI_RESTORE_STATE