diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-01 14:36:13 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-01 14:36:13 -0500 |
| commit | f6d2e6f57bba66272b28dd20c949b14ce39cb804 (patch) | |
| tree | 2bf153af4d5b4b33ad2c1e88347c7fd752fb6332 /kernel/sched.c | |
| parent | 8caac56305cef98f9357b060a77939d17699937d (diff) | |
| parent | 7b1dedca42ac0d0d0be01e39d8461bb53a2389b3 (diff) | |
Merge branch 'x86/urgent' into x86/iommu
Diffstat (limited to 'kernel/sched.c')
| -rw-r--r-- | kernel/sched.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index c94baf2969e7..9b1e79371c20 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -7789,13 +7789,14 @@ static int dattrs_equal(struct sched_domain_attr *cur, int idx_cur, | |||
| 7789 | * | 7789 | * |
| 7790 | * The passed in 'doms_new' should be kmalloc'd. This routine takes | 7790 | * The passed in 'doms_new' should be kmalloc'd. This routine takes |
| 7791 | * ownership of it and will kfree it when done with it. If the caller | 7791 | * ownership of it and will kfree it when done with it. If the caller |
| 7792 | * failed the kmalloc call, then it can pass in doms_new == NULL, | 7792 | * failed the kmalloc call, then it can pass in doms_new == NULL && |
| 7793 | * and partition_sched_domains() will fallback to the single partition | 7793 | * ndoms_new == 1, and partition_sched_domains() will fallback to |
| 7794 | * 'fallback_doms', it also forces the domains to be rebuilt. | 7794 | * the single partition 'fallback_doms', it also forces the domains |
| 7795 | * to be rebuilt. | ||
| 7795 | * | 7796 | * |
| 7796 | * If doms_new==NULL it will be replaced with cpu_online_map. | 7797 | * If doms_new == NULL it will be replaced with cpu_online_map. |
| 7797 | * ndoms_new==0 is a special case for destroying existing domains. | 7798 | * ndoms_new == 0 is a special case for destroying existing domains, |
| 7798 | * It will not create the default domain. | 7799 | * and it will not create the default domain. |
| 7799 | * | 7800 | * |
| 7800 | * Call with hotplug lock held | 7801 | * Call with hotplug lock held |
| 7801 | */ | 7802 | */ |