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

Commit 4e2947f1 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86: make ipi_handler() always defined 



prepare for up_smp_call_function() to ensure that the 'func'
pointer is unused. (which is related to a KVM build fix)

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

arch/x86/kernel/cpu/mtrr/main.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -139,13 +139,12 @@ struct set_mtrr_data { 
	mtrr_type	smp_type;

	mtrr_type	smp_type;

};

};





#ifdef CONFIG_SMP



static void ipi_handler(void *info)

static void ipi_handler(void *info)

/*  [SUMMARY] Synchronisation handler. Executed by "other" CPUs.

/*  [SUMMARY] Synchronisation handler. Executed by "other" CPUs.

    [RETURNS] Nothing.

    [RETURNS] Nothing.

*/

*/

{

{

#ifdef CONFIG_SMP

	struct set_mtrr_data *data = info;

	struct set_mtrr_data *data = info;

	unsigned long flags;

	unsigned long flags;
@@ -168,9 +167,8 @@ static void ipi_handler(void *info) 




	atomic_dec(&data->count);

	atomic_dec(&data->count);

	local_irq_restore(flags);

	local_irq_restore(flags);

}



#endif

#endif

}





static inline int types_compatible(mtrr_type type1, mtrr_type type2) {

static inline int types_compatible(mtrr_type type1, mtrr_type type2) {

	return type1 == MTRR_TYPE_UNCACHABLE ||

	return type1 == MTRR_TYPE_UNCACHABLE ||