ia64/xen-unstable

changeset 3353:b7f02043001c

bitkeeper revision 1.1159.1.517 (41d417bddbJQbGTNZdimylJpzcXpqQ)

build fixes
author smh22@tempest.cl.cam.ac.uk
date Thu Dec 30 14:59:09 2004 +0000 (2004-12-30)
parents 789b10e9b58b
children d1e0d9a8fde0
files linux-2.4.28-xen-sparse/arch/xen/kernel/setup.c linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c
line diff
     1.1 --- a/linux-2.4.28-xen-sparse/arch/xen/kernel/setup.c	Thu Dec 30 14:29:43 2004 +0000
     1.2 +++ b/linux-2.4.28-xen-sparse/arch/xen/kernel/setup.c	Thu Dec 30 14:59:09 2004 +0000
     1.3 @@ -62,8 +62,8 @@ shared_info_t *HYPERVISOR_shared_info = 
     1.4  
     1.5  unsigned long *phys_to_machine_mapping, *pfn_to_mfn_frame_list;
     1.6  
     1.7 -multicall_entry_t multicall_list[8];
     1.8 -int nr_multicall_ents = 0;
     1.9 +DEFINE_PER_CPU(multicall_entry_t, multicall_list[8]);
    1.10 +DEFINE_PER_CPU(int, nr_multicall_ents);
    1.11  
    1.12  /*
    1.13   * Machine setup..
     2.1 --- a/linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c	Thu Dec 30 14:29:43 2004 +0000
     2.2 +++ b/linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c	Thu Dec 30 14:59:09 2004 +0000
     2.3 @@ -62,6 +62,7 @@ static void vbd_update(void){};
     2.4  #define BLKIF_STATE_DISCONNECTED 1
     2.5  #define BLKIF_STATE_CONNECTED    2
     2.6  
     2.7 +#ifdef VERBOSE
     2.8  static char *blkif_state_name[] = {
     2.9      [BLKIF_STATE_CLOSED]       = "closed",
    2.10      [BLKIF_STATE_DISCONNECTED] = "disconnected",
    2.11 @@ -74,6 +75,7 @@ static char * blkif_status_name[] = {
    2.12      [BLKIF_INTERFACE_STATUS_CONNECTED]    = "connected",
    2.13      [BLKIF_INTERFACE_STATUS_CHANGED]      = "changed",
    2.14  };
    2.15 +#endif
    2.16  
    2.17  #define WPRINTK(fmt, args...) printk(KERN_WARNING "xen_blk: " fmt, ##args)
    2.18