ia64/xen-unstable

changeset 1589:9eda3ea2b4a0

bitkeeper revision 1.1019 (40de8639yjRdZbQS_JrcVsHsaPIwZw)

smp.h, irq.h, config.h, sched_bvt.c, setup.c, pci-pc.c:
Fix compile errors for latest GCC (3.4.0).
author kaf24@scramble.cl.cam.ac.uk
date Sun Jun 27 08:32:57 2004 +0000 (2004-06-27)
parents bed9d3625f2e
children 1b2e743614ea
files xen/arch/x86/pci-pc.c xen/arch/x86/setup.c xen/common/sched_bvt.c xen/include/asm-x86/config.h xen/include/asm-x86/irq.h xen/include/xen/smp.h
line diff
     1.1 --- a/xen/arch/x86/pci-pc.c	Sat Jun 26 16:41:33 2004 +0000
     1.2 +++ b/xen/arch/x86/pci-pc.c	Sun Jun 27 08:32:57 2004 +0000
     1.3 @@ -1020,12 +1020,12 @@ struct irq_routing_table * __devinit pci
     1.4  		"xor %%ah, %%ah\n"
     1.5  		"1:"
     1.6  		: "=a" (ret),
     1.7 -		  "=b" (map),
     1.8 -		  "+m" (opt)
     1.9 +		  "=b" (map)
    1.10  		: "0" (PCIBIOS_GET_ROUTING_OPTIONS),
    1.11  		  "1" (0),
    1.12 -		  "D" ((long) &opt),
    1.13 -		  "S" (&pci_indirect));
    1.14 +		  "D" (&opt),
    1.15 +		  "S" (&pci_indirect)
    1.16 +                : "memory");
    1.17  	DBG("OK  ret=%d, size=%d, map=%x\n", ret, opt.size, map);
    1.18  	if (ret & 0xff00)
    1.19  		printk(KERN_ERR "PCI: Error %02x when fetching IRQ routing table.\n", (ret >> 8) & 0xff);
     2.1 --- a/xen/arch/x86/setup.c	Sat Jun 26 16:41:33 2004 +0000
     2.2 +++ b/xen/arch/x86/setup.c	Sun Jun 27 08:32:57 2004 +0000
     2.3 @@ -16,6 +16,15 @@
     2.4  #include <asm/domain_page.h>
     2.5  #include <asm/pdb.h>
     2.6  
     2.7 +extern void init_IRQ(void);
     2.8 +extern void trap_init(void);
     2.9 +extern void time_init(void);
    2.10 +extern void ac_timer_init(void);
    2.11 +extern void initialize_keytable();
    2.12 +extern int opt_nosmp, opt_watchdog, opt_noacpi;
    2.13 +extern int opt_ignorebiostables, opt_noht;
    2.14 +extern int do_timer_lists_from_pit;
    2.15 +
    2.16  char ignore_irq13;		/* set if exception 16 works */
    2.17  struct cpuinfo_x86 boot_cpu_data = { 0, 0, 0, 0, -1 };
    2.18  
    2.19 @@ -96,8 +105,6 @@ void __init get_cpu_vendor(struct cpuinf
    2.20  
    2.21  static void __init init_intel(struct cpuinfo_x86 *c)
    2.22  {
    2.23 -    extern int opt_noht, opt_noacpi;
    2.24 -
    2.25      /* SEP CPUID bug: Pentium Pro reports SEP but doesn't have it */
    2.26      if ( c->x86 == 6 && c->x86_model < 3 && c->x86_mask < 3 )
    2.27          clear_bit(X86_FEATURE_SEP, &c->x86_capability);
    2.28 @@ -300,13 +307,6 @@ unsigned long pci_mem_start = 0x10000000
    2.29  
    2.30  void __init start_of_day(void)
    2.31  {
    2.32 -    extern void init_IRQ(void);
    2.33 -    extern void trap_init(void);
    2.34 -    extern void time_init(void);
    2.35 -    extern void ac_timer_init(void);
    2.36 -    extern void initialize_keytable();
    2.37 -    extern int opt_nosmp, opt_watchdog, opt_noacpi, opt_ignorebiostables;
    2.38 -    extern int do_timer_lists_from_pit;
    2.39      unsigned long low_mem_size;
    2.40      
    2.41  #ifdef MEMORY_GUARD
     3.1 --- a/xen/common/sched_bvt.c	Sat Jun 26 16:41:33 2004 +0000
     3.2 +++ b/xen/common/sched_bvt.c	Sun Jun 27 08:32:57 2004 +0000
     3.3 @@ -96,7 +96,8 @@ static void __calc_evt(struct bvt_dom_in
     3.4   */
     3.5  int bvt_alloc_task(struct domain *p)
     3.6  {
     3.7 -    if ( (BVT_INFO(p) = kmem_cache_alloc(dom_info_cache)) == NULL )
     3.8 +    p->sched_priv = kmem_cache_alloc(dom_info_cache);
     3.9 +    if ( p->sched_priv == NULL )
    3.10          return -1;
    3.11      
    3.12      return 0;
    3.13 @@ -410,8 +411,8 @@ int bvt_init_scheduler()
    3.14  
    3.15      for ( i = 0; i < NR_CPUS; i++ )
    3.16      {
    3.17 -        CPU_INFO(i) = kmalloc(sizeof(struct bvt_cpu_info));
    3.18 -        if ( CPU_INFO(i) == NULL )
    3.19 +        schedule_data[i].sched_priv = kmalloc(sizeof(struct bvt_cpu_info));
    3.20 +        if ( schedule_data[i].sched_priv == NULL )
    3.21          {
    3.22              printk("Failed to allocate BVT scheduler per-CPU memory!\n");
    3.23              return -1;
     4.1 --- a/xen/include/asm-x86/config.h	Sat Jun 26 16:41:33 2004 +0000
     4.2 +++ b/xen/include/asm-x86/config.h	Sun Jun 27 08:32:57 2004 +0000
     4.3 @@ -62,7 +62,6 @@
     4.4  #define SLACK_DOMAIN_MEM_KILOBYTES 2048
     4.5  
     4.6  /* Linkage for x86 */
     4.7 -#define FASTCALL(x)     x __attribute__((regparm(3)))
     4.8  #define asmlinkage        __attribute__((regparm(0)))
     4.9  #define __ALIGN .align 16,0x90
    4.10  #define __ALIGN_STR ".align 16,0x90"
     5.1 --- a/xen/include/asm-x86/irq.h	Sat Jun 26 16:41:33 2004 +0000
     5.2 +++ b/xen/include/asm-x86/irq.h	Sun Jun 27 08:32:57 2004 +0000
     5.3 @@ -66,7 +66,7 @@ extern void enable_8259A_irq(unsigned in
     5.4  extern int i8259A_irq_pending(unsigned int irq);
     5.5  extern void make_8259A_irq(unsigned int irq);
     5.6  extern void init_8259A(int aeoi);
     5.7 -extern void FASTCALL(send_IPI_self(int vector));
     5.8 +extern void send_IPI_self(int vector);
     5.9  extern void init_VISWS_APIC_irqs(void);
    5.10  extern void setup_IO_APIC(void);
    5.11  extern void disable_IO_APIC(void);
     6.1 --- a/xen/include/xen/smp.h	Sat Jun 26 16:41:33 2004 +0000
     6.2 +++ b/xen/include/xen/smp.h	Sun Jun 27 08:32:57 2004 +0000
     6.3 @@ -22,7 +22,7 @@
     6.4   */
     6.5  extern void smp_send_stop(void);
     6.6  
     6.7 -extern void FASTCALL(smp_send_event_check_mask(unsigned long cpu_mask));
     6.8 +extern void smp_send_event_check_mask(unsigned long cpu_mask);
     6.9  #define smp_send_event_check_cpu(_cpu) smp_send_event_check_mask(1<<(_cpu))
    6.10  
    6.11  /*