diff options
author | Mark Brown <broonie@kernel.org> | 2021-08-06 16:34:54 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2021-08-06 16:34:54 +0100 |
commit | e41b22b286628697ae7e231970238879473a2a0c (patch) | |
tree | 7a05d8de231e0ba85f6f6fa8a79ff4b1e4f9d28f /tools | |
parent | f434b4b555d80423a4eff569dd6b0c87cf1a2e88 (diff) | |
parent | 5d3986cf8ed63ff8d86270e578649e71143112d6 (diff) | |
download | linux-next-e41b22b286628697ae7e231970238879473a2a0c.tar.gz |
Merge remote-tracking branch 'rust/rust-next'
# Conflicts:
# Makefile
# include/linux/kallsyms.h
Diffstat (limited to 'tools')
-rw-r--r-- | tools/include/linux/kallsyms.h | 2 | ||||
-rw-r--r-- | tools/include/linux/lockdep.h | 2 | ||||
-rw-r--r-- | tools/lib/perf/include/perf/event.h | 2 | ||||
-rw-r--r-- | tools/lib/symbol/kallsyms.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tools/include/linux/kallsyms.h b/tools/include/linux/kallsyms.h index efb6c3f5f2a9..5a37ccbec54f 100644 --- a/tools/include/linux/kallsyms.h +++ b/tools/include/linux/kallsyms.h @@ -6,7 +6,7 @@ #include <stdio.h> #include <unistd.h> -#define KSYM_NAME_LEN 128 +#define KSYM_NAME_LEN 512 struct module; diff --git a/tools/include/linux/lockdep.h b/tools/include/linux/lockdep.h index e56997288f2b..d9c163f3ab24 100644 --- a/tools/include/linux/lockdep.h +++ b/tools/include/linux/lockdep.h @@ -47,7 +47,7 @@ static inline int debug_locks_off(void) #define task_pid_nr(tsk) ((tsk)->pid) -#define KSYM_NAME_LEN 128 +#define KSYM_NAME_LEN 512 #define printk(...) dprintf(STDOUT_FILENO, __VA_ARGS__) #define pr_err(format, ...) fprintf (stderr, format, ## __VA_ARGS__) #define pr_warn pr_err diff --git a/tools/lib/perf/include/perf/event.h b/tools/lib/perf/include/perf/event.h index 4d0c02ba3f7d..095d60144a70 100644 --- a/tools/lib/perf/include/perf/event.h +++ b/tools/lib/perf/include/perf/event.h @@ -95,7 +95,7 @@ struct perf_record_throttle { }; #ifndef KSYM_NAME_LEN -#define KSYM_NAME_LEN 256 +#define KSYM_NAME_LEN 512 #endif struct perf_record_ksymbol { diff --git a/tools/lib/symbol/kallsyms.h b/tools/lib/symbol/kallsyms.h index 72ab9870454b..542f9b059c3b 100644 --- a/tools/lib/symbol/kallsyms.h +++ b/tools/lib/symbol/kallsyms.h @@ -7,7 +7,7 @@ #include <linux/types.h> #ifndef KSYM_NAME_LEN -#define KSYM_NAME_LEN 256 +#define KSYM_NAME_LEN 512 #endif static inline u8 kallsyms2elf_binding(char type) |