diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-11-26 09:03:27 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-11-26 09:05:21 -0500 |
commit | 22a867d81707b0a2720bb5f65255265b95d30526 (patch) | |
tree | 7ec19b155b50b13ae95244c2bfa16aea4920c4f6 /include/linux/sched.h | |
parent | 5bb6b1ea67a73f0665a41726dd7138977b992c6c (diff) | |
parent | 3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff) |
Merge commit 'v2.6.37-rc3' into sched/core
Merge reason: Pick up latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r-- | include/linux/sched.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 840f1277492f..a5b92c70c737 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -862,6 +862,7 @@ struct sched_group { | |||
862 | * single CPU. | 862 | * single CPU. |
863 | */ | 863 | */ |
864 | unsigned int cpu_power, cpu_power_orig; | 864 | unsigned int cpu_power, cpu_power_orig; |
865 | unsigned int group_weight; | ||
865 | 866 | ||
866 | /* | 867 | /* |
867 | * The CPUs this group covers. | 868 | * The CPUs this group covers. |