Commit-ID: b4042ceaabbd913bc5b397ddd1e396eeb312d72f
Gitweb: http://git.kernel.org/tip/b4042ceaabbd913bc5b397ddd1e396eeb312d72f
Author: Stephen Boyd <sboyd@xxxxxxxxxxxxxx>
AuthorDate: Thu, 18 Jul 2013 16:21:19 -0700
Committer: John Stultz <john.stultz@xxxxxxxxxx>
CommitDate: Wed, 9 Oct 2013 16:54:39 -0700
sched_clock: Remove sched_clock_func() hook
Nobody is using sched_clock_func() anymore now that sched_clock
supports up to 64 bits. Remove the hook so that new code only
uses sched_clock_register().
Signed-off-by: Stephen Boyd <sboyd@xxxxxxxxxxxxxx>
Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx>
---
include/linux/sched_clock.h | 2 --
kernel/time/sched_clock.c | 9 +--------
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/include/linux/sched_clock.h b/include/linux/sched_clock.h
index eca7abe..cddf0c2 100644
--- a/include/linux/sched_clock.h
+++ b/include/linux/sched_clock.h
@@ -18,6 +18,4 @@ extern void setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate);
extern void sched_clock_register(u64 (*read)(void), int bits,
unsigned long rate);
-extern unsigned long long (*sched_clock_func)(void);
-
#endif
diff --git a/kernel/time/sched_clock.c b/kernel/time/sched_clock.c
index f388bae..68b7993 100644
--- a/kernel/time/sched_clock.c
+++ b/kernel/time/sched_clock.c
@@ -63,7 +63,7 @@ static inline u64 notrace cyc_to_ns(u64 cyc, u32 mult, u32 shift)
return (cyc * mult) >> shift;
}
-static unsigned long long notrace sched_clock_32(void)
+unsigned long long notrace sched_clock(void)
{
u64 epoch_ns;
u64 epoch_cyc;
@@ -170,13 +170,6 @@ void __init setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate)
sched_clock_register(read_sched_clock_32_wrapper, bits, rate);
}
-unsigned long long __read_mostly (*sched_clock_func)(void) = sched_clock_32;
-
-unsigned long long notrace sched_clock(void)
-{
- return sched_clock_func();
-}
-
void __init sched_clock_postinit(void)
{
/*
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|