diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-alpha/mmu_context.h | 5 | ||||
| -rw-r--r-- | include/asm-alpha/topology.h | 4 | ||||
| -rw-r--r-- | include/asm-generic/percpu.h | 7 | ||||
| -rw-r--r-- | include/asm-powerpc/percpu.h | 7 | ||||
| -rw-r--r-- | include/asm-s390/percpu.h | 7 | ||||
| -rw-r--r-- | include/asm-sparc64/percpu.h | 7 | ||||
| -rw-r--r-- | include/asm-x86_64/percpu.h | 7 | ||||
| -rw-r--r-- | include/linux/genhd.h | 14 |
8 files changed, 23 insertions, 35 deletions
diff --git a/include/asm-alpha/mmu_context.h b/include/asm-alpha/mmu_context.h index 6f92482cc96c..0c017fc181c1 100644 --- a/include/asm-alpha/mmu_context.h +++ b/include/asm-alpha/mmu_context.h | |||
| @@ -231,9 +231,8 @@ init_new_context(struct task_struct *tsk, struct mm_struct *mm) | |||
| 231 | { | 231 | { |
| 232 | int i; | 232 | int i; |
| 233 | 233 | ||
| 234 | for (i = 0; i < NR_CPUS; i++) | 234 | for_each_online_cpu(i) |
| 235 | if (cpu_online(i)) | 235 | mm->context[i] = 0; |
| 236 | mm->context[i] = 0; | ||
| 237 | if (tsk != current) | 236 | if (tsk != current) |
| 238 | task_thread_info(tsk)->pcb.ptbr | 237 | task_thread_info(tsk)->pcb.ptbr |
| 239 | = ((unsigned long)mm->pgd - IDENT_ADDR) >> PAGE_SHIFT; | 238 | = ((unsigned long)mm->pgd - IDENT_ADDR) >> PAGE_SHIFT; |
diff --git a/include/asm-alpha/topology.h b/include/asm-alpha/topology.h index eb740e280d9c..420ccde6b916 100644 --- a/include/asm-alpha/topology.h +++ b/include/asm-alpha/topology.h | |||
| @@ -27,8 +27,8 @@ static inline cpumask_t node_to_cpumask(int node) | |||
| 27 | cpumask_t node_cpu_mask = CPU_MASK_NONE; | 27 | cpumask_t node_cpu_mask = CPU_MASK_NONE; |
| 28 | int cpu; | 28 | int cpu; |
| 29 | 29 | ||
| 30 | for(cpu = 0; cpu < NR_CPUS; cpu++) { | 30 | for_each_online_cpu(cpu) { |
| 31 | if (cpu_online(cpu) && (cpu_to_node(cpu) == node)) | 31 | if (cpu_to_node(cpu) == node) |
| 32 | cpu_set(cpu, node_cpu_mask); | 32 | cpu_set(cpu, node_cpu_mask); |
| 33 | } | 33 | } |
| 34 | 34 | ||
diff --git a/include/asm-generic/percpu.h b/include/asm-generic/percpu.h index 9044aeb37828..78cf45547e31 100644 --- a/include/asm-generic/percpu.h +++ b/include/asm-generic/percpu.h | |||
| @@ -19,10 +19,9 @@ extern unsigned long __per_cpu_offset[NR_CPUS]; | |||
| 19 | #define percpu_modcopy(pcpudst, src, size) \ | 19 | #define percpu_modcopy(pcpudst, src, size) \ |
| 20 | do { \ | 20 | do { \ |
| 21 | unsigned int __i; \ | 21 | unsigned int __i; \ |
| 22 | for (__i = 0; __i < NR_CPUS; __i++) \ | 22 | for_each_cpu(__i) \ |
| 23 | if (cpu_possible(__i)) \ | 23 | memcpy((pcpudst)+__per_cpu_offset[__i], \ |
| 24 | memcpy((pcpudst)+__per_cpu_offset[__i], \ | 24 | (src), (size)); \ |
| 25 | (src), (size)); \ | ||
| 26 | } while (0) | 25 | } while (0) |
| 27 | #else /* ! SMP */ | 26 | #else /* ! SMP */ |
| 28 | 27 | ||
diff --git a/include/asm-powerpc/percpu.h b/include/asm-powerpc/percpu.h index e31922c50e53..464301cd0d03 100644 --- a/include/asm-powerpc/percpu.h +++ b/include/asm-powerpc/percpu.h | |||
| @@ -27,10 +27,9 @@ | |||
| 27 | #define percpu_modcopy(pcpudst, src, size) \ | 27 | #define percpu_modcopy(pcpudst, src, size) \ |
| 28 | do { \ | 28 | do { \ |
| 29 | unsigned int __i; \ | 29 | unsigned int __i; \ |
| 30 | for (__i = 0; __i < NR_CPUS; __i++) \ | 30 | for_each_cpu(__i) \ |
| 31 | if (cpu_possible(__i)) \ | 31 | memcpy((pcpudst)+__per_cpu_offset(__i), \ |
| 32 | memcpy((pcpudst)+__per_cpu_offset(__i), \ | 32 | (src), (size)); \ |
| 33 | (src), (size)); \ | ||
| 34 | } while (0) | 33 | } while (0) |
| 35 | 34 | ||
| 36 | extern void setup_per_cpu_areas(void); | 35 | extern void setup_per_cpu_areas(void); |
diff --git a/include/asm-s390/percpu.h b/include/asm-s390/percpu.h index 123fcaca295e..e10ed87094f0 100644 --- a/include/asm-s390/percpu.h +++ b/include/asm-s390/percpu.h | |||
| @@ -46,10 +46,9 @@ extern unsigned long __per_cpu_offset[NR_CPUS]; | |||
| 46 | #define percpu_modcopy(pcpudst, src, size) \ | 46 | #define percpu_modcopy(pcpudst, src, size) \ |
| 47 | do { \ | 47 | do { \ |
| 48 | unsigned int __i; \ | 48 | unsigned int __i; \ |
| 49 | for (__i = 0; __i < NR_CPUS; __i++) \ | 49 | for_each_cpu(__i) \ |
| 50 | if (cpu_possible(__i)) \ | 50 | memcpy((pcpudst)+__per_cpu_offset[__i], \ |
| 51 | memcpy((pcpudst)+__per_cpu_offset[__i], \ | 51 | (src), (size)); \ |
| 52 | (src), (size)); \ | ||
| 53 | } while (0) | 52 | } while (0) |
| 54 | 53 | ||
| 55 | #else /* ! SMP */ | 54 | #else /* ! SMP */ |
diff --git a/include/asm-sparc64/percpu.h b/include/asm-sparc64/percpu.h index aea4e51e7cd1..82032e159a76 100644 --- a/include/asm-sparc64/percpu.h +++ b/include/asm-sparc64/percpu.h | |||
| @@ -26,10 +26,9 @@ register unsigned long __local_per_cpu_offset asm("g5"); | |||
| 26 | #define percpu_modcopy(pcpudst, src, size) \ | 26 | #define percpu_modcopy(pcpudst, src, size) \ |
| 27 | do { \ | 27 | do { \ |
| 28 | unsigned int __i; \ | 28 | unsigned int __i; \ |
| 29 | for (__i = 0; __i < NR_CPUS; __i++) \ | 29 | for_each_cpu(__i) \ |
| 30 | if (cpu_possible(__i)) \ | 30 | memcpy((pcpudst)+__per_cpu_offset(__i), \ |
| 31 | memcpy((pcpudst)+__per_cpu_offset(__i), \ | 31 | (src), (size)); \ |
| 32 | (src), (size)); \ | ||
| 33 | } while (0) | 32 | } while (0) |
| 34 | #else /* ! SMP */ | 33 | #else /* ! SMP */ |
| 35 | 34 | ||
diff --git a/include/asm-x86_64/percpu.h b/include/asm-x86_64/percpu.h index 29a6b0408f75..4405b4adeaba 100644 --- a/include/asm-x86_64/percpu.h +++ b/include/asm-x86_64/percpu.h | |||
| @@ -26,10 +26,9 @@ | |||
| 26 | #define percpu_modcopy(pcpudst, src, size) \ | 26 | #define percpu_modcopy(pcpudst, src, size) \ |
| 27 | do { \ | 27 | do { \ |
| 28 | unsigned int __i; \ | 28 | unsigned int __i; \ |
| 29 | for (__i = 0; __i < NR_CPUS; __i++) \ | 29 | for_each_cpu(__i) \ |
| 30 | if (cpu_possible(__i)) \ | 30 | memcpy((pcpudst)+__per_cpu_offset(__i), \ |
| 31 | memcpy((pcpudst)+__per_cpu_offset(__i), \ | 31 | (src), (size)); \ |
| 32 | (src), (size)); \ | ||
| 33 | } while (0) | 32 | } while (0) |
| 34 | 33 | ||
| 35 | extern void setup_per_cpu_areas(void); | 34 | extern void setup_per_cpu_areas(void); |
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index eef5ccdcd731..fd647fde5ec1 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h | |||
| @@ -149,22 +149,16 @@ struct disk_attribute { | |||
| 149 | ({ \ | 149 | ({ \ |
| 150 | typeof(gendiskp->dkstats->field) res = 0; \ | 150 | typeof(gendiskp->dkstats->field) res = 0; \ |
| 151 | int i; \ | 151 | int i; \ |
| 152 | for (i=0; i < NR_CPUS; i++) { \ | 152 | for_each_cpu(i) \ |
| 153 | if (!cpu_possible(i)) \ | ||
| 154 | continue; \ | ||
| 155 | res += per_cpu_ptr(gendiskp->dkstats, i)->field; \ | 153 | res += per_cpu_ptr(gendiskp->dkstats, i)->field; \ |
| 156 | } \ | ||
| 157 | res; \ | 154 | res; \ |
| 158 | }) | 155 | }) |
| 159 | 156 | ||
| 160 | static inline void disk_stat_set_all(struct gendisk *gendiskp, int value) { | 157 | static inline void disk_stat_set_all(struct gendisk *gendiskp, int value) { |
| 161 | int i; | 158 | int i; |
| 162 | for (i=0; i < NR_CPUS; i++) { | 159 | for_each_cpu(i) |
| 163 | if (cpu_possible(i)) { | 160 | memset(per_cpu_ptr(gendiskp->dkstats, i), value, |
| 164 | memset(per_cpu_ptr(gendiskp->dkstats, i), value, | 161 | sizeof (struct disk_stats)); |
| 165 | sizeof (struct disk_stats)); | ||
| 166 | } | ||
| 167 | } | ||
| 168 | } | 162 | } |
| 169 | 163 | ||
| 170 | #else | 164 | #else |
