From 7774e178bc0fc2fad84f83b51b5eb2104007e4c9 Mon Sep 17 00:00:00 2001 From: Ksawlii Date: Sun, 24 Nov 2024 00:23:38 +0100 Subject: [PATCH] Revert "MIPS: cevt-r4k: Don't call get_c0_compare_int if timer irq is installed" This reverts commit cc75a38dcd305f6ce229d85dddd9766fb6bed254. --- arch/mips/kernel/cevt-r4k.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c index 232075160..995ad9e69 100755 --- a/arch/mips/kernel/cevt-r4k.c +++ b/arch/mips/kernel/cevt-r4k.c @@ -307,6 +307,13 @@ int r4k_clockevent_init(void) if (!c0_compare_int_usable()) return -ENXIO; + /* + * With vectored interrupts things are getting platform specific. + * get_c0_compare_int is a hook to allow a platform to return the + * interrupt number of its liking. + */ + irq = get_c0_compare_int(); + cd = &per_cpu(mips_clockevent_device, cpu); cd->name = "MIPS"; @@ -317,6 +324,7 @@ int r4k_clockevent_init(void) min_delta = calculate_min_delta(); cd->rating = 300; + cd->irq = irq; cd->cpumask = cpumask_of(cpu); cd->set_next_event = mips_next_event; cd->event_handler = mips_event_handler; @@ -328,13 +336,6 @@ int r4k_clockevent_init(void) cp0_timer_irq_installed = 1; - /* - * With vectored interrupts things are getting platform specific. - * get_c0_compare_int is a hook to allow a platform to return the - * interrupt number of its liking. - */ - irq = get_c0_compare_int(); - if (request_irq(irq, c0_compare_interrupt, flags, "timer", c0_compare_interrupt)) pr_err("Failed to request irq %d (timer)\n", irq);