summaryrefslogtreecommitdiffstats
path: root/kernel/arch/score
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/arch/score')
-rw-r--r--kernel/arch/score/include/asm/Kbuild3
-rw-r--r--kernel/arch/score/include/asm/cmpxchg.h2
-rw-r--r--kernel/arch/score/include/asm/switch_to.h2
-rw-r--r--kernel/arch/score/kernel/time.c31
4 files changed, 12 insertions, 26 deletions
diff --git a/kernel/arch/score/include/asm/Kbuild b/kernel/arch/score/include/asm/Kbuild
index 83ed116d4..a05218ff3 100644
--- a/kernel/arch/score/include/asm/Kbuild
+++ b/kernel/arch/score/include/asm/Kbuild
@@ -7,9 +7,10 @@ generic-y += clkdev.h
generic-y += cputime.h
generic-y += irq_work.h
generic-y += mcs_spinlock.h
+generic-y += mm-arch-hooks.h
generic-y += preempt.h
-generic-y += scatterlist.h
generic-y += sections.h
generic-y += trace_clock.h
generic-y += xor.h
generic-y += serial.h
+generic-y += word-at-a-time.h
diff --git a/kernel/arch/score/include/asm/cmpxchg.h b/kernel/arch/score/include/asm/cmpxchg.h
index f384839c3..cc3f6420b 100644
--- a/kernel/arch/score/include/asm/cmpxchg.h
+++ b/kernel/arch/score/include/asm/cmpxchg.h
@@ -42,8 +42,6 @@ static inline unsigned long __cmpxchg(volatile unsigned long *m,
(unsigned long)(o), \
(unsigned long)(n)))
-#define __HAVE_ARCH_CMPXCHG 1
-
#include <asm-generic/cmpxchg-local.h>
#endif /* _ASM_SCORE_CMPXCHG_H */
diff --git a/kernel/arch/score/include/asm/switch_to.h b/kernel/arch/score/include/asm/switch_to.h
index 031756b59..fda3f8330 100644
--- a/kernel/arch/score/include/asm/switch_to.h
+++ b/kernel/arch/score/include/asm/switch_to.h
@@ -8,6 +8,4 @@ do { \
(last) = resume(prev, next, task_thread_info(next)); \
} while (0)
-#define finish_arch_switch(prev) do {} while (0)
-
#endif /* _ASM_SCORE_SWITCH_TO_H */
diff --git a/kernel/arch/score/kernel/time.c b/kernel/arch/score/kernel/time.c
index 24770cd9b..679b8d7b0 100644
--- a/kernel/arch/score/kernel/time.c
+++ b/kernel/arch/score/kernel/time.c
@@ -55,31 +55,20 @@ static int score_timer_set_next_event(unsigned long delta,
return 0;
}
-static void score_timer_set_mode(enum clock_event_mode mode,
- struct clock_event_device *evdev)
+static int score_timer_set_periodic(struct clock_event_device *evt)
{
- switch (mode) {
- case CLOCK_EVT_MODE_PERIODIC:
- outl((TMR_M_PERIODIC | TMR_IE_ENABLE), P_TIMER0_CTRL);
- outl(SYSTEM_CLOCK/HZ, P_TIMER0_PRELOAD);
- outl(inl(P_TIMER0_CTRL) | TMR_ENABLE, P_TIMER0_CTRL);
- break;
- case CLOCK_EVT_MODE_ONESHOT:
- case CLOCK_EVT_MODE_SHUTDOWN:
- case CLOCK_EVT_MODE_RESUME:
- case CLOCK_EVT_MODE_UNUSED:
- break;
- default:
- BUG();
- }
+ outl((TMR_M_PERIODIC | TMR_IE_ENABLE), P_TIMER0_CTRL);
+ outl(SYSTEM_CLOCK / HZ, P_TIMER0_PRELOAD);
+ outl(inl(P_TIMER0_CTRL) | TMR_ENABLE, P_TIMER0_CTRL);
+ return 0;
}
static struct clock_event_device score_clockevent = {
- .name = "score_clockevent",
- .features = CLOCK_EVT_FEAT_PERIODIC,
- .shift = 16,
- .set_next_event = score_timer_set_next_event,
- .set_mode = score_timer_set_mode,
+ .name = "score_clockevent",
+ .features = CLOCK_EVT_FEAT_PERIODIC,
+ .shift = 16,
+ .set_next_event = score_timer_set_next_event,
+ .set_state_periodic = score_timer_set_periodic,
};
void __init time_init(void)