diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-22 09:05:34 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-22 09:05:34 +0100 |
| commit | c318f074d9fdeae16e19cbb2ed53b50d2bcdfdb8 (patch) | |
| tree | 44c6552fa919dfe1fc681949bf5d81fcf6a2beb8 /tools/bpf/bpftool/btf_dumper.c | |
| parent | Merge tag 'iio-for-5.6b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next (diff) | |
| parent | Linux 5.5-rc7 (diff) | |
| download | wireguard-linux-c318f074d9fdeae16e19cbb2ed53b50d2bcdfdb8.tar.xz wireguard-linux-c318f074d9fdeae16e19cbb2ed53b50d2bcdfdb8.zip | |
Merge 5.5-rc7 into staging-next
We want the staging fixes in here as well
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to '')
| -rw-r--r-- | tools/bpf/bpftool/btf_dumper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/bpf/bpftool/btf_dumper.c b/tools/bpf/bpftool/btf_dumper.c index d66131f69689..397e5716ab6d 100644 --- a/tools/bpf/bpftool/btf_dumper.c +++ b/tools/bpf/bpftool/btf_dumper.c @@ -26,7 +26,7 @@ static void btf_dumper_ptr(const void *data, json_writer_t *jw, bool is_plain_text) { if (is_plain_text) - jsonw_printf(jw, "%p", data); + jsonw_printf(jw, "%p", *(void **)data); else jsonw_printf(jw, "%lu", *(unsigned long *)data); } |