diff options
author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-01-05 06:47:25 -0500 |
---|---|---|
committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2011-01-05 06:47:24 -0500 |
commit | 860dba45e81be2e1ba977617652ae36084daebaf (patch) | |
tree | edeb79a565754fcec0d6bcfb225e36ad761cba48 /arch/s390/kernel/time.c | |
parent | 4a1886358b2d68f6f8745bfc10399c2376681acc (diff) |
[S390] add kprobes annotations
Add kprobes annotations to get the massive 'probe kernel.function("*") {}'
stress test working.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/time.c')
-rw-r--r-- | arch/s390/kernel/time.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index f754a6dc4f94..4c9d72d2e273 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #include <linux/clocksource.h> | 37 | #include <linux/clocksource.h> |
38 | #include <linux/clockchips.h> | 38 | #include <linux/clockchips.h> |
39 | #include <linux/gfp.h> | 39 | #include <linux/gfp.h> |
40 | #include <linux/kprobes.h> | ||
40 | #include <asm/uaccess.h> | 41 | #include <asm/uaccess.h> |
41 | #include <asm/delay.h> | 42 | #include <asm/delay.h> |
42 | #include <asm/s390_ext.h> | 43 | #include <asm/s390_ext.h> |
@@ -60,7 +61,7 @@ static DEFINE_PER_CPU(struct clock_event_device, comparators); | |||
60 | /* | 61 | /* |
61 | * Scheduler clock - returns current time in nanosec units. | 62 | * Scheduler clock - returns current time in nanosec units. |
62 | */ | 63 | */ |
63 | unsigned long long notrace sched_clock(void) | 64 | unsigned long long notrace __kprobes sched_clock(void) |
64 | { | 65 | { |
65 | return (get_clock_monotonic() * 125) >> 9; | 66 | return (get_clock_monotonic() * 125) >> 9; |
66 | } | 67 | } |