Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1364375 > unrolled thread
| Started by | Julien Grall <julien.grall@arm.com> |
|---|---|
| First post | 2016-03-24 19:00 +0100 |
| Last post | 2016-03-29 18:10 +0200 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH v4 9/9] clocksource: arm_arch_timer: Remove arch_timer_get_timecounter Julien Grall <julien.grall@arm.com> - 2016-03-24 19:00 +0100
Re: [PATCH v4 9/9] clocksource: arm_arch_timer: Remove arch_timer_get_timecounter Daniel Lezcano <daniel.lezcano@linaro.org> - 2016-03-29 16:40 +0200
Re: [PATCH v4 9/9] clocksource: arm_arch_timer: Remove arch_timer_get_timecounter Julien Grall <julien.grall@arm.com> - 2016-03-29 18:10 +0200
| From | Julien Grall <julien.grall@arm.com> |
|---|---|
| Date | 2016-03-24 19:00 +0100 |
| Subject | [PATCH v4 9/9] clocksource: arm_arch_timer: Remove arch_timer_get_timecounter |
| Message-ID | <rghI7-6aA-17@gated-at.bofh.it> |
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
---
drivers/clocksource/arm_arch_timer.c | 5 -----
include/clocksource/arm_arch_timer.h | 6 ------
2 files changed, 11 deletions(-)
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
--
1.9.1
[toc] | [next] | [standalone]
| From | Daniel Lezcano <daniel.lezcano@linaro.org> |
|---|---|
| Date | 2016-03-29 16:40 +0200 |
| Subject | Re: [PATCH v4 9/9] clocksource: arm_arch_timer: Remove arch_timer_get_timecounter |
| Message-ID | <ri2Yi-7C8-15@gated-at.bofh.it> |
| In reply to | #1364375 |
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 -- <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
[toc] | [prev] | [next] | [standalone]
| From | Julien Grall <julien.grall@arm.com> |
|---|---|
| Date | 2016-03-29 18:10 +0200 |
| Subject | Re: [PATCH v4 9/9] clocksource: arm_arch_timer: Remove arch_timer_get_timecounter |
| Message-ID | <ri4np-iJ-33@gated-at.bofh.it> |
| In reply to | #1366345 |
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,
--
Julien Grall
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web