移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/include/trace/events/timer.h
..
..
@@ -73,7 +73,7 @@
73
73
 		__entry->flags		= flags;
74
74
 	),
75
75
 
76
-	TP_printk("timer=%p function=%pf expires=%lu [timeout=%ld] cpu=%u idx=%u flags=%s",
76
+	TP_printk("timer=%p function=%ps expires=%lu [timeout=%ld] cpu=%u idx=%u flags=%s",
77
77
 		  __entry->timer, __entry->function, __entry->expires,
78
78
 		  (long)__entry->expires - __entry->now,
79
79
 		  __entry->flags & TIMER_CPUMASK,
..
..
@@ -89,23 +89,27 @@
89
89
  */
90
90
 TRACE_EVENT(timer_expire_entry,
91
91
 
92
-	TP_PROTO(struct timer_list *timer),
92
+	TP_PROTO(struct timer_list *timer, unsigned long baseclk),
93
93
 
94
-	TP_ARGS(timer),
94
+	TP_ARGS(timer, baseclk),
95
95
 
96
96
 	TP_STRUCT__entry(
97
97
 		__field( void *,	timer	)
98
98
 		__field( unsigned long,	now	)
99
99
 		__field( void *,	function)
100
+		__field( unsigned long,	baseclk	)
100
101
 	),
101
102
 
102
103
 	TP_fast_assign(
103
104
 		__entry->timer		= timer;
104
105
 		__entry->now		= jiffies;
105
106
 		__entry->function	= timer->function;
107
+		__entry->baseclk	= baseclk;
106
108
 	),
107
109
 
108
-	TP_printk("timer=%p function=%pf now=%lu", __entry->timer, __entry->function,__entry->now)
110
+	TP_printk("timer=%p function=%ps now=%lu baseclk=%lu",
111
+		  __entry->timer, __entry->function, __entry->now,
112
+		  __entry->baseclk)
109
113
 );
110
114
 
111
115
 /**
..
..
@@ -210,7 +214,7 @@
210
214
 		__entry->mode		= mode;
211
215
 	),
212
216
 
213
-	TP_printk("hrtimer=%p function=%pf expires=%llu softexpires=%llu "
217
+	TP_printk("hrtimer=%p function=%ps expires=%llu softexpires=%llu "
214
218
 		  "mode=%s", __entry->hrtimer, __entry->function,
215
219
 		  (unsigned long long) __entry->expires,
216
220
 		  (unsigned long long) __entry->softexpires,
..
..
@@ -243,7 +247,8 @@
243
247
 		__entry->function	= hrtimer->function;
244
248
 	),
245
249
 
246
-	TP_printk("hrtimer=%p function=%pf now=%llu", __entry->hrtimer, __entry->function,
250
+	TP_printk("hrtimer=%p function=%ps now=%llu",
251
+		  __entry->hrtimer, __entry->function,
247
252
 		  (unsigned long long) __entry->now)
248
253
 );
249
254
 
..
..
@@ -298,7 +303,7 @@
298
303
  */
299
304
 TRACE_EVENT(itimer_state,
300
305
 
301
-	TP_PROTO(int which, const struct itimerval *const value,
306
+	TP_PROTO(int which, const struct itimerspec64 *const value,
302
307
 		 unsigned long long expires),
303
308
 
304
309
 	TP_ARGS(which, value, expires),
..
..
@@ -307,24 +312,24 @@
307
312
 		__field(	int,			which		)
308
313
 		__field(	unsigned long long,	expires		)
309
314
 		__field(	long,			value_sec	)
310
-		__field(	long,			value_usec	)
315
+		__field(	long,			value_nsec	)
311
316
 		__field(	long,			interval_sec	)
312
-		__field(	long,			interval_usec	)
317
+		__field(	long,			interval_nsec	)
313
318
 	),
314
319
 
315
320
 	TP_fast_assign(
316
321
 		__entry->which		= which;
317
322
 		__entry->expires	= expires;
318
323
 		__entry->value_sec	= value->it_value.tv_sec;
319
-		__entry->value_usec	= value->it_value.tv_usec;
324
+		__entry->value_nsec	= value->it_value.tv_nsec;
320
325
 		__entry->interval_sec	= value->it_interval.tv_sec;
321
-		__entry->interval_usec	= value->it_interval.tv_usec;
326
+		__entry->interval_nsec	= value->it_interval.tv_nsec;
322
327
 	),
323
328
 
324
-	TP_printk("which=%d expires=%llu it_value=%ld.%ld it_interval=%ld.%ld",
329
+	TP_printk("which=%d expires=%llu it_value=%ld.%06ld it_interval=%ld.%06ld",
325
330
 		  __entry->which, __entry->expires,
326
-		  __entry->value_sec, __entry->value_usec,
327
-		  __entry->interval_sec, __entry->interval_usec)
331
+		  __entry->value_sec, __entry->value_nsec / NSEC_PER_USEC,
332
+		  __entry->interval_sec, __entry->interval_nsec / NSEC_PER_USEC)
328
333
 );
329
334
 
330
335
 /**
..
..
@@ -362,7 +367,8 @@
362
367
 		tick_dep_name(POSIX_TIMER)		\
363
368
 		tick_dep_name(PERF_EVENTS)		\
364
369
 		tick_dep_name(SCHED)			\
365
-		tick_dep_name_end(CLOCK_UNSTABLE)
370
+		tick_dep_name(CLOCK_UNSTABLE)		\
371
+		tick_dep_name_end(RCU)
366
372
 
367
373
 #undef tick_dep_name
368
374
 #undef tick_dep_mask_name