From 139ffb5eca2e631a0af0e6af1d475d0585adc5d3 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 25 Nov 2008 02:35:12 +1030 Subject: [PATCH] --- yaml --- r: 125325 b: refs/heads/master c: d5dd3db1dce73cdd5c45c5a3498c51bd21b8864b h: refs/heads/master i: 125323: 6ac775b477230d7f5b7f0368ce31b812a497df8e v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9d18012192e6..74aca472a955 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a16f3d30ca4e3f166d691220c003066a14e32b5 +refs/heads/master: d5dd3db1dce73cdd5c45c5a3498c51bd21b8864b diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 2d4ff91e0c97..24012c2a8892 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -6706,7 +6706,7 @@ static int sched_domain_debug_one(struct sched_domain *sd, int cpu, int level, static void sched_domain_debug(struct sched_domain *sd, int cpu) { - cpumask_t *groupmask; + cpumask_var_t groupmask; int level = 0; if (!sd) { @@ -6716,8 +6716,7 @@ static void sched_domain_debug(struct sched_domain *sd, int cpu) printk(KERN_DEBUG "CPU%d attaching sched-domain:\n", cpu); - groupmask = kmalloc(sizeof(cpumask_t), GFP_KERNEL); - if (!groupmask) { + if (!alloc_cpumask_var(&groupmask, GFP_KERNEL)) { printk(KERN_DEBUG "Cannot load-balance (out of memory)\n"); return; } @@ -6730,7 +6729,7 @@ static void sched_domain_debug(struct sched_domain *sd, int cpu) if (!sd) break; } - kfree(groupmask); + free_cpumask_var(groupmask); } #else /* !CONFIG_SCHED_DEBUG */ # define sched_domain_debug(sd, cpu) do { } while (0)