Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa85ea5b authored by Rusty Russell's avatar Rusty Russell
Browse files

cpumask: use new cpumask_ functions in core code. 



Impact: cleanup

Time to clean up remaining laggards using the old cpu_ functions.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Trond.Myklebust@netapp.com
parent 1a8a5100

drivers/base/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static ssize_t print_cpus_map(char *buf, const struct cpumask *map) 
#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
Original line number Diff line number Diff line
@@ -90,12 +90,12 @@ static inline void cpuset_init_smp(void) {} 
static 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/workqueue.c

+3 −3
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ void flush_workqueue(struct workqueue_struct *wq) 
	might_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_struct *work) 
	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_struct *wq) 
	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
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ void free_percpu(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(free_percpu);

mm/vmstat.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ static void sum_vm_events(unsigned long *ret, const struct cpumask *cpumask) 


	memset(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++)