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

Commit f7df8ed1 authored by Rusty Russell's avatar Rusty Russell Committed by Ingo Molnar
Browse files

cpumask: convert misc driver functions 



Impact: use new cpumask API.

Convert misc driver functions to use struct cpumask.

To Do:
  - Convert iucv_buffer_cpumask to cpumask_var_t.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarMike Travis <travis@sgi.com>
Acked-by: default avatarDean Nelson <dcn@sgi.com>
Cc: Robert Richter <robert.richter@amd.com>
Cc: oprofile-list@lists.sf.net
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
Cc: Chris Wright <chrisw@sous-sol.org>
Cc: virtualization@lists.osdl.org
Cc: xen-devel@lists.xensource.com
Cc: Ursula Braun <ursula.braun@de.ibm.com>
Cc: linux390@de.ibm.com
Cc: linux-s390@vger.kernel.org
parent fbd59a8d

drivers/base/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static SYSDEV_ATTR(crash_notes, 0400, show_crash_notes, NULL); 
/*

 * Print cpu online, possible, present, and system maps

 */

static ssize_t print_cpus_map(char *buf, cpumask_t *map)

static ssize_t print_cpus_map(char *buf, const struct cpumask *map)

{

	int n = cpulist_scnprintf(buf, PAGE_SIZE-2, map);

drivers/misc/sgi-xp/xpc_main.c

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ xpc_hb_checker(void *ignore) 


	/* this thread was marked active by xpc_hb_init() */



	set_cpus_allowed_ptr(current, &cpumask_of_cpu(XPC_HB_CHECK_CPU));

	set_cpus_allowed_ptr(current, cpumask_of(XPC_HB_CHECK_CPU));



	/* set our heartbeating to other partitions into motion */

	xpc_hb_check_timeout = jiffies + (xpc_hb_check_interval * HZ);

drivers/oprofile/buffer_sync.c

+18 −4
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 


static LIST_HEAD(dying_tasks);

static LIST_HEAD(dead_tasks);

static cpumask_t marked_cpus = CPU_MASK_NONE;

static cpumask_var_t marked_cpus;

static DEFINE_SPINLOCK(task_mortuary);

static void process_task_mortuary(void);
@@ -456,10 +456,10 @@ static void mark_done(int cpu) 
{

	int i;



	cpu_set(cpu, marked_cpus);

	cpumask_set_cpu(cpu, marked_cpus);



	for_each_online_cpu(i) {

		if (!cpu_isset(i, marked_cpus))

		if (!cpumask_test_cpu(i, marked_cpus))

			return;

	}
@@ -468,7 +468,7 @@ static void mark_done(int cpu) 
	 */

	process_task_mortuary();



	cpus_clear(marked_cpus);

	cpumask_clear(marked_cpus);

}
@@ -565,6 +565,20 @@ void sync_buffer(int cpu) 
	mutex_unlock(&buffer_mutex);

}



int __init buffer_sync_init(void)

{

	if (!alloc_cpumask_var(&marked_cpus, GFP_KERNEL))

		return -ENOMEM;



	cpumask_clear(marked_cpus);

		return 0;

}



void __exit buffer_sync_cleanup(void)

{

	free_cpumask_var(marked_cpus);

}



/* The function can be used to add a buffer worth of data directly to

 * the kernel buffer. The buffer is assumed to be a circular buffer.

 * Take the entries from index start and end at index end, wrapping

drivers/oprofile/buffer_sync.h

+4 −0
Original line number Diff line number Diff line
@@ -19,4 +19,8 @@ void sync_stop(void); 
/* sync the given CPU's buffer */

void sync_buffer(int cpu);



/* initialize/destroy the buffer system. */

int buffer_sync_init(void);

void buffer_sync_cleanup(void);



#endif /* OPROFILE_BUFFER_SYNC_H */

drivers/oprofile/oprof.c

+8 −1
Original line number Diff line number Diff line
@@ -183,6 +183,10 @@ static int __init oprofile_init(void) 
{

	int err;



	err = buffer_sync_init();

	if (err)

		return err;



	err = oprofile_arch_init(&oprofile_ops);



	if (err < 0 || timer) {
@@ -191,8 +195,10 @@ static int __init oprofile_init(void) 
	}



	err = oprofilefs_register();

	if (err)

	if (err) {

		oprofile_arch_exit();

		buffer_sync_cleanup();

	}



	return err;

}
@@ -202,6 +208,7 @@ static void __exit oprofile_exit(void) 
{

	oprofilefs_unregister();

	oprofile_arch_exit();

	buffer_sync_cleanup();

}