---

yaml --- r: 148773 b: refs/heads/master c: f3d0a0d h: refs/heads/master i: 148771: f74662f v: v3
git-mirror · Jun 12, 2009 · 34f0fc5 · 34f0fc5
1 parent cff1364
commit 34f0fc5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git 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
@@ -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();
 }
 
 /*