powerpc/time: Fix tracing in time.c

santoshs · mpe · commit 6b847d795cf4 · 2017-06-21T20:37:27.000+10:00
Since trace_clock is in a different file and already marked with notrace,
enable tracing in time.c by removing it from the disabled list in Makefile.
Also annotate clocksource read functions and sched_clock with notrace.

Testing: Timer and ftrace selftests run with different trace clocks.

Acked-by: Naveen N. Rao &lt;naveen.n.rao@linux.vnet.ibm.com&gt;
Signed-off-by: Santosh Sivaraj &lt;santosh@fossix.org&gt;
Signed-off-by: Michael Ellerman &lt;mpe@ellerman.id.au&gt;
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
@@ -25,8 +25,6 @@ CFLAGS_REMOVE_cputable.o = -mno-sched-epilog $(CC_FLAGS_FTRACE)
 CFLAGS_REMOVE_prom_init.o = -mno-sched-epilog $(CC_FLAGS_FTRACE)
 CFLAGS_REMOVE_btext.o = -mno-sched-epilog $(CC_FLAGS_FTRACE)
 CFLAGS_REMOVE_prom.o = -mno-sched-epilog $(CC_FLAGS_FTRACE)
-# timers used by tracing
-CFLAGS_REMOVE_time.o = -mno-sched-epilog $(CC_FLAGS_FTRACE)
 endif
 
 obj-y				:= cputable.o ptrace.o syscalls.o \
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
@@ -675,7 +675,7 @@ EXPORT_SYMBOL_GPL(tb_to_ns);
  * the high 64 bits of a * b, i.e. (a * b) >> 64, where a and b
  * are 64-bit unsigned numbers.
  */
-unsigned long long sched_clock(void)
+notrace unsigned long long sched_clock(void)
 {
 	if (__USE_RTC())
 		return get_rtc();
@@ -831,12 +831,12 @@ void read_persistent_clock(struct timespec *ts)
 }
 
 /* clocksource code */
-static u64 rtc_read(struct clocksource *cs)
+static notrace u64 rtc_read(struct clocksource *cs)
 {
 	return (u64)get_rtc();
 }
 
-static u64 timebase_read(struct clocksource *cs)
+static notrace u64 timebase_read(struct clocksource *cs)
 {
 	return (u64)get_tb();
 }

Original file line number	Diff line number	Diff line change
`@@ -675,7 +675,7 @@ EXPORT_SYMBOL_GPL(tb_to_ns);`
`675`	`675`	`* the high 64 bits of a * b, i.e. (a * b) >> 64, where a and b`
`676`	`676`	`* are 64-bit unsigned numbers.`
`677`	`677`	`*/`
`678`		`-unsigned long long sched_clock(void)`
	`678`	`+notrace unsigned long long sched_clock(void)`
`679`	`679`	`{`
`680`	`680`	`if (__USE_RTC())`
`681`	`681`	`return get_rtc();`
`@@ -831,12 +831,12 @@ void read_persistent_clock(struct timespec *ts)`
`831`	`831`	`}`
`832`	`832`
`833`	`833`	`/* clocksource code */`
`834`		`-static u64 rtc_read(struct clocksource *cs)`
	`834`	`+static notrace u64 rtc_read(struct clocksource *cs)`
`835`	`835`	`{`
`836`	`836`	`return (u64)get_rtc();`
`837`	`837`	`}`
`838`	`838`
`839`		`-static u64 timebase_read(struct clocksource *cs)`
	`839`	`+static notrace u64 timebase_read(struct clocksource *cs)`
`840`	`840`	`{`
`841`	`841`	`return (u64)get_tb();`
`842`	`842`	`}`