diff options
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/Kconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/time.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 78d6588b6e86..969f3d9ded91 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -137,7 +137,7 @@ config PPC | |||
137 | select ARCH_HAVE_NMI_SAFE_CMPXCHG | 137 | select ARCH_HAVE_NMI_SAFE_CMPXCHG |
138 | select GENERIC_SMP_IDLE_THREAD | 138 | select GENERIC_SMP_IDLE_THREAD |
139 | select GENERIC_CMOS_UPDATE | 139 | select GENERIC_CMOS_UPDATE |
140 | select GENERIC_TIME_VSYSCALL | 140 | select GENERIC_TIME_VSYSCALL_OLD |
141 | select GENERIC_CLOCKEVENTS | 141 | select GENERIC_CLOCKEVENTS |
142 | select GENERIC_STRNCPY_FROM_USER | 142 | select GENERIC_STRNCPY_FROM_USER |
143 | select GENERIC_STRNLEN_USER | 143 | select GENERIC_STRNLEN_USER |
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index c9986fd400d8..ce4cb772dc78 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c | |||
@@ -73,7 +73,7 @@ | |||
73 | /* powerpc clocksource/clockevent code */ | 73 | /* powerpc clocksource/clockevent code */ |
74 | 74 | ||
75 | #include <linux/clockchips.h> | 75 | #include <linux/clockchips.h> |
76 | #include <linux/clocksource.h> | 76 | #include <linux/timekeeper_internal.h> |
77 | 77 | ||
78 | static cycle_t rtc_read(struct clocksource *); | 78 | static cycle_t rtc_read(struct clocksource *); |
79 | static struct clocksource clocksource_rtc = { | 79 | static struct clocksource clocksource_rtc = { |
@@ -727,7 +727,7 @@ static cycle_t timebase_read(struct clocksource *cs) | |||
727 | return (cycle_t)get_tb(); | 727 | return (cycle_t)get_tb(); |
728 | } | 728 | } |
729 | 729 | ||
730 | void update_vsyscall(struct timespec *wall_time, struct timespec *wtm, | 730 | void update_vsyscall_old(struct timespec *wall_time, struct timespec *wtm, |
731 | struct clocksource *clock, u32 mult) | 731 | struct clocksource *clock, u32 mult) |
732 | { | 732 | { |
733 | u64 new_tb_to_xs, new_stamp_xsec; | 733 | u64 new_tb_to_xs, new_stamp_xsec; |