Fix compiler warnings.

Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/linux-2.6-xen-sparse/arch/xen/i386/kernel/mpparse.c b/linux-2.6-xen-sparse/arch/xen/i386/kernel/mpparse.c
index 2e8aa94670eadc99817baa7794b9b9701835a0c6..3a984a61a646daa0c10498de81076ff3b68a173f 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/mpparse.c
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/mpparse.c
@@ -784,7 +784,9 @@ static int __init smp_scan_config (unsigned long base, unsigned long length)
 
 void __init find_smp_config (void)
 {
+#ifndef CONFIG_XEN
        unsigned int address;
+#endif
 
        /*
         * FIXME: Linux assumes you have 640K of base ram..

diff --git a/linux-2.6-xen-sparse/arch/xen/i386/kernel/smpboot.c b/linux-2.6-xen-sparse/arch/xen/i386/kernel/smpboot.c
index 45787ddf5b646ec891e05dade040a245b810bf76..96c4317c71475faa65aa08380bb1f3f23d527d45 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/smpboot.c
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/smpboot.c
@@ -1604,6 +1604,9 @@ static void smp_intr_exit(void)
        unbind_ipi_from_irq(CALL_FUNCTION_VECTOR);
 }
 
+extern void local_setup_timer_irq(void);
+extern void local_teardown_timer_irq(void);
+
 void smp_suspend(void)
 {
        /* XXX todo: take down time and ipi's on all cpus */

diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c b/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c
index f1c4d138f94488af26356e681fbe281a4ccead2f..47fdcc9fdfdcc0c31bd25ab27d4e764e9bdfba96 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c
@@ -435,9 +435,11 @@ void unbind_evtchn_from_irqhandler(unsigned int evtchn, void *dev_id)
     unbind_evtchn_from_irq(evtchn);
 }
 
+#ifdef CONFIG_SMP
 static void do_nothing_function(void *ign)
 {
 }
+#endif
 
 /* Rebind an evtchn so that it gets delivered to a specific cpu */
 static void rebind_irq_to_cpu(unsigned irq, unsigned tcpu)

diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
index 40155615c1a882bf565f62b7e877841655843870..1f460f91ef7528eb33ee254b0c193183c11beaca 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
@@ -11,6 +11,8 @@
  * Copyright (c) 2005, Christopher Clark
  */
 
+#include <linux/spinlock.h>
+#include <asm-xen/balloon.h>
 #include "common.h"
 
 /*