From 34f0fc51420b9f23befb33830c2817610ab4d2a1 Mon Sep 17 00:00:00 2001 From: Martin Schwidefsky Date: Fri, 12 Jun 2009 10:26:40 +0200 Subject: [PATCH] --- yaml --- r: 148773 b: refs/heads/master c: f3d0a0d96a7a2b4e1335437f68b3181ab252050a h: refs/heads/master i: 148771: f74662f4284fb15b4ff62f68c64a20d281107683 v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/time.c | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 7c0a5c5750b9..f3be1e734e71 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6cc7f168954fe8b3d8988a90b2478a9c11c5ebcb +refs/heads/master: f3d0a0d96a7a2b4e1335437f68b3181ab252050a diff --git a/trunk/arch/s390/kernel/time.c b/trunk/arch/s390/kernel/time.c index ef596d020573..ad9a999aaa92 100644 --- a/trunk/arch/s390/kernel/time.c +++ b/trunk/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(); } /*