ia64/xen-unstable

changeset 1659:d9a96380ff94

bitkeeper revision 1.1041.1.10 (40e49f18r_RSEThU8wQyfb6MAmHXiQ)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xeno
author kaf24@scramble.cl.cam.ac.uk
date Thu Jul 01 23:32:40 2004 +0000 (2004-07-01)
parents 720ab2010246 006c505fe15f
children 55d2aa0544ae 11fc1027833b 8f8449890369
files xen/drivers/pci/quirks.c xen/include/asm-x86/io_apic.h xen/include/asm-x86/page.h xen/include/asm-x86/smp.h xen/include/xen/sched.h xen/include/xen/smp.h xen/include/xen/spinlock.h
line diff
     1.1 --- a/xen/drivers/pci/quirks.c	Thu Jul 01 16:37:02 2004 +0000
     1.2 +++ b/xen/drivers/pci/quirks.c	Thu Jul 01 23:32:40 2004 +0000
     1.3 @@ -18,6 +18,7 @@
     1.4  #include <xen/pci.h>
     1.5  #include <xen/init.h>
     1.6  #include <xen/delay.h>
     1.7 +#include <asm/io_apic.h>
     1.8  
     1.9  #undef DEBUG
    1.10  
     2.1 --- a/xen/include/asm-x86/io_apic.h	Thu Jul 01 16:37:02 2004 +0000
     2.2 +++ b/xen/include/asm-x86/io_apic.h	Thu Jul 01 23:32:40 2004 +0000
     2.3 @@ -3,6 +3,7 @@
     2.4  
     2.5  #include <xen/config.h>
     2.6  #include <xen/types.h>
     2.7 +#include <asm/mpspec.h>
     2.8  
     2.9  /*
    2.10   * Intel IO-APIC support for SMP and UP systems.
     3.1 --- a/xen/include/asm-x86/page.h	Thu Jul 01 16:37:02 2004 +0000
     3.2 +++ b/xen/include/asm-x86/page.h	Thu Jul 01 23:32:40 2004 +0000
     3.3 @@ -180,6 +180,8 @@ static __inline__ int get_order(unsigned
     3.4      } while (size);
     3.5      return order;
     3.6  }
     3.7 +
     3.8 +extern void zap_low_mappings(void);
     3.9  #endif
    3.10  
    3.11  #endif /* _I386_PAGE_H */
     4.1 --- a/xen/include/asm-x86/smp.h	Thu Jul 01 16:37:02 2004 +0000
     4.2 +++ b/xen/include/asm-x86/smp.h	Thu Jul 01 23:32:40 2004 +0000
     4.3 @@ -42,7 +42,6 @@ extern void smp_message_irq(int cpl, voi
     4.4  extern void smp_send_reschedule(int cpu);
     4.5  extern void smp_invalidate_rcv(void);		/* Process an NMI */
     4.6  extern void (*mtrr_hook) (void);
     4.7 -extern void zap_low_mappings (void);
     4.8  
     4.9  /*
    4.10   * On x86 all CPUs are mapped 1:1 to the APIC space.
     5.1 --- a/xen/include/xen/sched.h	Thu Jul 01 16:37:02 2004 +0000
     5.2 +++ b/xen/include/xen/sched.h	Thu Jul 01 23:32:40 2004 +0000
     5.3 @@ -15,6 +15,7 @@
     5.4  #include <xen/time.h>
     5.5  #include <xen/ac_timer.h>
     5.6  #include <xen/delay.h>
     5.7 +#include <asm/atomic.h>
     5.8  
     5.9  #define STACK_SIZE (2*PAGE_SIZE)
    5.10  #include <asm/current.h>
     6.1 --- a/xen/include/xen/smp.h	Thu Jul 01 16:37:02 2004 +0000
     6.2 +++ b/xen/include/xen/smp.h	Thu Jul 01 23:32:40 2004 +0000
     6.3 @@ -72,7 +72,9 @@ extern volatile int smp_msg_id;
     6.4  /*
     6.5   *	These macros fold the SMP functionality into a single CPU system
     6.6   */
     6.7 - 
     6.8 +
     6.9 +#define smp_send_event_check_mask(_m)           ((void)0)
    6.10 +#define smp_send_event_check_cpu(_p)            ((void)0) 
    6.11  #define smp_num_cpus				1
    6.12  #define smp_processor_id()			0
    6.13  #define hard_smp_processor_id()			0
     7.1 --- a/xen/include/xen/spinlock.h	Thu Jul 01 16:37:02 2004 +0000
     7.2 +++ b/xen/include/xen/spinlock.h	Thu Jul 01 23:32:40 2004 +0000
     7.3 @@ -54,6 +54,8 @@ typedef struct { int gcc_is_buggy; } spi
     7.4  #define spin_trylock(lock)      ({1; })
     7.5  #define spin_unlock_wait(lock)  do { } while(0)
     7.6  #define spin_unlock(lock)       do { } while(0)
     7.7 +#define spin_lock_recursive(lock)   do { } while(0)
     7.8 +#define spin_unlock_recursive(lock) do { } while(0)
     7.9  
    7.10  #if (__GNUC__ > 2)
    7.11  typedef struct { } rwlock_t;