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 branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
mm
/
mem_encrypt.c
diff --git
a/arch/x86/mm/mem_encrypt.c
b/arch/x86/mm/mem_encrypt.c
index 3fcc8e01683bef96b219d65dbdd0315db1f60605..16c5f37933a2ae2d120402f1871af93872aebb07 100644
(file)
--- a/
arch/x86/mm/mem_encrypt.c
+++ b/
arch/x86/mm/mem_encrypt.c
@@
-10,6
+10,8
@@
* published by the Free Software Foundation.
*/
+#define DISABLE_BRANCH_PROFILING
+
#include <linux/linkage.h>
#include <linux/init.h>
#include <linux/mm.h>