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

Commit 3440a1ca authored by liguang's avatar liguang Committed by Linus Torvalds
Browse files

kernel/smp.c: remove 'priv' of call_single_data 



The 'priv' field is redundant; we can pass data via 'info'.

Signed-off-by: default avatarliguang <lig.fnst@cn.fujitsu.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1def1dc9

include/linux/smp.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,6 @@ struct call_single_data { 
	smp_call_func_t func;

	smp_call_func_t func;

	void *info;

	void *info;

	u16 flags;

	u16 flags;

	u16 priv;

};

};





/* total number of cpus in this system (may exceed NR_CPUS) */

/* total number of cpus in this system (may exceed NR_CPUS) */

kernel/softirq.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -620,8 +620,7 @@ static void remote_softirq_receive(void *data) 
	unsigned long flags;

	unsigned long flags;

	int softirq;

	int softirq;





	softirq = cp->priv;

	softirq = *(int *)cp->info;



	local_irq_save(flags);

	local_irq_save(flags);

	__local_trigger(cp, softirq);

	__local_trigger(cp, softirq);

	local_irq_restore(flags);

	local_irq_restore(flags);
@@ -631,9 +630,8 @@ static int __try_remote_softirq(struct call_single_data *cp, int cpu, int softir 
{

{

	if (cpu_online(cpu)) {

	if (cpu_online(cpu)) {

		cp->func = remote_softirq_receive;

		cp->func = remote_softirq_receive;

		cp->info = cp;

		cp->info = &softirq;

		cp->flags = 0;

		cp->flags = 0;

		cp->priv = softirq;





		__smp_call_function_single(cpu, cp, 0);

		__smp_call_function_single(cpu, cp, 0);

		return 0;

		return 0;