Skip to content

Commit b405804

Browse files
committed
lkl: follow up fixes after v4.10 merge
This commit includes several adapts for arch/lkl: - change cpu_idle_loop to do_idle for scheduling - cycle_t to u64 for clock_read() return value Signed-off-by: Hajime Tazaki <thehajime@gmail.com>
1 parent b485d40 commit b405804

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

arch/lkl/include/asm/cpu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ void lkl_cpu_change_owner(lkl_thread_t owner);
1212
void lkl_cpu_set_irqs_pending(void);
1313
void lkl_idle_tail_schedule(void);
1414
int lkl_cpu_idle_pending(void);
15-
extern void cpu_idle_loop(void);
15+
extern void do_idle(void);
1616

1717
#endif /* _ASM_LKL_CPU_H */

arch/lkl/kernel/cpu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ void arch_cpu_idle_prepare(void)
237237
* jump back to the beginning.
238238
*/
239239
while (1)
240-
lkl_ops->jmp_buf_set(&cpu.idle_jb, cpu_idle_loop);
240+
lkl_ops->jmp_buf_set(&cpu.idle_jb, do_idle);
241241
}
242242

243243
void lkl_cpu_wakeup_idle(void)

arch/lkl/kernel/time.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ unsigned long long sched_clock(void)
4848
return lkl_ops->time() - boot_time;
4949
}
5050

51-
static cycle_t clock_read(struct clocksource *cs)
51+
static u64 clock_read(struct clocksource *cs)
5252
{
5353
return lkl_ops->time();
5454
}

0 commit comments

Comments
 (0)