Messages in this thread Patch in this message | | | Date | Wed, 05 Nov 2008 13:50:20 +0800 | From | Li Zefan <> | Subject | [PATCH] sched: rewrite SCHED_CPUMASK_ALLOC |
| |
The #if/#endif is ugly. Let SCHED_CPUMASK_ALLOC do kmalloc().
Also remove unnecessary pointer casting.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> --- kernel/sched.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/kernel/sched.c b/kernel/sched.c index e8819bc..dee79ad 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -7318,13 +7318,13 @@ struct allmasks { }; #if NR_CPUS > 128 -#define SCHED_CPUMASK_ALLOC 1 -#define SCHED_CPUMASK_FREE(v) kfree(v) -#define SCHED_CPUMASK_DECLARE(v) struct allmasks *v +#define SCHED_CPUMASK_DECLARE(v) struct allmasks *v +#define SCHED_CPUMASK_ALLOC(v) v = kmalloc(sizeof(*v), GFP_KERNEL) +#define SCHED_CPUMASK_FREE(v) kfree(v) #else -#define SCHED_CPUMASK_ALLOC 0 -#define SCHED_CPUMASK_FREE(v) -#define SCHED_CPUMASK_DECLARE(v) struct allmasks _v, *v = &_v +#define SCHED_CPUMASK_DECLARE(v) struct allmasks _v, *v = &_v +#define SCHED_CPUMASK_ALLOC(v) +#define SCHED_CPUMASK_FREE(v) #endif #define SCHED_CPUMASK_VAR(v, a) cpumask_t *v = (cpumask_t *) \ @@ -7400,9 +7400,8 @@ static int __build_sched_domains(const cpumask_t *cpu_map, return -ENOMEM; } -#if SCHED_CPUMASK_ALLOC /* get space for all scratch cpumask variables */ - allmasks = kmalloc(sizeof(*allmasks), GFP_KERNEL); + SCHED_CPUMASK_ALLOC(allmasks); if (!allmasks) { printk(KERN_WARNING "Cannot alloc cpumask array\n"); kfree(rd); @@ -7411,7 +7410,7 @@ static int __build_sched_domains(const cpumask_t *cpu_map, #endif return -ENOMEM; } -#endif + tmpmask = (cpumask_t *)allmasks; @@ -7665,13 +7664,13 @@ static int __build_sched_domains(const cpumask_t *cpu_map, cpu_attach_domain(sd, rd, i); } - SCHED_CPUMASK_FREE((void *)allmasks); + SCHED_CPUMASK_FREE(allmasks); return 0; #ifdef CONFIG_NUMA error: free_sched_groups(cpu_map, tmpmask); - SCHED_CPUMASK_FREE((void *)allmasks); + SCHED_CPUMASK_FREE(allmasks); return -ENOMEM; #endif } -- 1.5.4.rc3
| |