diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-03-28 23:28:52 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-03-28 23:28:52 +0300 |
| commit | fcd476ea6a888ef6e6627f4c21a2ea8cca3e9312 (patch) | |
| tree | 6a9580a0a43f517be2f623dea65eba55e4a2fa75 | |
| parent | 756c1a0593e7d26bd7dc6332e9490607cd106c4f (diff) | |
| parent | d18a04157fc171fd48075e3dc96471bd3b87f0dd (diff) | |
| download | linux-fcd476ea6a888ef6e6627f4c21a2ea8cca3e9312.tar.xz | |
Merge tag 'urgent-rcu.2023.03.28a' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu
Pull RCU fix from Paul McKenney:
"This brings the rcu_torture_read event trace into line with the new
trace tools by replacing this event trace's __field() with the
corresponding __array().
Without this, the new trace tools will fail when presented wtih an
rcu_torture_read event trace, which is a regression from the viewpoint
of trace tools users"
Link: https://lore.kernel.org/all/20230320133650.5388a05e@gandalf.local.home/
* tag 'urgent-rcu.2023.03.28a' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu:
rcu: Fix rcu_torture_read ftrace event
| -rw-r--r-- | include/trace/events/rcu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/trace/events/rcu.h b/include/trace/events/rcu.h index 90b2fb0292cb..012fa0d171b2 100644 --- a/include/trace/events/rcu.h +++ b/include/trace/events/rcu.h @@ -768,7 +768,7 @@ TRACE_EVENT_RCU(rcu_torture_read, TP_ARGS(rcutorturename, rhp, secs, c_old, c), TP_STRUCT__entry( - __field(char, rcutorturename[RCUTORTURENAME_LEN]) + __array(char, rcutorturename, RCUTORTURENAME_LEN) __field(struct rcu_head *, rhp) __field(unsigned long, secs) __field(unsigned long, c_old) |