diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2017-11-10 20:55:03 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-11-10 20:55:03 +1100 |
| commit | a54c61f46e25345e99eec06a402f746fe33febc6 (patch) | |
| tree | 23f59fe8702aaf90802cef6f25e76c15211747e1 /arch/powerpc/kernel/dt_cpu_ftrs.c | |
| parent | 77fad8bfb1d2f8225b05e4ea34457875fcfae37e (diff) | |
| parent | 7ecb37f62fe58e3e4d9b03443b92d213b2c108ce (diff) | |
Merge branch 'fixes' into next
We have some dependencies & conflicts between patches in fixes and
things to go in next, both in the radix TLB flush code and the IMC PMU
driver. So merge fixes into next.
Diffstat (limited to 'arch/powerpc/kernel/dt_cpu_ftrs.c')
| -rw-r--r-- | arch/powerpc/kernel/dt_cpu_ftrs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/dt_cpu_ftrs.c b/arch/powerpc/kernel/dt_cpu_ftrs.c index a7ad181d0deb..58e3b51de31c 100644 --- a/arch/powerpc/kernel/dt_cpu_ftrs.c +++ b/arch/powerpc/kernel/dt_cpu_ftrs.c @@ -102,10 +102,10 @@ static void cpufeatures_flush_tlb(void) case PVR_POWER8: case PVR_POWER8E: case PVR_POWER8NVL: - __flush_tlb_power8(POWER8_TLB_SETS); + __flush_tlb_power8(TLB_INVAL_SCOPE_GLOBAL); break; case PVR_POWER9: - __flush_tlb_power9(POWER9_TLB_SETS_HASH); + __flush_tlb_power9(TLB_INVAL_SCOPE_GLOBAL); break; default: pr_err("unknown CPU version for boot TLB flush\n"); |