diff options
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/vsyscall_64.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c index 2f90202e59b3..ece02932ea57 100644 --- a/arch/x86/kernel/vsyscall_64.c +++ b/arch/x86/kernel/vsyscall_64.c | |||
| @@ -17,13 +17,8 @@ | |||
| 17 | * want per guest time just set the kernel.vsyscall64 sysctl to 0. | 17 | * want per guest time just set the kernel.vsyscall64 sysctl to 0. |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | /* Protect userspace from profiling */ | 20 | /* Disable profiling for userspace code: */ |
| 21 | #ifdef CONFIG_TRACE_UNLIKELY_PROFILE | 21 | #define DISABLE_UNLIKELY_PROFILE |
| 22 | # undef likely | ||
| 23 | # undef unlikely | ||
| 24 | # define likely(x) likely_notrace(x) | ||
| 25 | # define unlikely(x) unlikely_notrace(x) | ||
| 26 | #endif | ||
| 27 | 22 | ||
| 28 | #include <linux/time.h> | 23 | #include <linux/time.h> |
| 29 | #include <linux/init.h> | 24 | #include <linux/init.h> |