diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /litmus/clustered.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'litmus/clustered.c')
| -rw-r--r-- | litmus/clustered.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/litmus/clustered.c b/litmus/clustered.c index 04450a8ad4fe..6fe1b512f628 100644 --- a/litmus/clustered.c +++ b/litmus/clustered.c | |||
| @@ -102,7 +102,7 @@ int assign_cpus_to_clusters(enum cache_level level, | |||
| 102 | cpus[i]->cluster = cpus[low_cpu]->cluster; | 102 | cpus[i]->cluster = cpus[low_cpu]->cluster; |
| 103 | } | 103 | } |
| 104 | /* enqueue in cpus list */ | 104 | /* enqueue in cpus list */ |
| 105 | list_add(&cpus[i]->cluster_list, &cpus[i]->cluster->cpus); | 105 | list_add_tail(&cpus[i]->cluster_list, &cpus[i]->cluster->cpus); |
| 106 | printk(KERN_INFO "Assigning CPU%u to cluster %u\n.", i, cpus[i]->cluster->id); | 106 | printk(KERN_INFO "Assigning CPU%u to cluster %u\n.", i, cpus[i]->cluster->id); |
| 107 | } | 107 | } |
| 108 | out: | 108 | out: |