Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.
Showing the changes to include/trace (3 of 1019 files). Show all
Unified · Split
| @@ -306,7 +306,6 @@ TRACE_EVENT(ext4_da_writepages_result, · 305 unmodified lines | ||
| 306 | 306 | __field( int, pages_written ) |
| 307 | 307 | __field( long, pages_skipped ) |
| 308 | 308 | __field( char, more_io ) |
| 309 | − __field( char, no_nrwrite_index_update ) | |
| 310 | 309 | __field( pgoff_t, writeback_index ) |
| 311 | 310 | ), |
| 312 | 311 | |
| @@ -317,16 +316,14 @@ TRACE_EVENT(ext4_da_writepages_result, · 4 unmodified lines | ||
| 317 | 316 | __entry->pages_written = pages_written; |
| 318 | 317 | __entry->pages_skipped = wbc->pages_skipped; |
| 319 | 318 | __entry->more_io = wbc->more_io; |
| 320 | − __entry->no_nrwrite_index_update = wbc->no_nrwrite_index_update; | |
| 321 | 319 | __entry->writeback_index = inode->i_mapping->writeback_index; |
| 322 | 320 | ), |
| 323 | 321 | |
| 324 | − TP_printk("dev %s ino %lu ret %d pages_written %d pages_skipped %ld more_io %d no_nrwrite_index_update %d writeback_index %lu", | |
| 322 | + TP_printk("dev %s ino %lu ret %d pages_written %d pages_skipped %ld more_io %d writeback_index %lu", | |
| 325 | 323 | jbd2_dev_to_name(__entry->dev), |
| 326 | 324 | (unsigned long) __entry->ino, __entry->ret, |
| 327 | 325 | __entry->pages_written, __entry->pages_skipped, |
| 328 | 326 | __entry->more_io, |
| 329 | − __entry->no_nrwrite_index_update, | |
| 330 | 327 | (unsigned long) __entry->writeback_index) |
| 331 | 328 | ); |
| 332 | 329 | |
| @@ -115,6 +115,23 @@ DEFINE_EVENT(sched_wakeup_template, sched_wakeup_new, · 114 unmodified lines | ||
| 115 | 115 | TP_PROTO(struct task_struct *p, int success), |
| 116 | 116 | TP_ARGS(p, success)); |
| 117 | 117 | |
| 118 | +#ifdef CREATE_TRACE_POINTS | |
| 119 | +static inline long __trace_sched_switch_state(struct task_struct *p) | |
| 120 | +{ | |
| 121 | + long state = p->state; | |
| 122 | + | |
| 123 | +#ifdef CONFIG_PREEMPT | |
| 124 | + /* | |
| 125 | + * For all intents and purposes a preempted task is a running task. | |
| 126 | + */ | |
| 127 | + if (task_thread_info(p)->preempt_count & PREEMPT_ACTIVE) | |
| 128 | + state = TASK_RUNNING; | |
| 129 | +#endif | |
| 130 | + | |
| 131 | + return state; | |
| 132 | +} | |
| 133 | +#endif | |
| 134 | + | |
| 118 | 135 | /* |
| 119 | 136 | * Tracepoint for task switches, performed by the scheduler: |
| 120 | 137 | */ |
| @@ -139,7 +156,7 @@ TRACE_EVENT(sched_switch, · 18 unmodified lines | ||
| 139 | 156 | memcpy(__entry->next_comm, next->comm, TASK_COMM_LEN); |
| 140 | 157 | __entry->prev_pid = prev->pid; |
| 141 | 158 | __entry->prev_prio = prev->prio; |
| 142 | − __entry->prev_state = prev->state; | |
| 159 | + __entry->prev_state = __trace_sched_switch_state(prev); | |
| 143 | 160 | memcpy(__entry->prev_comm, prev->comm, TASK_COMM_LEN); |
| 144 | 161 | __entry->next_pid = next->pid; |
| 145 | 162 | __entry->next_prio = next->prio; |
| @@ -10,7 +10,8 @@ · 9 unmodified lines | ||
| 10 | 10 | |
| 11 | 11 | #define TP_STORE_SIGINFO(__entry, info) \ |
| 12 | 12 | do { \ |
| 13 | − if (info == SEND_SIG_NOINFO) { \ | |
| 13 | + if (info == SEND_SIG_NOINFO || \ | |
| 14 | + info == SEND_SIG_FORCED) { \ | |
| 14 | 15 | __entry->errno = 0; \ |
| 15 | 16 | __entry->code = SI_USER; \ |
| 16 | 17 | } else if (info == SEND_SIG_PRIV) { \ |