Commit bab8443b authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'for-next/cosmetic' into for-next/core 

Cosmetic changes to tidy up stale comments and fix inconsistent
whitespace. No functional changes here!

* for-next/cosmetic:
  mm/arm64: Correct obsolete comment in do_page_fault()
  arm64: improve whitespace
parents 19c329f6 abd4737f

arch/arm64/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ static int __kprobes do_page_fault(unsigned long far, unsigned int esr, 
		mmap_read_lock(mm);

	} else {

		/*

		 * The above down_read_trylock() might have succeeded in which

		 * The above mmap_read_trylock() might have succeeded in which

		 * case, we'll have missed the might_sleep() from down_read().

		 */

		might_sleep();

arch/arm64/kernel/alternative.c

+1 −1

File changed.

Contains only whitespace changes.

arch/arm64/kernel/module-plts.c

+1 −1

File changed.

Contains only whitespace changes.

arch/arm64/kernel/perf_event.c

+1 −1

File changed.

Contains only whitespace changes.

arch/arm64/kernel/process.c

+2 −2

File changed.

Contains only whitespace changes.

arch/arm64/kernel/traps.c

+1 −1

File changed.

Contains only whitespace changes.