diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-04 06:41:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-04 06:41:37 -0400 |
| commit | f9bcda7760e1373615c9f6d9ce24209b0ab97de1 (patch) | |
| tree | f90b3031126c4e4beb8161f38ea436303e2b8b73 /include/linux/sched.h | |
| parent | 9bec2e38527a9f2497b3d976715c672d08d6160d (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 6674fc1e51bf..34ed0d99b1bd 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -994,7 +994,6 @@ struct task_struct { | |||
| 994 | */ | 994 | */ |
| 995 | struct pipe_inode_info *splice_pipe; | 995 | struct pipe_inode_info *splice_pipe; |
| 996 | #ifdef CONFIG_TASK_DELAY_ACCT | 996 | #ifdef CONFIG_TASK_DELAY_ACCT |
| 997 | spinlock_t delays_lock; | ||
| 998 | struct task_delay_info *delays; | 997 | struct task_delay_info *delays; |
| 999 | #endif | 998 | #endif |
| 1000 | }; | 999 | }; |