[Xen-changelog] [xen master] sched_rt: use the correct type for _cpumask_scratch

[patchbot@xxxxxxx]

commit 1dca74c331194fff91d899ea857e348626d853de
Author:     Julien Grall <julien.grall@xxxxxxxxxx>
AuthorDate: Wed Jun 3 09:24:50 2015 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Wed Jun 3 09:24:50 2015 +0200

    sched_rt: use the correct type for _cpumask_scratch

    The commit 376bbbabbda607d2039b8f839f15ff02721597d2 "sched_rt: print useful
    affinity info when dumping" breaks build on ARM64:

    sched_rt.c: In function â??rt_initâ??:
    sched_rt.c:442:26: error: assignment from incompatible pointer type 
[-Werror]
             _cpumask_scratch = xmalloc_array(cpumask_var_t, nr_cpu_ids);
                              ^
    sched_rt.c: In function â??rt_alloc_pdataâ??:
    sched_rt.c:489:29: error: passing argument 1 of â??alloc_cpumask_varâ?? 
from incompatible pointer type [-Werror]
         if ( !alloc_cpumask_var(&_cpumask_scratch[cpu]) )

    This is because cpumask_var_t is not a type alias to cpumask_t** when
    the number of CPU > 2 * BITS_PER_LONG. The correct type for
    _cpumask_scratch should be cpumask_var_t*.

    Signed-off-by: Julien Grall <julien.grall@xxxxxxxxxx>
---
 xen/common/sched_rt.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c
index 59ead57..5836d27 100644
--- a/xen/common/sched_rt.c
+++ b/xen/common/sched_rt.c
@@ -127,7 +127,7 @@
  /*
   * Useful to avoid too many cpumask_var_t on the stack.
   */
-static cpumask_t **_cpumask_scratch;
+static cpumask_var_t *_cpumask_scratch;
 #define cpumask_scratch _cpumask_scratch[smp_processor_id()]

 /*
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog