Skip to content

Commit b0ce701

Browse files
committed
ARC: SMP resurrect #19: clockevent routines rename - nothing semantical
Signed-off-by: Vineet Gupta <[email protected]>
1 parent f7be1c1 commit b0ce701

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

arch/arc/kernel/process.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ static inline void arch_idle(void)
5050

5151
void cpu_idle(void)
5252
{
53+
/* Since we SLEEP in idle loop, TIF_POLLING_NRFLAG can't be set */
54+
5355
/* endless idle loop with no priority at all */
5456
while (1) {
5557
tick_nohz_stop_sched_tick(1);

arch/arc/kernel/time.c

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
/*
4949
* Arm the timer to interrupt after @limit cycles
5050
*/
51-
static void arc_timer0_setup_event(unsigned int limit)
51+
static void arc_periodic_timer_setup(unsigned int limit)
5252
{
5353
/* setup start and end markers */
5454
write_aux_reg(ARC_REG_TIMER0_LIMIT, limit);
@@ -63,7 +63,7 @@ static void arc_timer0_setup_event(unsigned int limit)
6363
/*
6464
* Acknowledge the interrupt & enable/disable the interrupt
6565
*/
66-
static void arc_timer0_ack_event(unsigned int irq_reenable)
66+
static void arc_periodic_timer_ack(unsigned int irq_reenable)
6767
{
6868
/* 1. Ack the interrupt by writing to CTRL reg.
6969
* Any write will cause intr to be ack, however it has to be one of
@@ -122,19 +122,20 @@ void __cpuinit arc_clocksource_init(void)
122122

123123
/********** Clock Event Device *********/
124124

125-
static int arc_next_event(unsigned long delta, struct clock_event_device *dev)
125+
static int arc_clkevent_set_next_event(unsigned long delta,
126+
struct clock_event_device *dev)
126127
{
127-
arc_timer0_setup_event(delta);
128+
arc_periodic_timer_setup(delta);
128129
return 0;
129130
}
130131

131-
static void arc_set_mode(enum clock_event_mode mode,
132-
struct clock_event_device *dev)
132+
static void arc_clkevent_set_mode(enum clock_event_mode mode,
133+
struct clock_event_device *dev)
133134
{
134135
pr_info("Device [%s] clockevent mode now [%d]\n", dev->name, mode);
135136
switch (mode) {
136137
case CLOCK_EVT_MODE_PERIODIC:
137-
arc_timer0_setup_event(CONFIG_ARC_PLAT_CLK / HZ);
138+
arc_periodic_timer_setup(CONFIG_ARC_PLAT_CLK / HZ);
138139
break;
139140
case CLOCK_EVT_MODE_ONESHOT:
140141
break;
@@ -150,9 +151,9 @@ static DEFINE_PER_CPU(struct clock_event_device, arc_clockevent_device) = {
150151
.features = CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_PERIODIC,
151152
.mode = CLOCK_EVT_MODE_UNUSED,
152153
.rating = 300,
153-
.irq = TIMER0_INT,
154-
.set_next_event = arc_next_event,
155-
.set_mode = arc_set_mode,
154+
.irq = TIMER0_INT, /* hardwired, no need for resources */
155+
.set_next_event = arc_clkevent_set_next_event,
156+
.set_mode = arc_clkevent_set_mode,
156157
};
157158

158159
static irqreturn_t timer_irq_handler(int irq, void *dev_id);
@@ -169,7 +170,7 @@ irqreturn_t timer_irq_handler(int irq, void *dev_id)
169170
unsigned int cpu = smp_processor_id();
170171
struct clock_event_device *evt = &per_cpu(arc_clockevent_device, cpu);
171172

172-
arc_timer0_ack_event(evt->mode == CLOCK_EVT_MODE_PERIODIC);
173+
arc_periodic_timer_ack(evt->mode == CLOCK_EVT_MODE_PERIODIC);
173174
evt->event_handler(evt);
174175
return IRQ_HANDLED;
175176
}

0 commit comments

Comments
 (0)