git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tracing: profile likely and unlikely annotations
[safe/jmp/linux-2.6]
/
arch
/
x86
/
kernel
/
vsyscall_64.c
diff --git
a/arch/x86/kernel/vsyscall_64.c
b/arch/x86/kernel/vsyscall_64.c
index
0b8b669
..
2f90202
100644
(file)
--- a/
arch/x86/kernel/vsyscall_64.c
+++ b/
arch/x86/kernel/vsyscall_64.c
@@
-17,6
+17,14
@@
* want per guest time just set the kernel.vsyscall64 sysctl to 0.
*/
* want per guest time just set the kernel.vsyscall64 sysctl to 0.
*/
+/* Protect userspace from profiling */
+#ifdef CONFIG_TRACE_UNLIKELY_PROFILE
+# undef likely
+# undef unlikely
+# define likely(x) likely_notrace(x)
+# define unlikely(x) unlikely_notrace(x)
+#endif
+
#include <linux/time.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/time.h>
#include <linux/init.h>
#include <linux/kernel.h>