diff options
author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2009-06-12 04:26:40 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2009-06-12 04:27:36 -0400 |
commit | f3d0a0d96a7a2b4e1335437f68b3181ab252050a (patch) | |
tree | 595ef6fa83c6399e21e5cd3fcb846716c991f56f /arch/s390/kernel/time.c | |
parent | 6cc7f168954fe8b3d8988a90b2478a9c11c5ebcb (diff) |
[S390] profile_tick called twice
profile_tick is called twice for every clock comparator interrupt.
The generic clock event code does it in tick_sched_timer and the
s390 backend code in clock_comparator_work. That is one too many,
remove the one in the arch backend code.
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 | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index ef596d020573..ad9a999aaa92 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c | |||
@@ -95,12 +95,6 @@ void tod_to_timeval(__u64 todval, struct timespec *xtime) | |||
95 | xtime->tv_nsec = ((todval * 1000) >> 12); | 95 | xtime->tv_nsec = ((todval * 1000) >> 12); |
96 | } | 96 | } |
97 | 97 | ||
98 | #ifdef CONFIG_PROFILING | ||
99 | #define s390_do_profile() profile_tick(CPU_PROFILING) | ||
100 | #else | ||
101 | #define s390_do_profile() do { ; } while(0) | ||
102 | #endif /* CONFIG_PROFILING */ | ||
103 | |||
104 | void clock_comparator_work(void) | 98 | void clock_comparator_work(void) |
105 | { | 99 | { |
106 | struct clock_event_device *cd; | 100 | struct clock_event_device *cd; |
@@ -109,7 +103,6 @@ void clock_comparator_work(void) | |||
109 | set_clock_comparator(S390_lowcore.clock_comparator); | 103 | set_clock_comparator(S390_lowcore.clock_comparator); |
110 | cd = &__get_cpu_var(comparators); | 104 | cd = &__get_cpu_var(comparators); |
111 | cd->event_handler(cd); | 105 | cd->event_handler(cd); |
112 | s390_do_profile(); | ||
113 | } | 106 | } |
114 | 107 | ||
115 | /* | 108 | /* |