summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2007-11-09 22:39:38 +0100
committerIngo Molnar <mingo@elte.hu>2007-11-09 22:39:38 +0100
commit4e2947f12516d13446d6ffa1d9e4fbd33b1636fa (patch)
tree0593b91d3128a1bec6acfcd16b82b3ef13d7b2c3
parentd6322faf296ab5bbb597f8b0abcb50153754cd08 (diff)
downloadtalos-op-linux-4e2947f12516d13446d6ffa1d9e4fbd33b1636fa.tar.gz
talos-op-linux-4e2947f12516d13446d6ffa1d9e4fbd33b1636fa.zip
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: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/cpu/mtrr/main.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
index 9abbdf7562c5..3b20613325dc 100644
--- a/arch/x86/kernel/cpu/mtrr/main.c
+++ b/arch/x86/kernel/cpu/mtrr/main.c
@@ -139,13 +139,12 @@ struct set_mtrr_data {
mtrr_type smp_type;
};
-#ifdef CONFIG_SMP
-
static void ipi_handler(void *info)
/* [SUMMARY] Synchronisation handler. Executed by "other" CPUs.
[RETURNS] Nothing.
*/
{
+#ifdef CONFIG_SMP
struct set_mtrr_data *data = info;
unsigned long flags;
@@ -168,9 +167,8 @@ static void ipi_handler(void *info)
atomic_dec(&data->count);
local_irq_restore(flags);
-}
-
#endif
+}
static inline int types_compatible(mtrr_type type1, mtrr_type type2) {
return type1 == MTRR_TYPE_UNCACHABLE ||
OpenPOWER on IntegriCloud