diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2019-08-19 12:43:13 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-08-19 12:43:13 +1000 |
| commit | 4215fa2d7d3a872c4f6f383dc52961215b0ce2d6 (patch) | |
| tree | 3a91c7bbf90d168ad945705292cc735838139651 /arch/powerpc/mm/nohash/tlb.c | |
| parent | 2b87a2553aa04105724d6c844e223415985246ed (diff) | |
| parent | b9ee5e04fd77898208c51b1395fa0b5e8536f9b6 (diff) | |
Merge branch 'fixes' into next
Merge in our fixes branch, which brings in clone3() as well as some
implicit fallthrough fixes we want in next.
Diffstat (limited to 'arch/powerpc/mm/nohash/tlb.c')
| -rw-r--r-- | arch/powerpc/mm/nohash/tlb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/mm/nohash/tlb.c b/arch/powerpc/mm/nohash/tlb.c index d4acf6fa0596..bf60983a58c7 100644 --- a/arch/powerpc/mm/nohash/tlb.c +++ b/arch/powerpc/mm/nohash/tlb.c @@ -630,7 +630,6 @@ static void early_init_this_mmu(void) #ifdef CONFIG_PPC_FSL_BOOK3E if (mmu_has_feature(MMU_FTR_TYPE_FSL_E)) { unsigned int num_cams; - int __maybe_unused cpu = smp_processor_id(); bool map = true; /* use a quarter of the TLBCAM for bolted linear map */ |