diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /include/linux/sched.h | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 62e6314382f0..e60a91d5b369 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -706,6 +706,7 @@ struct task_struct { | |||
| 706 | prio_array_t *array; | 706 | prio_array_t *array; |
| 707 | 707 | ||
| 708 | unsigned short ioprio; | 708 | unsigned short ioprio; |
| 709 | unsigned int btrace_seq; | ||
| 709 | 710 | ||
| 710 | unsigned long sleep_avg; | 711 | unsigned long sleep_avg; |
| 711 | unsigned long long timestamp, last_ran; | 712 | unsigned long long timestamp, last_ran; |