From 7a98f08579b0fd1d1663d83a3a0d4938da5afa7b Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Fri, 9 Nov 2007 22:39:38 +0100 Subject: [PATCH] --- yaml --- r: 73399 b: refs/heads/master c: 4e2947f12516d13446d6ffa1d9e4fbd33b1636fa h: refs/heads/master i: 73397: e95992266a94a4d15af3d23d53706d09f820ce78 73395: ed4462e08c9646f051ddf92f4aaf0e33a6ef8c2b 73391: a7814db8c7dc413ac396cd2c8e8975758660b8d8 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/mtrr/main.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 77cf6e8ef4bb..acf4070140e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6322faf296ab5bbb597f8b0abcb50153754cd08 +refs/heads/master: 4e2947f12516d13446d6ffa1d9e4fbd33b1636fa diff --git a/trunk/arch/x86/kernel/cpu/mtrr/main.c b/trunk/arch/x86/kernel/cpu/mtrr/main.c index 9abbdf7562c5..3b20613325dc 100644 --- a/trunk/arch/x86/kernel/cpu/mtrr/main.c +++ b/trunk/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 ||