diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-04 06:42:01 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-04 06:42:01 -0400 |
| commit | fc851fad00d7fa1bf4ac7034d9ba8041bf482d50 (patch) | |
| tree | 779a8b572d1701ef2c46755df751d9275650cdf4 /include/linux/sched.h | |
| parent | 85cd7251b9112e3dabeac9fd3b175601ca607241 (diff) | |
| parent | f9bcda7760e1373615c9f6d9ce24209b0ab97de1 (diff) | |
Merge branch 'upstream' into pata-drivers
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 | }; |