C-EDF: Make migration affinity work with Release Master

Needed to update C-EDF to handle release master.  Also
updated get_nearest_available_cpu() to take NO_CPU instead
of -1 to indicate that there is no release master.  While
NO_CPU is 0xffffffff (-1 in two's complement), we still
translate this value to -1 in case NO_CPU changes.

Signed-off-by: Andrea Bastoni <bastoni@cs.unc.edu>

1 files changed, 2 insertions, 4 deletions

diff --git a/litmus/affinity.c b/litmus/affinity.c
index 9adab7a3bcd7..3fa6dd789400 100644
--- a/litmus/affinity.c
+++ b/litmus/affinity.c
@@ -16,8 +16,6 @@ void init_topology(void) {
 
         for_each_online_cpu(cpu) {
                 for (i = 0; i < depth; ++i) {
-                        long unsigned int firstbits;
-
                         chk = get_shared_cpu_map((struct cpumask *)&neigh_info[cpu].neighbors[i], cpu, i);
                         if (chk) {
                                 /* failed */
@@ -27,9 +25,9 @@ void init_topology(void) {
                                 neigh_info[cpu].size[i] =
                                         cpumask_weight((struct cpumask *)&neigh_info[cpu].neighbors[i]);
                         }
-                        firstbits = *neigh_info[cpu].neighbors[i]->bits;
                         printk("CPU %d has %d neighbors at level %d. (mask = %lx)\n",
-                                                        cpu, neigh_info[cpu].size[i], i, firstbits);
+                                                        cpu, neigh_info[cpu].size[i], i, 
+                                                        *cpumask_bits(neigh_info[cpu].neighbors[i]));
                 }
 
                 /* set data for non-existent levels */