cpumask: use new cpumask_ functions in core code.
Subsystems (8)
PATCH 7/10 cpumask: use new cpumask_ functions in core code.
Impact: cleanup
Time to clean up remaining laggards using the old cpu_ functions.
Signed-off-by Rusty Russell <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Ingo Molnar <[email protected]>
--- drivers/base/cpu.c | 2 +- include/linux/cpuset.h | 4 ++-- kernel/sched_rt.c | 4 ++-- kernel/workqueue.c | 6 +++--- mm/allocpercpu.c | 2 +- mm/vmstat.c | 2 +- net/sunrpc/svc.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-)
drivers/base/cpu.c +1 -1
@@ -119,7 +119,7 @@ static ssize_t print_cpus_map(char *buf,#define print_cpus_func (type) \ static ssize_t print_cpus_##type(struct sysdev_class *class, char *buf) \ { \ - return print_cpus_map(buf, &cpu_##type##_map); \ + return print_cpus_map(buf, cpu_##type##_mask); \ } \ static struct sysdev_class_attribute attr_##type##_map = \ _SYSDEV_CLASS_ATTR(type, 0444, print_cpus_##type, NULL)
include/linux/cpuset.h +2 -2
@@ -90,12 +90,12 @@ static inline void cpuset_cpus_allowed(sstatic inline void cpuset_cpus_allowed (struct task_struct *p,struct cpumask *mask) { - *mask = cpu_possible_map; +cpumask_copy (mask, cpu_possible_mask); }static inline void cpuset_cpus_allowed_locked (struct task_struct *p,struct cpumask *mask) { - *mask = cpu_possible_map; +cpumask_copy (mask, cpu_possible_mask); }static inline nodemask_t cpuset_mems_allowed (struct task_struct *p)
kernel/sched_rt.c +2 -2
@@ -953,12 +953,12 @@ static struct task_struct *pick_next_hig static DEFINE_PER_CPU(cpumask_var_t, local_cpu_mask); -static inline int pick_optimal_cpu (int this_cpu,cpumask_t *mask) +static inline int pick_optimal_cpu (int this_cpu,const struct cpumask *mask) {int first;/* "this_cpu" is cheaper to preempt than a remote processor */ -if ((this_cpu !=-1 ) &&cpu_isset (this_cpu, *mask)) +if ((this_cpu !=-1 ) &&cpumask_test_cpu (this_cpu, mask))return this_cpu; first =cpumask_first (mask);
kernel/workqueue.c +3 -3
@@ -416,7 +416,7 @@ void flush_workqueue(struct workqueue_stmight_sleep ();lock_map_acquire (&wq->lockdep_map);lock_map_release (&wq->lockdep_map); -for_each_cpu_mask_nr (cpu, *cpu_map) +for_each_cpu (cpu, cpu_map)flush_cpu_workqueue (per_cpu_ptr (wq->cpu_wq, cpu)); }EXPORT_SYMBOL_GPL (flush_workqueue);
@@ -547,7 +547,7 @@ static void wait_on_work(struct work_str wq = cwq->wq; cpu_map =wq_cpu_map (wq); -for_each_cpu_mask_nr (cpu, *cpu_map) +for_each_cpu (cpu, cpu_map)wait_on_cpu_work (per_cpu_ptr (wq->cpu_wq, cpu), work); }
@@ -911,7 +911,7 @@ void destroy_workqueue(struct workqueue_list_del (&wq->list);spin_unlock (&workqueue_lock); -for_each_cpu_mask_nr (cpu, *cpu_map) +for_each_cpu (cpu, cpu_map)cleanup_workqueue_thread (per_cpu_ptr (wq->cpu_wq, cpu));cpu_maps_update_done ();
mm/allocpercpu.c +1 -1
@@ -139,7 +139,7 @@ void percpu_free(void *__pdata) {if (unlikely (!__pdata))return ; -__percpu_depopulate_mask (__pdata, &cpu_possible_map); +__percpu_depopulate_mask (__pdata, cpu_possible_mask);kfree (__percpu_disguise (__pdata)); }EXPORT_SYMBOL_GPL (percpu_free);
mm/vmstat.c +1 -1
@@ -27,7 +27,7 @@ static void sum_vm_events(unsigned longmemset (ret,0 ,NR_VM_EVENT_ITEMS *sizeof (unsigned long )); -for_each_cpu_mask_nr (cpu, *cpumask) { +for_each_cpu (cpu, cpumask) {struct vm_event_state *this = &per_cpu (vm_event_states, cpu);for (i =0 ; i <NR_VM_EVENT_ITEMS ; i++)
net/sunrpc/svc.c +1 -1
@@ -312,7 +312,7 @@ svc_pool_map_set_cpumask(struct task_strswitch (m->mode) {case SVC_POOL_PERCPU : { -set_cpus_allowed_ptr (task, &cpumask_of_cpu (node)); +set_cpus_allowed_ptr (task,cpumask_of (node));break ; }case SVC_POOL_PERNODE :