[-mm patch] fix MTRR compilation with SMP=n

[Adrian Bunk]

On Thu, Jul 28, 2005 at 02:58:40AM -0700, Andrew Morton wrote:
>...
> Changes since 2.6.13-rc3-mm2:
>...
> +alpha-fix-statement-with-no-effect-warnings.patch
> 
>  Alpha warning fixes
>...

This patch broke the compilation on i386 with CONFIG_SMP=n and 
CONFIG_MTRR=y:

<--  snip  -->

...
  CC      arch/i386/kernel/cpu/mtrr/main.o
arch/i386/kernel/cpu/mtrr/main.c: In function 'set_mtrr':
arch/i386/kernel/cpu/mtrr/main.c:225: error: 'ipi_handler' undeclared (first use in this function)
arch/i386/kernel/cpu/mtrr/main.c:225: error: (Each undeclared identifier is reported only once
arch/i386/kernel/cpu/mtrr/main.c:225: error: for each function it appears in.)
make[3]: *** [arch/i386/kernel/cpu/mtrr/main.o] Error 1

<--  snip  -->


Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

--- linux-2.6.13-rc3-mm3/arch/i386/kernel/cpu/mtrr/main.c.old	2005-07-28 12:36:09.000000000 +0200
+++ linux-2.6.13-rc3-mm3/arch/i386/kernel/cpu/mtrr/main.c	2005-07-28 12:39:35.000000000 +0200
@@ -221,9 +221,11 @@
 	atomic_set(&data.count, num_booting_cpus() - 1);
 	atomic_set(&data.gate,0);
 
+#ifdef CONFIG_SMP
 	/*  Start the ball rolling on other CPUs  */
 	if (smp_call_function(ipi_handler, &data, 1, 0) != 0)
 		panic("mtrr: timed out waiting for other CPUs\n");
+#endif  /*  CONFIG_SMP  */
 
 	local_irq_save(flags);
 

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/