Subject: [wrecked] cpusets-allocate-heap-only-when-required.patch removed from -mm tree
To: viresh.kumar@xxxxxxxxxx,lizf@xxxxxxxxxxxxxx,rientjes@xxxxxxxxxx,tj@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Tue, 18 Feb 2014 12:12:11 -0800
The patch titled
Subject: cpusets: allocate heap only when required
has been removed from the -mm tree. Its filename was
cpusets-allocate-heap-only-when-required.patch
This patch was dropped because other changes were merged, which wrecked this patch
------------------------------------------------------
From: Viresh Kumar <viresh.kumar@xxxxxxxxxx>
Subject: cpusets: allocate heap only when required
update_flag() routine uses heap only when spread_flag_changed is true.
Otherwise heap isn't used, but is allocated and freed unnecessarily.
Fix this by allocating heap only when required.
Signed-off-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx>
Acked-by: David Rientjes <rientjes@xxxxxxxxxx>
Acked-by: Li Zefan <lizf@xxxxxxxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/cpuset.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff -puN kernel/cpuset.c~cpusets-allocate-heap-only-when-required kernel/cpuset.c
--- a/kernel/cpuset.c~cpusets-allocate-heap-only-when-required
+++ a/kernel/cpuset.c
@@ -1326,16 +1326,18 @@ static int update_flag(cpuset_flagbits_t
if (err < 0)
goto out;
- err = heap_init(&heap, PAGE_SIZE, GFP_KERNEL, NULL);
- if (err < 0)
- goto out;
-
balance_flag_changed = (is_sched_load_balance(cs) !=
is_sched_load_balance(trialcs));
spread_flag_changed = ((is_spread_slab(cs) != is_spread_slab(trialcs))
|| (is_spread_page(cs) != is_spread_page(trialcs)));
+ if (spread_flag_changed) {
+ err = heap_init(&heap, PAGE_SIZE, GFP_KERNEL, NULL);
+ if (err < 0)
+ goto out;
+ }
+
mutex_lock(&callback_mutex);
cs->flags = trialcs->flags;
mutex_unlock(&callback_mutex);
@@ -1343,9 +1345,10 @@ static int update_flag(cpuset_flagbits_t
if (!cpumask_empty(trialcs->cpus_allowed) && balance_flag_changed)
rebuild_sched_domains_locked();
- if (spread_flag_changed)
+ if (spread_flag_changed) {
update_tasks_flags(cs, &heap);
- heap_free(&heap);
+ heap_free(&heap);
+ }
out:
free_trial_cpuset(trialcs);
return err;
_
Patches currently in -mm which might be from viresh.kumar@xxxxxxxxxx are
rtc-rtc-spear-remove-unnecessary-oom-messages.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
