bitkeeper revision 1.1041.4.1 (40e49f12Fj3pygWG3LxLQ2tcwBx24A)

Fix common files when compiled without CONFIG_SMP (some x86-specific
files still don't work).

7 files changed, 10 insertions, 2 deletions

diff --git a/xen/drivers/pci/quirks.c b/xen/drivers/pci/quirks.c
index 4e920c5234..71c0bb428d 100644
--- a/xen/drivers/pci/quirks.c
+++ b/xen/drivers/pci/quirks.c
@@ -18,6 +18,7 @@
 #include <xen/pci.h>
 #include <xen/init.h>
 #include <xen/delay.h>
+#include <asm/io_apic.h>
 
 #undef DEBUG
 
diff --git a/xen/include/asm-x86/io_apic.h b/xen/include/asm-x86/io_apic.h
index 89e0fc0b5b..1c2b24085a 100644
--- a/xen/include/asm-x86/io_apic.h
+++ b/xen/include/asm-x86/io_apic.h
@@ -3,6 +3,7 @@
 
 #include <xen/config.h>
 #include <xen/types.h>
+#include <asm/mpspec.h>
 
 /*
  * Intel IO-APIC support for SMP and UP systems.
diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h
index 8eb30e35ea..8e4a7ec093 100644
--- a/xen/include/asm-x86/page.h
+++ b/xen/include/asm-x86/page.h
@@ -180,6 +180,8 @@ static __inline__ int get_order(unsigned long size)
     } while (size);
     return order;
 }
+
+extern void zap_low_mappings(void);
 #endif
 
 #endif /* _I386_PAGE_H */
diff --git a/xen/include/asm-x86/smp.h b/xen/include/asm-x86/smp.h
index ac9cc5292f..25c29de2e8 100644
--- a/xen/include/asm-x86/smp.h
+++ b/xen/include/asm-x86/smp.h
@@ -42,7 +42,6 @@ extern void smp_message_irq(int cpl, void *dev_id, struct pt_regs *regs);
 extern void smp_send_reschedule(int cpu);
 extern void smp_invalidate_rcv(void);		/* Process an NMI */
 extern void (*mtrr_hook) (void);
-extern void zap_low_mappings (void);
 
 /*
  * On x86 all CPUs are mapped 1:1 to the APIC space.
diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index 009ce5f5e3..976a12bbe3 100644
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -15,6 +15,7 @@
 #include <xen/time.h>
 #include <xen/ac_timer.h>
 #include <xen/delay.h>
+#include <asm/atomic.h>
 
 #define STACK_SIZE (2*PAGE_SIZE)
 #include <asm/current.h>
diff --git a/xen/include/xen/smp.h b/xen/include/xen/smp.h
index d7f71b6fae..12885a5037 100644
--- a/xen/include/xen/smp.h
+++ b/xen/include/xen/smp.h
@@ -72,7 +72,9 @@ extern volatile int smp_msg_id;
 /*
  *	These macros fold the SMP functionality into a single CPU system
  */
- 
+
+#define smp_send_event_check_mask(_m)           ((void)0)
+#define smp_send_event_check_cpu(_p)            ((void)0) 
 #define smp_num_cpus				1
 #define smp_processor_id()			0
 #define hard_smp_processor_id()			0
diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h
index 206f3c1762..b74b5f802f 100644
--- a/xen/include/xen/spinlock.h
+++ b/xen/include/xen/spinlock.h
@@ -54,6 +54,8 @@ typedef struct { int gcc_is_buggy; } spinlock_t;
 #define spin_trylock(lock)      ({1; })
 #define spin_unlock_wait(lock)  do { } while(0)
 #define spin_unlock(lock)       do { } while(0)
+#define spin_lock_recursive(lock)   do { } while(0)
+#define spin_unlock_recursive(lock) do { } while(0)
 
 #if (__GNUC__ > 2)
 typedef struct { } rwlock_t;