Skip to content

Commit b3b90e5

Browse files
amlutoIngo Molnar
authored andcommitted
x86/mm: Reduce indentation in flush_tlb_func()
The leave_mm() case can just exit the function early so we don't need to indent the entire remainder of the function. Signed-off-by: Andy Lutomirski <luto@kernel.org> Acked-by: Kees Cook <keescook@chromium.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Borislav Petkov <bpetkov@suse.de> Cc: Dave Hansen <dave.hansen@intel.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mel Gorman <mgorman@suse.de> Cc: Michal Hocko <mhocko@suse.com> Cc: Nadav Amit <nadav.amit@gmail.com> Cc: Nadav Amit <namit@vmware.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Rik van Riel <riel@redhat.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/97901ddcc9821d7bc7b296d2918d1179f08aaf22.1495492063.git.luto@kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
1 parent ca6c99c commit b3b90e5

File tree

1 file changed

+18
-16
lines changed

1 file changed

+18
-16
lines changed

arch/x86/mm/tlb.c

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -237,24 +237,26 @@ static void flush_tlb_func(void *info)
237237
return;
238238

239239
count_vm_tlb_event(NR_TLB_REMOTE_FLUSH_RECEIVED);
240-
if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK) {
241-
if (f->flush_end == TLB_FLUSH_ALL) {
242-
local_flush_tlb();
243-
trace_tlb_flush(TLB_REMOTE_SHOOTDOWN, TLB_FLUSH_ALL);
244-
} else {
245-
unsigned long addr;
246-
unsigned long nr_pages =
247-
(f->flush_end - f->flush_start) / PAGE_SIZE;
248-
addr = f->flush_start;
249-
while (addr < f->flush_end) {
250-
__flush_tlb_single(addr);
251-
addr += PAGE_SIZE;
252-
}
253-
trace_tlb_flush(TLB_REMOTE_SHOOTDOWN, nr_pages);
254-
}
255-
} else
240+
241+
if (this_cpu_read(cpu_tlbstate.state) != TLBSTATE_OK) {
256242
leave_mm(smp_processor_id());
243+
return;
244+
}
257245

246+
if (f->flush_end == TLB_FLUSH_ALL) {
247+
local_flush_tlb();
248+
trace_tlb_flush(TLB_REMOTE_SHOOTDOWN, TLB_FLUSH_ALL);
249+
} else {
250+
unsigned long addr;
251+
unsigned long nr_pages =
252+
(f->flush_end - f->flush_start) / PAGE_SIZE;
253+
addr = f->flush_start;
254+
while (addr < f->flush_end) {
255+
__flush_tlb_single(addr);
256+
addr += PAGE_SIZE;
257+
}
258+
trace_tlb_flush(TLB_REMOTE_SHOOTDOWN, nr_pages);
259+
}
258260
}
259261

260262
void native_flush_tlb_others(const struct cpumask *cpumask,

0 commit comments

Comments
 (0)