1See: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2c92ca849f 2--- 3 src/ice_trace.h | 19 +++++++++---------- 4 1 file changed, 9 insertions(+), 10 deletions(-) 5 6diff --git a/src/ice_trace.h b/src/ice_trace.h 7index 839647a..fe3d414 100644 8--- a/src/ice_trace.h 9+++ b/src/ice_trace.h 10@@ -88,7 +88,7 @@ DECLARE_EVENT_CLASS(ice_print_msg, 11 12 TP_STRUCT__entry(__string(msg, msg)), 13 14- TP_fast_assign(__assign_str(msg, msg);), 15+ TP_fast_assign(__assign_str(msg);), 16 17 TP_printk("%s", __get_str(msg)) 18 ); 19@@ -117,7 +117,7 @@ DECLARE_EVENT_CLASS(ice_rx_dim_template, 20 21 TP_fast_assign(__entry->q_vector = q_vector; 22 __entry->dim = dim; 23- __assign_str(devname, q_vector->rx.rx_ring->netdev->name);), 24+ __assign_str(devname);), 25 26 TP_printk("netdev: %s Rx-Q: %d dim-state: %d dim-profile: %d dim-tune: %d dim-st-right: %d dim-st-left: %d dim-tired: %d", 27 __get_str(devname), 28@@ -144,7 +144,7 @@ DECLARE_EVENT_CLASS(ice_tx_dim_template, 29 30 TP_fast_assign(__entry->q_vector = q_vector; 31 __entry->dim = dim; 32- __assign_str(devname, q_vector->tx.tx_ring->netdev->name);), 33+ __assign_str(devname);), 34 35 TP_printk("netdev: %s Tx-Q: %d dim-state: %d dim-profile: %d dim-tune: %d dim-st-right: %d dim-st-left: %d dim-tired: %d", 36 __get_str(devname), 37@@ -176,7 +176,7 @@ DECLARE_EVENT_CLASS(ice_tx_template, 38 TP_fast_assign(__entry->ring = ring; 39 __entry->desc = desc; 40 __entry->buf = buf; 41- __assign_str(devname, ring->netdev->name);), 42+ __assign_str(devname);), 43 44 TP_printk("netdev: %s ring: %p desc: %p buf %p", __get_str(devname), 45 __entry->ring, __entry->desc, __entry->buf) 46@@ -204,7 +204,7 @@ DECLARE_EVENT_CLASS(ice_rx_template, 47 48 TP_fast_assign(__entry->ring = ring; 49 __entry->desc = desc; 50- __assign_str(devname, ring->netdev->name);), 51+ __assign_str(devname);), 52 53 TP_printk("netdev: %s ring: %p desc: %p", __get_str(devname), 54 __entry->ring, __entry->desc) 55@@ -228,7 +228,7 @@ DECLARE_EVENT_CLASS(ice_rx_indicate_template, 56 TP_fast_assign(__entry->ring = ring; 57 __entry->desc = desc; 58 __entry->skb = skb; 59- __assign_str(devname, ring->netdev->name);), 60+ __assign_str(devname);), 61 62 TP_printk("netdev: %s ring: %p desc: %p skb %p", __get_str(devname), 63 __entry->ring, __entry->desc, __entry->skb) 64@@ -251,7 +251,7 @@ DECLARE_EVENT_CLASS(ice_xmit_template, 65 66 TP_fast_assign(__entry->ring = ring; 67 __entry->skb = skb; 68- __assign_str(devname, ring->netdev->name);), 69+ __assign_str(devname);), 70 71 TP_printk("netdev: %s skb: %p ring: %p", __get_str(devname), 72 __entry->skb, __entry->ring) 73@@ -285,9 +285,8 @@ DECLARE_EVENT_CLASS(ice_tx_tstamp_template, 74 __field(u8, calibrating)), 75 76 TP_fast_assign(lockdep_assert_held(&tx->lock); 77- __assign_str(dev_name, dev_name(dev)); 78- __assign_str(netdev_name, 79- netdev_name(skb->dev)); 80+ __assign_str(dev_name); 81+ __assign_str(netdev_name); 82 __entry->skb = skb; 83 __entry->seq = ice_ptp_get_seq_id(skb); 84 __entry->idx = idx; 85-- 86 87