Commit 3bb447fc authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[S390] Convert to smp_call_function_single. 



smp_call_function_single now has the same semantics as s390's
smp_call_function_on. Therefore convert to the *single variant
and get rid of some architecture specific code.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent d941cf5e

arch/s390/appldata/appldata_base.c

+6 −6
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ int appldata_diag(char record_nr, u16 function, unsigned long buffer, 
/*

 * appldata_mod_vtimer_wrap()

 *

 * wrapper function for mod_virt_timer(), because smp_call_function_on()

 * wrapper function for mod_virt_timer(), because smp_call_function_single()

 * accepts only one parameter.

 */

static void __appldata_mod_vtimer_wrap(void *p) {
@@ -208,9 +208,9 @@ __appldata_vtimer_setup(int cmd) 
					  num_online_cpus()) * TOD_MICRO;

		for_each_online_cpu(i) {

			per_cpu(appldata_timer, i).expires = per_cpu_interval;

			smp_call_function_on(add_virt_timer_periodic,

			smp_call_function_single(i, add_virt_timer_periodic,

						 &per_cpu(appldata_timer, i),

					     0, 1, i);

						 0, 1);

		}

		appldata_timer_active = 1;

		P_INFO("Monitoring timer started.\n");
@@ -236,8 +236,8 @@ __appldata_vtimer_setup(int cmd) 
			} args;

			args.timer = &per_cpu(appldata_timer, i);

			args.expires = per_cpu_interval;

			smp_call_function_on(__appldata_mod_vtimer_wrap,

					     &args, 0, 1, i);

			smp_call_function_single(i, __appldata_mod_vtimer_wrap,

						 &args, 0, 1);

		}

	}

}

arch/s390/kernel/smp.c

+7 −9
Original line number Diff line number Diff line
@@ -170,30 +170,28 @@ int smp_call_function(void (*func) (void *info), void *info, int nonatomic, 
EXPORT_SYMBOL(smp_call_function);



/*

 * smp_call_function_on:

 * smp_call_function_single:

 * @cpu: the CPU where func should run

 * @func: the function to run; this must be fast and non-blocking

 * @info: an arbitrary pointer to pass to the function

 * @nonatomic: unused

 * @wait: if true, wait (atomically) until function has completed on other CPUs

 * @cpu: the CPU where func should run

 *

 * Run a function on one processor.

 *

 * You must not call this function with disabled interrupts, from a

 * hardware interrupt handler or from a bottom half.

 */

int smp_call_function_on(void (*func) (void *info), void *info, int nonatomic,

			 int wait, int cpu)

int smp_call_function_single(int cpu, void (*func) (void *info), void *info,

			     int nonatomic, int wait)

{

	cpumask_t map = CPU_MASK_NONE;



	preempt_disable();

	cpu_set(cpu, map);

	__smp_call_function_map(func, info, nonatomic, wait, map);

	__smp_call_function_map(func, info, nonatomic, wait,

				cpumask_of_cpu(cpu));

	preempt_enable();

	return 0;

}

EXPORT_SYMBOL(smp_call_function_on);

EXPORT_SYMBOL(smp_call_function_single);



static void do_send_stop(void)

{

arch/s390/kernel/vtime.c

+1 −1
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ EXPORT_SYMBOL(add_virt_timer_periodic); 


/*

 * If we change a pending timer the function must be called on the CPU

 * where the timer is running on, e.g. by smp_call_function_on()

 * where the timer is running on, e.g. by smp_call_function_single()

 *

 * The original mod_timer adds the timer if it is not pending. For compatibility

 * we do the same. The timer will be added on the current CPU as a oneshot timer.

include/asm-s390/smp.h

+1 −10
Original line number Diff line number Diff line
@@ -36,8 +36,7 @@ extern void machine_halt_smp(void); 
extern void machine_power_off_smp(void);



extern void smp_setup_cpu_possible_map(void);

extern int smp_call_function_on(void (*func) (void *info), void *info,

				int nonatomic, int wait, int cpu);



#define NO_PROC_ID		0xFF		/* No processor magic marker */



/*
@@ -96,14 +95,6 @@ extern int __cpu_up (unsigned int cpu); 
#endif



#ifndef CONFIG_SMP

static inline int

smp_call_function_on(void (*func) (void *info), void *info,

		     int nonatomic, int wait, int cpu)

{

	func(info);

	return 0;

}



static inline void smp_send_stop(void)

{

	/* Disable all interrupts/machine checks */

net/iucv/iucv.c

+8 −7
Original line number Diff line number Diff line
@@ -479,7 +479,8 @@ static void iucv_setmask_mp(void) 
		/* Enable all cpus with a declared buffer. */

		if (cpu_isset(cpu, iucv_buffer_cpumask) &&

		    !cpu_isset(cpu, iucv_irq_cpumask))

			smp_call_function_on(iucv_allow_cpu, NULL, 0, 1, cpu);

			smp_call_function_single(cpu, iucv_allow_cpu,

						 NULL, 0, 1);

	preempt_enable();

}
@@ -497,7 +498,7 @@ static void iucv_setmask_up(void) 
	cpumask = iucv_irq_cpumask;

	cpu_clear(first_cpu(iucv_irq_cpumask), cpumask);

	for_each_cpu_mask(cpu, cpumask)

		smp_call_function_on(iucv_block_cpu, NULL, 0, 1, cpu);

		smp_call_function_single(cpu, iucv_block_cpu, NULL, 0, 1);

}



/**
@@ -522,7 +523,7 @@ static int iucv_enable(void) 
	rc = -EIO;

	preempt_disable();

	for_each_online_cpu(cpu)

		smp_call_function_on(iucv_declare_cpu, NULL, 0, 1, cpu);

		smp_call_function_single(cpu, iucv_declare_cpu, NULL, 0, 1);

	preempt_enable();

	if (cpus_empty(iucv_buffer_cpumask))

		/* No cpu could declare an iucv buffer. */
@@ -578,7 +579,7 @@ static int __cpuinit iucv_cpu_notify(struct notifier_block *self, 
	case CPU_ONLINE_FROZEN:

	case CPU_DOWN_FAILED:

	case CPU_DOWN_FAILED_FROZEN:

		smp_call_function_on(iucv_declare_cpu, NULL, 0, 1, cpu);

		smp_call_function_single(cpu, iucv_declare_cpu, NULL, 0, 1);

		break;

	case CPU_DOWN_PREPARE:

	case CPU_DOWN_PREPARE_FROZEN:
@@ -587,10 +588,10 @@ static int __cpuinit iucv_cpu_notify(struct notifier_block *self, 
		if (cpus_empty(cpumask))

			/* Can't offline last IUCV enabled cpu. */

			return NOTIFY_BAD;

		smp_call_function_on(iucv_retrieve_cpu, NULL, 0, 1, cpu);

		smp_call_function_single(cpu, iucv_retrieve_cpu, NULL, 0, 1);

		if (cpus_empty(iucv_irq_cpumask))

			smp_call_function_on(iucv_allow_cpu, NULL, 0, 1,

					     first_cpu(iucv_buffer_cpumask));

			smp_call_function_single(first_cpu(iucv_buffer_cpumask),

						 iucv_allow_cpu, NULL, 0, 1);

		break;

	}

	return NOTIFY_OK;