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"

This reverts commit d97180a.

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

Signed-off-by: Helge Deller <[email protected]>
Noticed-by: John David Anglin <[email protected]>
Cc: [email protected] # v5.15+
  • Loading branch information
hdeller committed May 8, 2022
1 parent 9dc4241 commit 7962c08
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
Expand Up @@ -267,16 +267,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 7962c08

Please sign in to comment.