Merge branch 'merge'

[linux-2.6-omap-h63xx.git] / include / linux / delayacct.h

diff --git a/include/linux/delayacct.h b/include/linux/delayacct.h
index 8a284cc6fd5ffd810c2f58bfd17c66e7b6e5db1f..11487b6e7127ff68ec12cada74c672af72efcffb 100644 (file)
--- 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,7 +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) || !tsk->delays)
+       if (!delayacct_on || !tsk->delays)
                return 0;
        return __delayacct_add_tsk(d, tsk);
 }