diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-03 17:35:48 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-03 17:35:48 -0400 |
| commit | 36a2c6b28003dd0592b8ece5e9409991e0820f50 (patch) | |
| tree | c5b52547b2658a8a3b898b8224b835a7e8396017 /include/linux/delayacct.h | |
| parent | 95916edd02e3a7752315422f386c55723d4a3637 (diff) | |
| parent | f1d39b291e2263f5e2f2ec5d4061802f76d8ae67 (diff) | |
| download | kernel_samsung_espresso10-36a2c6b28003dd0592b8ece5e9409991e0820f50.zip kernel_samsung_espresso10-36a2c6b28003dd0592b8ece5e9409991e0820f50.tar.gz kernel_samsung_espresso10-36a2c6b28003dd0592b8ece5e9409991e0820f50.tar.bz2 | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'include/linux/delayacct.h')
| -rw-r--r-- | include/linux/delayacct.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/delayacct.h b/include/linux/delayacct.h index 7e8b601..11487b6 100644 --- a/include/linux/delayacct.h +++ b/include/linux/delayacct.h @@ -55,7 +55,7 @@ static inline void delayacct_tsk_init(struct task_struct *tsk) { /* reinitialize in case parent's non-null pointer was dup'ed*/ tsk->delays = NULL; - if (unlikely(delayacct_on)) + if (delayacct_on) __delayacct_tsk_init(tsk); } @@ -80,9 +80,7 @@ static inline void delayacct_blkio_end(void) static inline int delayacct_add_tsk(struct taskstats *d, struct task_struct *tsk) { - if (likely(!delayacct_on)) - return -EINVAL; - if (!tsk->delays) + if (!delayacct_on || !tsk->delays) return 0; return __delayacct_add_tsk(d, tsk); } |