diff options
author | 2019-06-17 12:06:34 +0200 | |
---|---|---|
committer | 2019-06-17 12:06:34 +0200 | |
commit | 410df0c5748f6c5a53847d2acb163dc7cd8b6c51 (patch) | |
tree | 0c0f547f90a73ec6d30851f93720e0eb24f353eb /arch/parisc/kernel/alternative.c | |
parent | Documentation/atomic_t.txt: Clarify pure non-rmw usage (diff) | |
parent | Linux 5.2-rc5 (diff) | |
download | linux-dev-410df0c5748f6c5a53847d2acb163dc7cd8b6c51.tar.xz linux-dev-410df0c5748f6c5a53847d2acb163dc7cd8b6c51.zip |
Merge tag 'v5.2-rc5' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/parisc/kernel/alternative.c')
-rw-r--r-- | arch/parisc/kernel/alternative.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/parisc/kernel/alternative.c b/arch/parisc/kernel/alternative.c index bf2274e01a96..ca1f5ca0540a 100644 --- a/arch/parisc/kernel/alternative.c +++ b/arch/parisc/kernel/alternative.c @@ -56,7 +56,8 @@ void __init_or_module apply_alternatives(struct alt_instr *start, * time IO-PDIR is changed in Ike/Astro. */ if ((cond & ALT_COND_NO_IOC_FDC) && - (boot_cpu_data.pdc.capabilities & PDC_MODEL_IOPDIR_FDC)) + ((boot_cpu_data.cpu_type <= pcxw_) || + (boot_cpu_data.pdc.capabilities & PDC_MODEL_IOPDIR_FDC))) continue; /* Want to replace pdtlb by a pdtlb,l instruction? */ |