aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Tesarik <ptesarik@suse.cz>2008-11-24 09:46:31 -0500
committerThomas Gleixner <tglx@linutronix.de>2008-11-24 10:41:40 -0500
commiteccdaeafaea3ed115068ba55d01f22e486e5437d (patch)
tree75b59c0bcbf00c869e4b25b3bf34671ba4c3b8c1
parent13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff)
posix-cpu-timers: fix clock_gettime with CLOCK_PROCESS_CPUTIME_ID
Since CLOCK_PROCESS_CPUTIME_ID is in fact translated to -6, the switch statement in cpu_clock_sample_group() must first mask off the irrelevant bits, similar to cpu_clock_sample(). Signed-off-by: Petr Tesarik <ptesarik@suse.cz> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> -- posix-cpu-timers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
-rw-r--r--kernel/posix-cpu-timers.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
index 895337b16a24..4e5288a831de 100644
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@ -311,7 +311,7 @@ static int cpu_clock_sample_group(const clockid_t which_clock,
311 struct task_cputime cputime; 311 struct task_cputime cputime;
312 312
313 thread_group_cputime(p, &cputime); 313 thread_group_cputime(p, &cputime);
314 switch (which_clock) { 314 switch (CPUCLOCK_WHICH(which_clock)) {
315 default: 315 default:
316 return -EINVAL; 316 return -EINVAL;
317 case CPUCLOCK_PROF: 317 case CPUCLOCK_PROF: