Messages in this thread Patch in this message | | | Date | Sun, 6 Dec 2009 20:09:48 GMT | From | tip-bot for Geert Uytterhoeven <> | Subject | [tip:sched/urgent] cpumask: Fix generate_sched_domains() for UP |
| |
Commit-ID: e1b8090bdf125f8b2e192149547fead7f302a89c Gitweb: http://git.kernel.org/tip/e1b8090bdf125f8b2e192149547fead7f302a89c Author: Geert Uytterhoeven <geert@linux-m68k.org> AuthorDate: Sun, 6 Dec 2009 20:41:16 +0100 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Sun, 6 Dec 2009 21:08:41 +0100
cpumask: Fix generate_sched_domains() for UP
Commit acc3f5d7cabbfd6cec71f0c1f9900621fa2d6ae7 ("cpumask: Partition_sched_domains takes array of cpumask_var_t") changed the function signature of generate_sched_domains() for the CONFIG_SMP=y case, but forgot to update the corresponding function for the CONFIG_SMP=n case, causing:
kernel/cpuset.c:2073: warning: passing argument 1 of 'generate_sched_domains' from incompatible pointer type
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Linus Torvalds <torvalds@linux-foundation.org> LKML-Reference: <alpine.DEB.2.00.0912062038070.5693@ayla.of.borg> Signed-off-by: Ingo Molnar <mingo@elte.hu> --- kernel/cpuset.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 3cf2183..43fb7e8 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c @@ -737,7 +737,7 @@ static void do_rebuild_sched_domains(struct work_struct *unused) { } -static int generate_sched_domains(struct cpumask **domains, +static int generate_sched_domains(cpumask_var_t **domains, struct sched_domain_attr **attributes) { *domains = NULL;
| |