github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 18:13:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

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

Browse Source 
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
This commit is contained in:
Will Deacon 2021-02-12 14:46:16 +00:00
commit bab8443ba8
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/kernel/alternative.c
View File

@ -17,7 +17,7 @@
#include <asm/sections.h>
#include <linux/stop_machine.h>
#define __ALT_PTR(a,f) ((void *)&(a)->f + (a)->f)
#define __ALT_PTR(a, f) ((void *)&(a)->f + (a)->f)
#define ALT_ORIG_PTR(a) __ALT_PTR(a, orig_offset)
#define ALT_REPL_PTR(a) __ALT_PTR(a, alt_offset)

2
arch/arm64/kernel/module-plts.c
View File

@ -131,7 +131,7 @@ u64 module_emit_veneer_for_adrp(struct module *mod, Elf64_Shdr *sechdrs,
}
#endif
#define cmp_3way(a,b) ((a) < (b) ? -1 : (a) > (b))
#define cmp_3way(a, b) ((a) < (b) ? -1 : (a) > (b))
static int cmp_rela(const void *a, const void *b)
{

2
arch/arm64/kernel/perf_event.c
View File

@ -810,7 +810,7 @@ static int armv8pmu_get_single_idx(struct pmu_hw_events *cpuc,
{
int idx;
for (idx = ARMV8_IDX_COUNTER0; idx < cpu_pmu->num_events; idx ++) {
for (idx = ARMV8_IDX_COUNTER0; idx < cpu_pmu->num_events; idx++) {
if (!test_and_set_bit(idx, cpuc->used_mask))
return idx;
}

4
arch/arm64/kernel/process.c
View File

@ -304,7 +304,7 @@ void __show_regs(struct pt_regs *regs)
}
}
void show_regs(struct pt_regs * regs)
void show_regs(struct pt_regs *regs)
{
__show_regs(regs);
dump_backtrace(regs, NULL, KERN_DEFAULT);
@ -587,7 +587,7 @@ unsigned long get_wchan(struct task_struct *p)
ret = frame.pc;
goto out;
}
} while (count ++ < 16);
} while (count++ < 16);
out:
put_task_stack(p);

2
arch/arm64/kernel/traps.c
View File

@ -45,7 +45,7 @@
#include <asm/system_misc.h>
#include <asm/sysreg.h>
static const char *handler[]= {
static const char *handler[] = {
"Synchronous Abort",
"IRQ",
"FIQ",

2
arch/arm64/mm/fault.c
View File

@ -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();