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

Commit 6cd10f8d authored by James Bottomley's avatar James Bottomley Committed by Ingo Molnar
Browse files

x86, voyager: fix smp generic helper voyager breakage 



Impact: build/boot fix for x86/Voyager

This change:

| commit 3d442233
| Author: Jens Axboe <jens.axboe@oracle.com>
| Date:   Thu Jun 26 11:21:34 2008 +0200
|
|     Add generic helpers for arch IPI function calls

didn't wire up the voyager smp call function correctly, so do that
here.  Also make CONFIG_USE_GENERIC_SMP_HELPERS a def_bool y again,
since we now use the generic helpers for every x86 architecture.

Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
Cc: Jens Axboe <Jens.Axboe@oracle.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 30446461

arch/x86/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -167,9 +167,12 @@ config GENERIC_PENDING_IRQ 
config X86_SMP

	bool

	depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64)

	select USE_GENERIC_SMP_HELPERS

	default y



config USE_GENERIC_SMP_HELPERS

	def_bool y

	depends on SMP



config X86_32_SMP

	def_bool y

	depends on X86_32 && SMP

arch/x86/mach-voyager/voyager_smp.c

+14 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 * This file provides all the same external entries as smp.c but uses

 * the voyager hal to provide the functionality

 */

#include <linux/cpu.h>

#include <linux/module.h>

#include <linux/mm.h>

#include <linux/kernel_stat.h>
@@ -1790,6 +1791,17 @@ void __init smp_setup_processor_id(void) 
	x86_write_percpu(cpu_number, hard_smp_processor_id());

}



static void voyager_send_call_func(cpumask_t callmask)

{

	__u32 mask = cpus_addr(callmask)[0] & ~(1 << smp_processor_id());

	send_CPI(mask, VIC_CALL_FUNCTION_CPI);

}



static void voyager_send_call_func_single(int cpu)

{

	send_CPI(1 << cpu, VIC_CALL_FUNCTION_SINGLE_CPI);

}



struct smp_ops smp_ops = {

	.smp_prepare_boot_cpu = voyager_smp_prepare_boot_cpu,

	.smp_prepare_cpus = voyager_smp_prepare_cpus,
@@ -1799,6 +1811,6 @@ struct smp_ops smp_ops = { 
	.smp_send_stop = voyager_smp_send_stop,

	.smp_send_reschedule = voyager_smp_send_reschedule,



	.send_call_func_ipi = native_send_call_func_ipi,

	.send_call_func_single_ipi = native_send_call_func_single_ipi,

	.send_call_func_ipi = voyager_send_call_func,

	.send_call_func_single_ipi = voyager_send_call_func_single,

};