direct-io.hg

changeset 1284:34ad66d2f845

bitkeeper revision 1.846 (40718059pi259OEdVTRV0BFJ9jTK4w)

Avoid compiler warnings.
author kaf24@scramble.cl.cam.ac.uk
date Mon Apr 05 15:50:49 2004 +0000 (2004-04-05)
parents 52fb04f422c9
children 9da971d2ae29
files xen/arch/i386/io_apic.c xen/arch/i386/process.c xen/arch/i386/setup.c xen/common/schedule.c xen/drivers/block/cciss.c xen/drivers/ide/ide-cd.c xen/drivers/message/fusion/mptscsih.c xen/drivers/net/e100/e100_main.c xen/drivers/net/tg3.c xen/drivers/pci/pci.c xen/drivers/scsi/BusLogic.c xen/drivers/scsi/BusLogic.h xen/drivers/scsi/aacraid/linit.c xen/drivers/scsi/aic7xxx/aic79xx_osm.c xen/drivers/scsi/aic7xxx/aic79xx_osm_pci.c xen/drivers/scsi/aic7xxx/aic7xxx_osm.c xen/drivers/scsi/megaraid.c xen/drivers/scsi/megaraid.h xen/drivers/scsi/sym53c8xx_2/sym_glue.c
line diff
     1.1 --- a/xen/arch/i386/io_apic.c	Mon Apr 05 13:16:43 2004 +0000
     1.2 +++ b/xen/arch/i386/io_apic.c	Mon Apr 05 15:50:49 2004 +0000
     1.3 @@ -1519,25 +1519,6 @@ static void enable_NMI_through_LVT0 (voi
     1.4  	apic_write_around(APIC_LVT0, v);
     1.5  }
     1.6  
     1.7 -static void setup_nmi (void)
     1.8 -{
     1.9 -	/*
    1.10 - 	 * Dirty trick to enable the NMI watchdog ...
    1.11 -	 * We put the 8259A master into AEOI mode and
    1.12 -	 * unmask on all local APICs LVT0 as NMI.
    1.13 -	 *
    1.14 -	 * The idea to use the 8259A in AEOI mode ('8259A Virtual Wire')
    1.15 -	 * is from Maciej W. Rozycki - so we do not have to EOI from
    1.16 -	 * the NMI handler or the timer interrupt.
    1.17 -	 */ 
    1.18 -	printk(KERN_INFO "activating NMI Watchdog ...");
    1.19 -
    1.20 -	smp_call_function(enable_NMI_through_LVT0, NULL, 1, 1);
    1.21 -	enable_NMI_through_LVT0(NULL);
    1.22 -
    1.23 -	printk(" done.\n");
    1.24 -}
    1.25 -
    1.26  /*
    1.27   * This looks a bit hackish but it's about the only one way of sending
    1.28   * a few INTA cycles to 8259As and any associated glue logic.  ICR does
     2.1 --- a/xen/arch/i386/process.c	Mon Apr 05 13:16:43 2004 +0000
     2.2 +++ b/xen/arch/i386/process.c	Mon Apr 05 15:50:49 2004 +0000
     2.3 @@ -172,7 +172,7 @@ void machine_restart(char * __unused)
     2.4                  udelay(50);
     2.5              }
     2.6              /* That didn't work - force a triple fault.. */
     2.7 -            __asm__ __volatile__("lidt %0": :"m" (no_idt));
     2.8 +            __asm__ __volatile__("lidt %0": "=m" (no_idt));
     2.9              __asm__ __volatile__("int3");
    2.10          }
    2.11      }
     3.1 --- a/xen/arch/i386/setup.c	Mon Apr 05 13:16:43 2004 +0000
     3.2 +++ b/xen/arch/i386/setup.c	Mon Apr 05 15:50:49 2004 +0000
     3.3 @@ -29,9 +29,9 @@ unsigned long wait_init_idle;
     3.4  struct task_struct *idle_task[NR_CPUS] = { &idle0_task };
     3.5  
     3.6  #ifdef	CONFIG_ACPI_INTERPRETER
     3.7 -	int acpi_disabled = 0;
     3.8 +int acpi_disabled = 0;
     3.9  #else
    3.10 -	int acpi_disabled = 1;
    3.11 +int acpi_disabled = 1;
    3.12  #endif
    3.13  EXPORT_SYMBOL(acpi_disabled);
    3.14  
    3.15 @@ -72,27 +72,27 @@ static int __init have_cpuid_p(void)
    3.16  
    3.17  void __init get_cpu_vendor(struct cpuinfo_x86 *c)
    3.18  {
    3.19 -        char *v = c->x86_vendor_id;
    3.20 +    char *v = c->x86_vendor_id;
    3.21  
    3.22 -        if (!strcmp(v, "GenuineIntel"))
    3.23 -                c->x86_vendor = X86_VENDOR_INTEL;
    3.24 -        else if (!strcmp(v, "AuthenticAMD"))
    3.25 -                c->x86_vendor = X86_VENDOR_AMD;
    3.26 -        else if (!strcmp(v, "CyrixInstead"))
    3.27 -                c->x86_vendor = X86_VENDOR_CYRIX;
    3.28 -        else if (!strcmp(v, "UMC UMC UMC "))
    3.29 -                c->x86_vendor = X86_VENDOR_UMC;
    3.30 -        else if (!strcmp(v, "CentaurHauls"))
    3.31 -                c->x86_vendor = X86_VENDOR_CENTAUR;
    3.32 -        else if (!strcmp(v, "NexGenDriven"))
    3.33 -                c->x86_vendor = X86_VENDOR_NEXGEN;
    3.34 -        else if (!strcmp(v, "RiseRiseRise"))
    3.35 -                c->x86_vendor = X86_VENDOR_RISE;
    3.36 -        else if (!strcmp(v, "GenuineTMx86") ||
    3.37 -                 !strcmp(v, "TransmetaCPU"))
    3.38 -                c->x86_vendor = X86_VENDOR_TRANSMETA;
    3.39 -        else
    3.40 -                c->x86_vendor = X86_VENDOR_UNKNOWN;
    3.41 +    if (!strcmp(v, "GenuineIntel"))
    3.42 +        c->x86_vendor = X86_VENDOR_INTEL;
    3.43 +    else if (!strcmp(v, "AuthenticAMD"))
    3.44 +        c->x86_vendor = X86_VENDOR_AMD;
    3.45 +    else if (!strcmp(v, "CyrixInstead"))
    3.46 +        c->x86_vendor = X86_VENDOR_CYRIX;
    3.47 +    else if (!strcmp(v, "UMC UMC UMC "))
    3.48 +        c->x86_vendor = X86_VENDOR_UMC;
    3.49 +    else if (!strcmp(v, "CentaurHauls"))
    3.50 +        c->x86_vendor = X86_VENDOR_CENTAUR;
    3.51 +    else if (!strcmp(v, "NexGenDriven"))
    3.52 +        c->x86_vendor = X86_VENDOR_NEXGEN;
    3.53 +    else if (!strcmp(v, "RiseRiseRise"))
    3.54 +        c->x86_vendor = X86_VENDOR_RISE;
    3.55 +    else if (!strcmp(v, "GenuineTMx86") ||
    3.56 +             !strcmp(v, "TransmetaCPU"))
    3.57 +        c->x86_vendor = X86_VENDOR_TRANSMETA;
    3.58 +    else
    3.59 +        c->x86_vendor = X86_VENDOR_UNKNOWN;
    3.60  }
    3.61  
    3.62  static void __init init_intel(struct cpuinfo_x86 *c)
    3.63 @@ -290,13 +290,9 @@ void __init cpu_init(void)
    3.64  
    3.65  static void __init do_initcalls(void)
    3.66  {
    3.67 -        initcall_t *call;
    3.68 -
    3.69 -        call = &__initcall_start;
    3.70 -        do {
    3.71 -                (*call)();
    3.72 -                call++;
    3.73 -        } while (call < &__initcall_end);
    3.74 +    initcall_t *call;
    3.75 +    for ( call = &__initcall_start; call < &__initcall_end; call++ )
    3.76 +        (*call)();
    3.77  }
    3.78  
    3.79  /*
    3.80 @@ -403,12 +399,12 @@ void __init start_of_day(void)
    3.81  	APIC_init_uniprocessor();
    3.82      else
    3.83      	smp_boot_cpus(); 
    3.84 -		     /*
    3.85 -                      * Does loads of stuff, including kicking the local
    3.86 -                      * APIC, and the IO APIC after other CPUs are booted.
    3.87 -                      * Each IRQ is preferably handled by IO-APIC, but
    3.88 -                      * fall thru to 8259A if we have to (but slower).
    3.89 -                      */
    3.90 +    /*
    3.91 +     * Does loads of stuff, including kicking the local
    3.92 +     * APIC, and the IO APIC after other CPUs are booted.
    3.93 +     * Each IRQ is preferably handled by IO-APIC, but
    3.94 +     * fall thru to 8259A if we have to (but slower).
    3.95 +     */
    3.96  #endif
    3.97  
    3.98      initialize_keytable(); /* call back handling for key codes      */
     4.1 --- a/xen/common/schedule.c	Mon Apr 05 13:16:43 2004 +0000
     4.2 +++ b/xen/common/schedule.c	Mon Apr 05 15:50:49 2004 +0000
     4.3 @@ -662,13 +662,6 @@ void schedulers_start(void)
     4.4  }
     4.5  
     4.6  
     4.7 -static void process_timeout(unsigned long __data)
     4.8 -{
     4.9 -    struct task_struct * p = (struct task_struct *) __data;
    4.10 -    wake_up(p);
    4.11 -}
    4.12 -
    4.13 -
    4.14  static void dump_rqueue(struct list_head *queue, char *name)
    4.15  {
    4.16      struct list_head *list;
     5.1 --- a/xen/drivers/block/cciss.c	Mon Apr 05 13:16:43 2004 +0000
     5.2 +++ b/xen/drivers/block/cciss.c	Mon Apr 05 15:50:49 2004 +0000
     5.3 @@ -119,7 +119,7 @@ static struct board_type products[] = {
     5.4  /* Originally cciss driver only supports 8 major number */
     5.5  #define MAX_CTLR_ORIG  COMPAQ_CISS_MAJOR7 - COMPAQ_CISS_MAJOR + 1
     5.6  
     5.7 -#define CCISS_DMA_MASK 0xFFFFFFFFFFFFFFFF /* 64 bit DMA */
     5.8 +#define CCISS_DMA_MASK (~0UL)
     5.9  
    5.10  #ifdef CONFIG_CISS_MONITOR_THREAD
    5.11  static int cciss_monitor(void *ctlr);
     6.1 --- a/xen/drivers/ide/ide-cd.c	Mon Apr 05 13:16:43 2004 +0000
     6.2 +++ b/xen/drivers/ide/ide-cd.c	Mon Apr 05 15:50:49 2004 +0000
     6.3 @@ -2974,11 +2974,13 @@ int ide_cdrom_cleanup(ide_drive_t *drive
     6.4      return 0;
     6.5  }
     6.6  
     6.7 +#if 0
     6.8  static
     6.9  int ide_cdrom_reinit (ide_drive_t *drive)
    6.10  {
    6.11      return 0;
    6.12  }
    6.13 +#endif /* 0 */
    6.14  
    6.15  static ide_driver_t ide_cdrom_driver = {
    6.16      name:			"ide-cdrom",
     7.1 --- a/xen/drivers/message/fusion/mptscsih.c	Mon Apr 05 13:16:43 2004 +0000
     7.2 +++ b/xen/drivers/message/fusion/mptscsih.c	Mon Apr 05 15:50:49 2004 +0000
     7.3 @@ -204,10 +204,10 @@ static int	mptscsih_doDv(MPT_SCSI_HOST *
     7.4  static void	mptscsih_dv_parms(MPT_SCSI_HOST *hd, DVPARAMETERS *dv,void *pPage);
     7.5  static void	mptscsih_fillbuf(char *buffer, int size, int index, int width);
     7.6  #endif
     7.7 -/*static int	mptscsih_setup(char *str);*/
     7.8 +#if XEN_KILLED
     7.9 +static int	mptscsih_setup(char *str);
    7.10  static int	mptscsih_halt(struct notifier_block *nb, ulong event, void *buf);
    7.11  
    7.12 -#if XEN_KILLED
    7.13  /*
    7.14   *	Reboot Notification
    7.15   */
    7.16 @@ -2168,6 +2168,7 @@ mptscsih_release(struct Scsi_Host *host)
    7.17  	return 0;
    7.18  }
    7.19  
    7.20 +#if 0 /* XEN */
    7.21  /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
    7.22  /**
    7.23   *	mptscsih_halt - Process the reboot notification
    7.24 @@ -2209,6 +2210,7 @@ mptscsih_halt(struct notifier_block *nb,
    7.25  #endif
    7.26  	return NOTIFY_OK;
    7.27  }
    7.28 +#endif /* 0 (XEN) */
    7.29  
    7.30  /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
    7.31  /**
    7.32 @@ -2286,6 +2288,7 @@ static int copy_info(struct info_str *in
    7.33  #define off_t int
    7.34  #endif
    7.35  
    7.36 +#if 0 /* XEN */
    7.37  static int mptscsih_host_info(MPT_ADAPTER *ioc, char *pbuf, off_t offset, int len)
    7.38  {
    7.39  	struct info_str info;
    7.40 @@ -2302,13 +2305,16 @@ static int mptscsih_host_info(MPT_ADAPTE
    7.41  
    7.42  	return ((info.pos > info.offset) ? info.pos - info.offset : 0);
    7.43  }
    7.44 +#endif /* 0 (XEN) */
    7.45  
    7.46  #ifndef MPTSCSIH_DBG_TIMEOUT
    7.47 +#if 0 /* XEN */
    7.48  static int mptscsih_user_command(MPT_ADAPTER *ioc, char *pbuf, int len)
    7.49  {
    7.50  	/* Not yet implemented */
    7.51  	return len;
    7.52  }
    7.53 +#endif /* 0 (XEN) */
    7.54  #else
    7.55  #define is_digit(c)	((c) >= '0' && (c) <= '9')
    7.56  #define digit_to_bin(c)	((c) - '0')
     8.1 --- a/xen/drivers/net/e100/e100_main.c	Mon Apr 05 13:16:43 2004 +0000
     8.2 +++ b/xen/drivers/net/e100/e100_main.c	Mon Apr 05 15:50:49 2004 +0000
     8.3 @@ -192,9 +192,9 @@ struct notifier_block e100_notifier_rebo
     8.4          MODULE_PARM_DESC(X, S);
     8.5  
     8.6  /* ====================================================================== */
     8.7 +#if 0
     8.8  static u8 e100_D101M_checksum(struct e100_private *, struct sk_buff *);
     8.9  static u8 e100_D102_check_checksum(rfd_t *);
    8.10 -#if 0
    8.11  static int e100_ioctl(struct net_device *, struct ifreq *, int);
    8.12  #endif
    8.13  static int e100_open(struct net_device *);
    8.14 @@ -243,7 +243,7 @@ static void e100_set_bool_option(struct 
    8.15  				 char *);
    8.16  unsigned char e100_wait_exec_cmplx(struct e100_private *, u32, u8, u8);
    8.17  void e100_exec_cmplx(struct e100_private *, u32, u8);
    8.18 -static unsigned char e100_asf_enabled(struct e100_private *bdp);
    8.19 +/*static unsigned char e100_asf_enabled(struct e100_private *bdp);*/
    8.20  
    8.21  /**
    8.22   * e100_get_rx_struct - retrieve cell to hold skb buff from the pool
    8.23 @@ -2941,6 +2941,7 @@ e100_rd_eaddr(struct e100_private *bdp)
    8.24  }
    8.25  
    8.26  /* Check the D102 RFD flags to see if the checksum passed */
    8.27 +#if 0
    8.28  static unsigned char
    8.29  e100_D102_check_checksum(rfd_t *rfd)
    8.30  {
    8.31 @@ -2955,6 +2956,7 @@ e100_D102_check_checksum(rfd_t *rfd)
    8.32  	}
    8.33  	return CHECKSUM_NONE;
    8.34  }
    8.35 +#endif /* 0 */
    8.36  
    8.37  /**
    8.38   * e100_D101M_checksum
    8.39 @@ -2966,6 +2968,7 @@ e100_D102_check_checksum(rfd_t *rfd)
    8.40   * in case the packet is ethernet II and the protocol is IP, all is need is to
    8.41   * assign this value to skb->csum.
    8.42   */
    8.43 +#if 0
    8.44  static unsigned char
    8.45  e100_D101M_checksum(struct e100_private *bdp, struct sk_buff *skb)
    8.46  {
    8.47 @@ -2978,6 +2981,7 @@ e100_D101M_checksum(struct e100_private 
    8.48  	}
    8.49  	return CHECKSUM_NONE;
    8.50  }
    8.51 +#endif /* 0 */
    8.52  
    8.53  /***************************************************************************/
    8.54  /***************************************************************************/
    8.55 @@ -4211,7 +4215,6 @@ e100_resume(struct pci_dev *pcid)
    8.56  
    8.57  	return 0;
    8.58  }
    8.59 -#endif /* CONFIG_PM */
    8.60  
    8.61  /**
    8.62   * e100_asf_enabled - checks if ASF is configured on the current adaper
    8.63 @@ -4237,6 +4240,7 @@ e100_asf_enabled(struct e100_private *bd
    8.64  	}
    8.65  	return false;
    8.66  }
    8.67 +#endif /* CONFIG_PM */
    8.68  
    8.69  #ifdef E100_CU_DEBUG
    8.70  unsigned char
     9.1 --- a/xen/drivers/net/tg3.c	Mon Apr 05 13:16:43 2004 +0000
     9.2 +++ b/xen/drivers/net/tg3.c	Mon Apr 05 15:50:49 2004 +0000
     9.3 @@ -5943,6 +5943,7 @@ do {	p = orig_p + (reg);	\
     9.4  
     9.5  #endif /* ETHTOOL */
     9.6  
     9.7 +#if 0
     9.8  static int tg3_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
     9.9  {
    9.10    	struct tg3 *tp = dev->priv;
    9.11 @@ -6091,6 +6092,7 @@ static int tg3_nway_reset(struct net_dev
    9.12    
    9.13  	return r;
    9.14  }
    9.15 +#endif /* 0 */
    9.16    
    9.17  #ifdef ETHTOOL
    9.18  
    9.19 @@ -6178,6 +6180,7 @@ static int tg3_set_pauseparam(struct net
    9.20    
    9.21  #endif /* ETHTOOL */
    9.22  
    9.23 +#if 0
    9.24  static u32 tg3_get_rx_csum(struct net_device *dev)
    9.25  {
    9.26  	struct tg3 *tp = dev->priv;
    9.27 @@ -6221,7 +6224,8 @@ static int tg3_set_tx_csum(struct net_de
    9.28  
    9.29  	return 0;
    9.30  }
    9.31 -  
    9.32 +#endif /* 0 */
    9.33 +
    9.34  static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
    9.35  {
    9.36  	struct mii_ioctl_data *data = (struct mii_ioctl_data *)&ifr->ifr_data;
    10.1 --- a/xen/drivers/pci/pci.c	Mon Apr 05 13:16:43 2004 +0000
    10.2 +++ b/xen/drivers/pci/pci.c	Mon Apr 05 15:50:49 2004 +0000
    10.3 @@ -619,6 +619,7 @@ pci_match_device(const struct pci_device
    10.4  	return NULL;
    10.5  }
    10.6  
    10.7 +#ifndef NO_DEVICES_IN_XEN
    10.8  static int
    10.9  pci_announce_device(struct pci_driver *drv, struct pci_dev *dev)
   10.10  {
   10.11 @@ -643,6 +644,7 @@ pci_announce_device(struct pci_driver *d
   10.12  out:
   10.13  	return ret;
   10.14  }
   10.15 +#endif /* !NO_DEVICES_IN_XEN */
   10.16  
   10.17  /**
   10.18   * pci_register_driver - register a new pci driver
    11.1 --- a/xen/drivers/scsi/BusLogic.c	Mon Apr 05 13:16:43 2004 +0000
    11.2 +++ b/xen/drivers/scsi/BusLogic.c	Mon Apr 05 15:50:49 2004 +0000
    11.3 @@ -4440,6 +4440,7 @@ static void BusLogic_Message(BusLogic_Me
    11.4  }
    11.5  
    11.6  
    11.7 +#if 0 /* XEN */
    11.8  /*
    11.9    BusLogic_ParseKeyword parses an individual option keyword.  It returns true
   11.10    and updates the pointer if the keyword is recognized and false otherwise.
   11.11 @@ -4462,7 +4463,6 @@ static boolean BusLogic_ParseKeyword(cha
   11.12    return true;
   11.13  }
   11.14  
   11.15 -#if 0 /* XEN */
   11.16  /*
   11.17    BusLogic_ParseDriverOptions handles processing of BusLogic Driver Options
   11.18    specifications.
    12.1 --- a/xen/drivers/scsi/BusLogic.h	Mon Apr 05 13:16:43 2004 +0000
    12.2 +++ b/xen/drivers/scsi/BusLogic.h	Mon Apr 05 15:50:49 2004 +0000
    12.3 @@ -1801,8 +1801,8 @@ static void BusLogic_ReleaseResources(Bu
    12.4  static boolean BusLogic_TargetDeviceInquiry(BusLogic_HostAdapter_T *) __init;
    12.5  static void BusLogic_InitializeHostStructure(BusLogic_HostAdapter_T *,
    12.6  					     SCSI_Host_T *) __init;
    12.7 +#if 0 /* XEN */
    12.8  static boolean BusLogic_ParseKeyword(char **, char *) __init;
    12.9 -#if 0 /* XEN */
   12.10  static int BusLogic_ParseDriverOptions(char *) __init;
   12.11  static int BusLogic_Setup(char *) __init;
   12.12  #endif
    13.1 --- a/xen/drivers/scsi/aacraid/linit.c	Mon Apr 05 13:16:43 2004 +0000
    13.2 +++ b/xen/drivers/scsi/aacraid/linit.c	Mon Apr 05 15:50:49 2004 +0000
    13.3 @@ -645,6 +645,7 @@ static int aac_ioctl(Scsi_Device * scsi_
    13.4  	return aac_do_ioctl(dev, cmd, arg);
    13.5  }
    13.6  
    13.7 +#if 0 /* XEN */
    13.8  /**
    13.9   *	aac_cfg_open		-	open a configuration file
   13.10   *	@inode: inode being opened
   13.11 @@ -698,6 +699,7 @@ static int aac_cfg_ioctl(struct inode * 
   13.12  	struct aac_dev *dev = aac_devices[MINOR(inode->i_rdev)];
   13.13  	return aac_do_ioctl(dev, cmd, (void *)arg);
   13.14  }
   13.15 +#endif /* 0 (XEN) */
   13.16  
   13.17  /*
   13.18   *	To use the low level SCSI driver support using the linux kernel loadable 
    14.1 --- a/xen/drivers/scsi/aic7xxx/aic79xx_osm.c	Mon Apr 05 13:16:43 2004 +0000
    14.2 +++ b/xen/drivers/scsi/aic7xxx/aic79xx_osm.c	Mon Apr 05 15:50:49 2004 +0000
    14.3 @@ -403,7 +403,7 @@ static int ahd_linux_next_unit(void);
    14.4  static void ahd_runq_tasklet(unsigned long data);
    14.5  /* SAE: .... */
    14.6  struct notifier_block;
    14.7 -static int ahd_linux_halt(struct notifier_block *nb, u_long event, void *buf);
    14.8 +/*static int ahd_linux_halt(struct notifier_block *nb, u_long event, void *buf);*/
    14.9  
   14.10  static __inline struct ahd_linux_device*
   14.11  		     ahd_linux_get_device(struct ahd_softc *ahd, u_int channel,
   14.12 @@ -613,7 +613,7 @@ ahd_linux_map_seg(struct ahd_softc *ahd,
   14.13  			consumed++;
   14.14  			next_sg = sg + 1;
   14.15  			next_sg->addr = 0;
   14.16 -			next_len = 0x100000000 - (addr & 0xFFFFFFFF);
   14.17 +			next_len = (uint32_t)((-addr) & 0xFFFFFFFF);
   14.18  			len -= next_len;
   14.19  			next_len |= ((addr >> 8) + 0x1000000) & 0x7F000000;
   14.20  			next_sg->len = ahd_htole32(next_len);
   14.21 @@ -655,7 +655,6 @@ ahd_runq_tasklet(unsigned long data)
   14.22  static struct notifier_block ahd_linux_notifier = {
   14.23  	ahd_linux_halt, NULL, 0
   14.24  };
   14.25 -*/
   14.26  
   14.27  static int ahd_linux_halt(struct notifier_block *nb, u_long event, void *buf)
   14.28  {
   14.29 @@ -668,6 +667,7 @@ static int ahd_linux_halt(struct notifie
   14.30  	}
   14.31  	return (NOTIFY_OK);
   14.32  }
   14.33 +*/
   14.34  
   14.35  /******************************** Macros **************************************/
   14.36  #define BUILD_SCSIID(ahd, cmd)						\
    15.1 --- a/xen/drivers/scsi/aic7xxx/aic79xx_osm_pci.c	Mon Apr 05 13:16:43 2004 +0000
    15.2 +++ b/xen/drivers/scsi/aic7xxx/aic79xx_osm_pci.c	Mon Apr 05 15:50:49 2004 +0000
    15.3 @@ -159,12 +159,12 @@ ahd_linux_pci_dev_probe(struct pci_dev *
    15.4  		uint64_t memsize;
    15.5  
    15.6  		memsize = ahd_linux_get_memsize();
    15.7 -		if (memsize >= 0x8000000000
    15.8 +		if (memsize >= 0x8000000000ULL
    15.9  	 	 && ahd_pci_set_dma_mask(pdev, 0xFFFFFFFFFFFFFFFFULL) == 0) {
   15.10  			ahd->flags |= AHD_64BIT_ADDRESSING;
   15.11  			ahd->platform_data->hw_dma_mask =
   15.12  			    (bus_addr_t)(0xFFFFFFFFFFFFFFFFULL&(bus_addr_t)~0);
   15.13 -		} else if (memsize > 0x80000000
   15.14 +		} else if (memsize > 0x80000000ULL
   15.15  			&& ahd_pci_set_dma_mask(pdev, 0x7FFFFFFFFFULL) == 0) {
   15.16  			ahd->flags |= AHD_39BIT_ADDRESSING;
   15.17  			ahd->platform_data->hw_dma_mask =
    16.1 --- a/xen/drivers/scsi/aic7xxx/aic7xxx_osm.c	Mon Apr 05 13:16:43 2004 +0000
    16.2 +++ b/xen/drivers/scsi/aic7xxx/aic7xxx_osm.c	Mon Apr 05 15:50:49 2004 +0000
    16.3 @@ -447,9 +447,11 @@ static void ahc_linux_handle_scsi_status
    16.4  					 struct scb *);
    16.5  static void ahc_linux_filter_command(struct ahc_softc*, Scsi_Cmnd*,
    16.6  				     struct scb*);
    16.7 -//static void ahc_linux_sem_timeout(u_long arg);
    16.8 +#if 0
    16.9 +static void ahc_linux_sem_timeout(u_long arg);
   16.10  static void ahc_linux_freeze_sim_queue(struct ahc_softc *ahc);
   16.11  static void ahc_linux_release_sim_queue(u_long arg);
   16.12 +#endif
   16.13  static void ahc_linux_dev_timed_unfreeze(u_long arg);
   16.14  static int  ahc_linux_queue_recovery_cmd(Scsi_Cmnd *cmd, scb_flag flag);
   16.15  static void ahc_linux_initialize_scsi_bus(struct ahc_softc *ahc);
   16.16 @@ -473,7 +475,9 @@ static void ahc_linux_run_device_queue(s
   16.17  static void ahc_linux_setup_tag_info(char *p, char *end);
   16.18  static int ahc_linux_next_unit(void);
   16.19  static void ahc_runq_tasklet(unsigned long data);
   16.20 +#if 0
   16.21  static int ahc_linux_halt(struct notifier_block *nb, u_long event, void *buf);
   16.22 +#endif
   16.23  
   16.24  static __inline struct ahc_linux_device*
   16.25  		     ahc_linux_get_device(struct ahc_softc *ahc, u_int channel,
   16.26 @@ -683,7 +687,7 @@ ahc_linux_map_seg(struct ahc_softc *ahc,
   16.27  			consumed++;
   16.28  			next_sg = sg + 1;
   16.29  			next_sg->addr = 0;
   16.30 -			next_len = 0x100000000 - (addr & 0xFFFFFFFF);
   16.31 +			next_len = (uint32_t)((-addr) & 0xFFFFFFFF);
   16.32  			len -= next_len;
   16.33  			next_len |= ((addr >> 8) + 0x1000000) & 0x7F000000;
   16.34  			next_sg->len = ahc_htole32(next_len);
   16.35 @@ -725,7 +729,6 @@ ahc_runq_tasklet(unsigned long data)
   16.36  static struct notifier_block ahc_linux_notifier = {
   16.37  	ahc_linux_halt, NULL, 0
   16.38  };
   16.39 -#endif
   16.40  
   16.41  static int ahc_linux_halt(struct notifier_block *nb, u_long event, void *buf)
   16.42  {
   16.43 @@ -738,6 +741,7 @@ static int ahc_linux_halt(struct notifie
   16.44  	}
   16.45  	return (NOTIFY_OK);
   16.46  }
   16.47 +#endif
   16.48  
   16.49  /******************************** Macros **************************************/
   16.50  #define BUILD_SCSIID(ahc, cmd)						\
   16.51 @@ -2498,7 +2502,6 @@ ahc_linux_sem_timeout(u_long arg)
   16.52  	sem = (struct semaphore *)arg;
   16.53  	up(sem);
   16.54  }
   16.55 -#endif
   16.56  
   16.57  static void
   16.58  ahc_linux_freeze_sim_queue(struct ahc_softc *ahc)
   16.59 @@ -2539,6 +2542,7 @@ ahc_linux_release_sim_queue(u_long arg)
   16.60  #endif
   16.61  	}
   16.62  }
   16.63 +#endif /* 0 */
   16.64  
   16.65  static void
   16.66  ahc_linux_dev_timed_unfreeze(u_long arg)
    17.1 --- a/xen/drivers/scsi/megaraid.c	Mon Apr 05 13:16:43 2004 +0000
    17.2 +++ b/xen/drivers/scsi/megaraid.c	Mon Apr 05 15:50:49 2004 +0000
    17.3 @@ -4549,6 +4549,7 @@ mega_partsize(Disk * disk, kdev_t dev, i
    17.4  }
    17.5  
    17.6  
    17.7 +#if 0 /* XEN */
    17.8  /*
    17.9   * This routine will be called when the use has done a forced shutdown on the
   17.10   * system. Flush the Adapter cache, that's the most we can do.
   17.11 @@ -4587,6 +4588,7 @@ static int megaraid_reboot_notify (struc
   17.12  	}
   17.13  	return NOTIFY_DONE;
   17.14  }
   17.15 +#endif /* 0 (XEN) */
   17.16  
   17.17  static int mega_init_scb (mega_host_config * megacfg)
   17.18  {
   17.19 @@ -4714,6 +4716,7 @@ static void enq_scb_freelist (mega_host_
   17.20  	}
   17.21  }
   17.22  
   17.23 +#if 0 /* XEN */
   17.24  /*
   17.25   * Routines for the character/ioctl interface to the driver
   17.26   */
   17.27 @@ -4742,6 +4745,7 @@ static int megadev_ioctl_entry (struct i
   17.28  	return ret;
   17.29  
   17.30  }
   17.31 +#endif /* 0 (XEN) */
   17.32  
   17.33  static int megadev_ioctl (struct inode *inode, struct file *filep,
   17.34  	       unsigned int cmd, unsigned long arg)
   17.35 @@ -5272,6 +5276,7 @@ megadev_doioctl (mega_host_config * mega
   17.36  	return scb;
   17.37  }
   17.38  
   17.39 +#if 0
   17.40  static int
   17.41  megadev_close (struct inode *inode, struct file *filep)
   17.42  {
   17.43 @@ -5280,6 +5285,7 @@ megadev_close (struct inode *inode, stru
   17.44  #endif
   17.45  	return 0;
   17.46  }
   17.47 +#endif /* 0 */
   17.48  
   17.49  
   17.50  static int
    18.1 --- a/xen/drivers/scsi/megaraid.h	Mon Apr 05 13:16:43 2004 +0000
    18.2 +++ b/xen/drivers/scsi/megaraid.h	Mon Apr 05 15:50:49 2004 +0000
    18.3 @@ -998,21 +998,27 @@ static void mega_Convert8ldTo40ld (mega_
    18.4  				   mega_Enquiry3 * enquiry3,
    18.5  				   megaRaidProductInfo * productInfo);
    18.6  
    18.7 +#if 0
    18.8  static int megaraid_reboot_notify (struct notifier_block *,
    18.9  				   unsigned long, void *);
   18.10 +#endif
   18.11  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)  
   18.12  static mega_scb *mega_ioctl (mega_host_config * megaCfg, Scsi_Cmnd * SCpnt);
   18.13  static void mega_build_kernel_sg (char *barea, ulong xfersize, mega_scb * pScb,
   18.14  			   mega_ioctl_mbox * mbox);
   18.15  #endif
   18.16  
   18.17 +#if 0
   18.18  static int megadev_open (struct inode *, struct file *);
   18.19  static int megadev_ioctl_entry (struct inode *, struct file *,
   18.20  				unsigned int, unsigned long);
   18.21 +#endif
   18.22  static int megadev_ioctl (struct inode *, struct file *,
   18.23  			  unsigned int, unsigned long);
   18.24  static mega_scb *megadev_doioctl (mega_host_config *, Scsi_Cmnd *);
   18.25 +#if 0
   18.26  static int megadev_close (struct inode *, struct file *);
   18.27 +#endif
   18.28  static void megadev_ioctl_done (Scsi_Cmnd *);
   18.29  static int mega_init_scb (mega_host_config *);
   18.30  static void enq_scb_freelist (mega_host_config *, mega_scb *,
    19.1 --- a/xen/drivers/scsi/sym53c8xx_2/sym_glue.c	Mon Apr 05 13:16:43 2004 +0000
    19.2 +++ b/xen/drivers/scsi/sym53c8xx_2/sym_glue.c	Mon Apr 05 15:50:49 2004 +0000
    19.3 @@ -1106,7 +1106,7 @@ static void sym_eh_done(Scsi_Cmnd *cmd) 
    19.4  /*
    19.5   *  Some timeout handler to avoid waiting too long.
    19.6   */
    19.7 -static void sym_eh_timeout(u_long p) { __sym_eh_done((Scsi_Cmnd *)p, 1); }
    19.8 +/*static void sym_eh_timeout(u_long p) { __sym_eh_done((Scsi_Cmnd *)p, 1); }*/
    19.9  
   19.10  /*
   19.11   *  Generic method for our eh processing.