Merge commit 'v2.6.28' into core/core

This commit is contained in:
Ingo Molnar
2008-12-25 13:51:46 +01:00
675 changed files with 11753 additions and 6755 deletions

View File

@@ -311,7 +311,7 @@ static int cpu_clock_sample_group(const clockid_t which_clock,
struct task_cputime cputime;
thread_group_cputime(p, &cputime);
switch (which_clock) {
switch (CPUCLOCK_WHICH(which_clock)) {
default:
return -EINVAL;
case CPUCLOCK_PROF: