diff options
Diffstat (limited to 'drivers/clocksource')
-rw-r--r-- | drivers/clocksource/acpi_pm.c | 10 | ||||
-rw-r--r-- | drivers/clocksource/tcb_clksrc.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c index c20171078d1d..e1129fad96dd 100644 --- a/drivers/clocksource/acpi_pm.c +++ b/drivers/clocksource/acpi_pm.c | |||
@@ -57,11 +57,6 @@ u32 acpi_pm_read_verified(void) | |||
57 | return v2; | 57 | return v2; |
58 | } | 58 | } |
59 | 59 | ||
60 | static cycle_t acpi_pm_read_slow(void) | ||
61 | { | ||
62 | return (cycle_t)acpi_pm_read_verified(); | ||
63 | } | ||
64 | |||
65 | static cycle_t acpi_pm_read(void) | 60 | static cycle_t acpi_pm_read(void) |
66 | { | 61 | { |
67 | return (cycle_t)read_pmtmr(); | 62 | return (cycle_t)read_pmtmr(); |
@@ -88,6 +83,11 @@ static int __init acpi_pm_good_setup(char *__str) | |||
88 | } | 83 | } |
89 | __setup("acpi_pm_good", acpi_pm_good_setup); | 84 | __setup("acpi_pm_good", acpi_pm_good_setup); |
90 | 85 | ||
86 | static cycle_t acpi_pm_read_slow(void) | ||
87 | { | ||
88 | return (cycle_t)acpi_pm_read_verified(); | ||
89 | } | ||
90 | |||
91 | static inline void acpi_pm_need_workaround(void) | 91 | static inline void acpi_pm_need_workaround(void) |
92 | { | 92 | { |
93 | clocksource_acpi_pm.read = acpi_pm_read_slow; | 93 | clocksource_acpi_pm.read = acpi_pm_read_slow; |
diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c index f450588e5858..254f1064d973 100644 --- a/drivers/clocksource/tcb_clksrc.c +++ b/drivers/clocksource/tcb_clksrc.c | |||
@@ -154,7 +154,6 @@ static struct tc_clkevt_device clkevt = { | |||
154 | .shift = 32, | 154 | .shift = 32, |
155 | /* Should be lower than at91rm9200's system timer */ | 155 | /* Should be lower than at91rm9200's system timer */ |
156 | .rating = 125, | 156 | .rating = 125, |
157 | .cpumask = CPU_MASK_CPU0, | ||
158 | .set_next_event = tc_next_event, | 157 | .set_next_event = tc_next_event, |
159 | .set_mode = tc_mode, | 158 | .set_mode = tc_mode, |
160 | }, | 159 | }, |
@@ -195,6 +194,7 @@ static void __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx) | |||
195 | clkevt.clkevt.max_delta_ns | 194 | clkevt.clkevt.max_delta_ns |
196 | = clockevent_delta2ns(0xffff, &clkevt.clkevt); | 195 | = clockevent_delta2ns(0xffff, &clkevt.clkevt); |
197 | clkevt.clkevt.min_delta_ns = clockevent_delta2ns(1, &clkevt.clkevt) + 1; | 196 | clkevt.clkevt.min_delta_ns = clockevent_delta2ns(1, &clkevt.clkevt) + 1; |
197 | clkevt.clkevt.cpumask = cpumask_of(0); | ||
198 | 198 | ||
199 | setup_irq(irq, &tc_irqaction); | 199 | setup_irq(irq, &tc_irqaction); |
200 | 200 | ||