diff options
| author | Tom Zanussi <zanussi@kernel.org> | 2019-09-23 14:15:31 -0500 |
|---|---|---|
| committer | Tom Zanussi <zanussi@kernel.org> | 2019-09-23 14:15:31 -0500 |
| commit | eefb975a953d4a32da82a5f1c2df3ad131125749 (patch) | |
| tree | 8c05739b66306c04e2f77d7b7c8da9cba746615b /arch/mips | |
| parent | 14b6fd34081b814dc93cf3b2840de83dcfb246f4 (diff) | |
| parent | 01fd1694b93c92ad54fa684dac9c8068ecda8288 (diff) | |
| download | linux-rt-eefb975a953d4a32da82a5f1c2df3ad131125749.tar.gz | |
Merge tag 'v4.14.141' into v4.14-rt-work
This is the 4.14.141 stable release
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/kernel/cacheinfo.c | 2 | ||||
| -rw-r--r-- | arch/mips/kernel/i8253.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/mips/kernel/cacheinfo.c b/arch/mips/kernel/cacheinfo.c index 97d5239ca47b..428ef2189203 100644 --- a/arch/mips/kernel/cacheinfo.c +++ b/arch/mips/kernel/cacheinfo.c @@ -80,6 +80,8 @@ static int __populate_cache_leaves(unsigned int cpu) if (c->tcache.waysize) populate_cache(tcache, this_leaf, 3, CACHE_TYPE_UNIFIED); + this_cpu_ci->cpu_map_populated = true; + return 0; } diff --git a/arch/mips/kernel/i8253.c b/arch/mips/kernel/i8253.c index 5f209f111e59..df7ddd246eaa 100644 --- a/arch/mips/kernel/i8253.c +++ b/arch/mips/kernel/i8253.c @@ -32,7 +32,8 @@ void __init setup_pit_timer(void) static int __init init_pit_clocksource(void) { - if (num_possible_cpus() > 1) /* PIT does not scale! */ + if (num_possible_cpus() > 1 || /* PIT does not scale! */ + !clockevent_state_periodic(&i8253_clockevent)) return 0; return clocksource_i8253_init(); |