| Message ID | 1460388780-914-11-git-send-email-julien.grall@arm.com |
|---|---|
| State | New |
| Headers | show |
On Mon, Apr 11, 2016 at 04:33:00PM +0100, 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> > > --- > Cc: Daniel Lezcano <daniel.lezcano@linaro.org> > Cc: Thomas Gleixner <tglx@linutronix.de> > > Changes in v4: > - Add Christoffer's acked-by > > Changes in v3: > - Patch added > --- Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Hi Daniel, On Tue, Apr 12, 2016 at 07:44:47AM +0200, Daniel Lezcano wrote: > On Mon, Apr 11, 2016 at 04:33:00PM +0100, 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> > > > > --- > > Cc: Daniel Lezcano <daniel.lezcano@linaro.org> > > Cc: Thomas Gleixner <tglx@linutronix.de> > > > > Changes in v4: > > - Add Christoffer's acked-by > > > > Changes in v3: > > - Patch added > > --- > > Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org> having acked these, do you want us to just take this a complete series via the kvmarm tree or do you plan on merging the patches individually? Thanks, -Christoffer
On 04/12/2016 02:15 PM, Christoffer Dall wrote: > Hi Daniel, > > On Tue, Apr 12, 2016 at 07:44:47AM +0200, Daniel Lezcano wrote: >> On Mon, Apr 11, 2016 at 04:33:00PM +0100, 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> >>> >>> --- >>> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> >>> Cc: Thomas Gleixner <tglx@linutronix.de> >>> >>> Changes in v4: >>> - Add Christoffer's acked-by >>> >>> Changes in v3: >>> - Patch added >>> --- >> >> Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org> > > having acked these, do you want us to just take this a complete series > via the kvmarm tree or do you plan on merging the patches individually? Just take it via the kvmarm tree. -- Daniel -- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
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