Message ID | 1458842023-31853-10-git-send-email-julien.grall@arm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 03/24/2016 06:53 PM, Julien Grall wrote: > The only call of arch_timer_get_timecounter (in KVM) has been removed. > > Signed-off-by: Julien Grall <julien.grall@arm.com> > Acked-by: Christoffer Dall <christoffer.dall@linaro.org> Hi Julien, do you want me to take this patch through my tree ? -- Daniel
On 29/03/16 15:39, Daniel Lezcano wrote: > On 03/24/2016 06:53 PM, Julien Grall wrote: >> The only call of arch_timer_get_timecounter (in KVM) has been removed. >> >> Signed-off-by: Julien Grall <julien.grall@arm.com> >> Acked-by: Christoffer Dall <christoffer.dall@linaro.org> > > Hi Julien, Hi Daniel, > do you want me to take this patch through my tree ? This patch depends on patch #7, so it's not possible to merge for now. The plan suggested to merge the series is divided in 3 steps: 1) Patch #1-#2 are merged via your tree Patch #2-#6 are merged via the irqchip-tree 2) Patch #7-#8 are merged via the KVM tree 3) Patch #9 (this patch) is merge via your tree I can ping you when the steps 1 and 2 are completed. Regards,
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index bb58224..4814446 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -475,11 +475,6 @@ struct arch_timer_kvm_info *arch_timer_get_kvm_info(void) return &arch_timer_kvm_info; } -struct timecounter *arch_timer_get_timecounter(void) -{ - return &arch_timer_kvm_info.timecounter; -} - static void __init arch_counter_register(unsigned type) { u64 start_count; diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h index 9dd996a..caedb74 100644 --- a/include/clocksource/arm_arch_timer.h +++ b/include/clocksource/arm_arch_timer.h @@ -58,7 +58,6 @@ struct arch_timer_kvm_info { extern u32 arch_timer_get_rate(void); extern u64 (*arch_timer_read_counter)(void); -extern struct timecounter *arch_timer_get_timecounter(void); extern struct arch_timer_kvm_info *arch_timer_get_kvm_info(void); #else @@ -73,11 +72,6 @@ static inline u64 arch_timer_read_counter(void) return 0; } -static inline struct timecounter *arch_timer_get_timecounter(void) -{ - return NULL; -} - #endif #endif