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

Commit f6f88e9b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

generic-ipi: more merge fallout 



fix more API change fallout in recently merged upstream changes.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b3c9816b

arch/mips/oprofile/op_model_mipsxx.c

+2 −2
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ static int __init mipsxx_init(void) 
	if (!cpu_has_mipsmt_pertccounters)

		counters = counters_total_to_per_cpu(counters);

#endif

	on_each_cpu(reset_counters, (void *)(long)counters, 0, 1);

	on_each_cpu(reset_counters, (void *)(long)counters, 1);



	op_model_mipsxx_ops.num_counters = counters;

	switch (current_cpu_type()) {
@@ -382,7 +382,7 @@ static void mipsxx_exit(void) 
	int counters = op_model_mipsxx_ops.num_counters;



	counters = counters_per_cpu_to_total(counters);

	on_each_cpu(reset_counters, (void *)(long)counters, 0, 1);

	on_each_cpu(reset_counters, (void *)(long)counters, 1);



	perf_irq = save_perf_irq;

}

arch/ppc/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static void stop_this_cpu(void *dummy) 


void smp_send_stop(void)

{

	smp_call_function(stop_this_cpu, NULL, 1, 0);

	smp_call_function(stop_this_cpu, NULL, 0);

}



/*

arch/s390/kernel/time.c

+2 −2
Original line number Diff line number Diff line
@@ -1432,7 +1432,7 @@ static void stp_work_fn(struct work_struct *work) 
	 */

	memset(&stp_sync, 0, sizeof(stp_sync));

	preempt_disable();

	smp_call_function(clock_sync_cpu_start, &stp_sync, 0, 0);

	smp_call_function(clock_sync_cpu_start, &stp_sync, 0);

	local_irq_disable();

	enable_sync_clock();
@@ -1465,7 +1465,7 @@ static void stp_work_fn(struct work_struct *work) 
		stp_sync.in_sync = 1;



	local_irq_enable();

	smp_call_function(clock_sync_cpu_end, NULL, 0, 0);

	smp_call_function(clock_sync_cpu_end, NULL, 0);

	preempt_enable();

}

drivers/watchdog/booke_wdt.c

+3 −3
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static void __booke_wdt_ping(void *data) 


static void booke_wdt_ping(void)

{

	on_each_cpu(__booke_wdt_ping, NULL, 0, 0);

	on_each_cpu(__booke_wdt_ping, NULL, 0);

}



static void __booke_wdt_enable(void *data)
@@ -131,7 +131,7 @@ static int booke_wdt_open(struct inode *inode, struct file *file) 
	spin_lock(&booke_wdt_lock);

	if (booke_wdt_enabled == 0) {

		booke_wdt_enabled = 1;

		on_each_cpu(__booke_wdt_enable, NULL, 0, 0);

		on_each_cpu(__booke_wdt_enable, NULL, 0);

		printk(KERN_INFO "PowerPC Book-E Watchdog Timer Enabled "

				"(wdt_period=%d)\n", booke_wdt_period);

	}
@@ -177,7 +177,7 @@ static int __init booke_wdt_init(void) 
	if (booke_wdt_enabled == 1) {

		printk(KERN_INFO "PowerPC Book-E Watchdog Timer Enabled "

				"(wdt_period=%d)\n", booke_wdt_period);

		on_each_cpu(__booke_wdt_enable, NULL, 0, 0);

		on_each_cpu(__booke_wdt_enable, NULL, 0);

	}

	spin_unlock(&booke_wdt_lock);