Skip to content

Commit 2f02a61

Browse files
committed
tracing: probes: Sort #include alphabetically
Sort the #include directives in trace_probe* files alphabetically for easier maintenance and avoid double includes. This also groups headers as linux-generic, asm-generic, and local headers. Link: https://lore.kernel.org/all/175323424678.57270.11975372127870059007.stgit@devnote2/ Signed-off-by: Masami Hiramatsu (Google) <[email protected]>
1 parent e1876fb commit 2f02a61

File tree

6 files changed

+24
-22
lines changed

6 files changed

+24
-22
lines changed

kernel/trace/trace_eprobe.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
* Copyright (C) 2021, VMware Inc, Tzvetomir Stoyanov [email protected]>
1010
*
1111
*/
12+
#include <linux/ftrace.h>
1213
#include <linux/module.h>
1314
#include <linux/mutex.h>
14-
#include <linux/ftrace.h>
1515

1616
#include "trace_dynevent.h"
1717
#include "trace_probe.h"
18-
#include "trace_probe_tmpl.h"
1918
#include "trace_probe_kernel.h"
19+
#include "trace_probe_tmpl.h"
2020

2121
#define EPROBE_EVENT_SYSTEM "eprobes"
2222

kernel/trace/trace_fprobe.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
* Copyright (C) 2022 Google LLC.
55
*/
66
#define pr_fmt(fmt) "trace_fprobe: " fmt
7-
#include <asm/ptrace.h>
87

98
#include <linux/fprobe.h>
109
#include <linux/list.h>
@@ -15,6 +14,8 @@
1514
#include <linux/tracepoint.h>
1615
#include <linux/uaccess.h>
1716

17+
#include <asm/ptrace.h>
18+
1819
#include "trace_dynevent.h"
1920
#include "trace_probe.h"
2021
#include "trace_probe_kernel.h"

kernel/trace/trace_kprobe.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99

1010
#include <linux/bpf-cgroup.h>
1111
#include <linux/cleanup.h>
12-
#include <linux/security.h>
12+
#include <linux/error-injection.h>
1313
#include <linux/module.h>
14-
#include <linux/uaccess.h>
1514
#include <linux/rculist.h>
16-
#include <linux/error-injection.h>
15+
#include <linux/security.h>
16+
#include <linux/uaccess.h>
1717

1818
#include <asm/setup.h> /* for COMMAND_LINE_SIZE */
1919

2020
#include "trace_dynevent.h"
2121
#include "trace_kprobe_selftest.h"
2222
#include "trace_probe.h"
23-
#include "trace_probe_tmpl.h"
2423
#include "trace_probe_kernel.h"
24+
#include "trace_probe_tmpl.h"
2525

2626
#define KPROBE_EVENT_SYSTEM "kprobes"
2727
#define KRETPROBE_MAXACTIVE_MAX 4096

kernel/trace/trace_probe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
#include <linux/bpf.h>
1515
#include <linux/fs.h>
16-
#include "trace_btf.h"
1716

17+
#include "trace_btf.h"
1818
#include "trace_probe.h"
1919

2020
#undef C

kernel/trace/trace_probe.h

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,21 @@
1010
* Author: Srikar Dronamraju
1111
*/
1212

13+
#include <linux/bitops.h>
14+
#include <linux/btf.h>
15+
#include <linux/kprobes.h>
16+
#include <linux/limits.h>
17+
#include <linux/perf_event.h>
18+
#include <linux/ptrace.h>
1319
#include <linux/seq_file.h>
1420
#include <linux/slab.h>
1521
#include <linux/smp.h>
16-
#include <linux/tracefs.h>
17-
#include <linux/types.h>
1822
#include <linux/string.h>
19-
#include <linux/ptrace.h>
20-
#include <linux/perf_event.h>
21-
#include <linux/kprobes.h>
2223
#include <linux/stringify.h>
23-
#include <linux/limits.h>
24+
#include <linux/tracefs.h>
25+
#include <linux/types.h>
2426
#include <linux/uaccess.h>
25-
#include <linux/bitops.h>
26-
#include <linux/btf.h>
27+
2728
#include <asm/bitsperlong.h>
2829

2930
#include "trace.h"

kernel/trace/trace_uprobe.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
#define pr_fmt(fmt) "trace_uprobe: " fmt
99

1010
#include <linux/bpf-cgroup.h>
11-
#include <linux/security.h>
1211
#include <linux/ctype.h>
12+
#include <linux/filter.h>
1313
#include <linux/module.h>
14-
#include <linux/uaccess.h>
15-
#include <linux/uprobes.h>
1614
#include <linux/namei.h>
17-
#include <linux/string.h>
18-
#include <linux/rculist.h>
19-
#include <linux/filter.h>
2015
#include <linux/percpu.h>
16+
#include <linux/rculist.h>
17+
#include <linux/security.h>
18+
#include <linux/string.h>
19+
#include <linux/uaccess.h>
20+
#include <linux/uprobes.h>
2121

2222
#include "trace_dynevent.h"
2323
#include "trace_probe.h"

0 commit comments

Comments
 (0)