Re: linux-next: manual merge of the tip tree with the cputime tree

From: Glauber Costa
Date: Wed Dec 07 2011 - 06:35:41 EST


On 12/07/2011 02:09 AM, Stephen Rothwell wrote:
+ index = (TASK_NICE(p)> 0) ? CPUTIME_NICE : CPUTIME_USER;
+
/* Add user time to cpustat. */
- if (TASK_NICE(p)> 0)
- cpustat->nice += (__force cputime64_t) cputime;
- else
- cpustat->user += (__force cputime64_t) cputime;
- task_group_account_field(p, index, cputime);
++ task_group_account_field(p, index, (__force cputime64_t) cputime);


I doubt __force cputime64_t is necessary. After these patches, those fields are all u64.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/