Skip to content

Commit

Permalink
Revert "parisc: Mark sched_clock unstable only if clocks are not sync…
Browse files Browse the repository at this point in the history
…ronized"

commit 7962c08 upstream.

This reverts commit d97180a.

It triggers RCU stalls at boot with a 32-bit kernel.

Signed-off-by: Helge Deller <deller@gmx.de>
Noticed-by: John David Anglin <dave.anglin@bell.net>
Cc: stable@vger.kernel.org # v5.15+
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
hdeller authored and gregkh committed May 12, 2022
1 parent d04b034 commit 8e89195
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 2 additions & 0 deletions arch/parisc/kernel/setup.c
Expand Up @@ -161,6 +161,8 @@ void __init setup_arch(char **cmdline_p)
#ifdef CONFIG_PA11
dma_ops_init();
#endif

clear_sched_clock_stable();
}

/*
Expand Down
7 changes: 4 additions & 3 deletions arch/parisc/kernel/time.c
Expand Up @@ -265,16 +265,17 @@ static int __init init_cr16_clocksource(void)
(cpu0_loc == per_cpu(cpu_data, cpu).cpu_loc))
continue;

/* mark sched_clock unstable */
clear_sched_clock_stable();

clocksource_cr16.name = "cr16_unstable";
clocksource_cr16.flags = CLOCK_SOURCE_UNSTABLE;
clocksource_cr16.rating = 0;
break;
}
}

/* XXX: We may want to mark sched_clock stable here if cr16 clocks are
* in sync:
* (clocksource_cr16.flags == CLOCK_SOURCE_IS_CONTINUOUS) */

/* register at clocksource framework */
clocksource_register_hz(&clocksource_cr16,
100 * PAGE0->mem_10msec);
Expand Down

0 comments on commit 8e89195

Please sign in to comment.