summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2009-06-12 10:26:40 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2009-06-12 10:27:36 +0200
commitf3d0a0d96a7a2b4e1335437f68b3181ab252050a (patch)
tree595ef6fa83c6399e21e5cd3fcb846716c991f56f /arch
parent[S390] dasd: forward internal errors to dasd_sleep_on caller (diff)
downloadlinux-f3d0a0d96a7a2b4e1335437f68b3181ab252050a.tar.xz
linux-f3d0a0d96a7a2b4e1335437f68b3181ab252050a.zip
[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')
-rw-r--r--arch/s390/kernel/time.c7
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)
xtime->tv_nsec = ((todval * 1000) >> 12);
}
-#ifdef CONFIG_PROFILING
-#define s390_do_profile() profile_tick(CPU_PROFILING)
-#else
-#define s390_do_profile() do { ; } while(0)
-#endif /* CONFIG_PROFILING */
-
void clock_comparator_work(void)
{
struct clock_event_device *cd;
@@ -109,7 +103,6 @@ void clock_comparator_work(void)
set_clock_comparator(S390_lowcore.clock_comparator);
cd = &__get_cpu_var(comparators);
cd->event_handler(cd);
- s390_do_profile();
}
/*