ia64/xen-unstable

changeset 308:6bfee34e9107

bitkeeper revision 1.130 (3e721d9535b0bKNHKQBc1naAHn1DAA)

sd.c, scsi.c, schedule.c, rwlock.c:
Fix compiler warnings.
author kaf24@scramble.cl.cam.ac.uk
date Fri Mar 14 18:21:09 2003 +0000 (2003-03-14)
parents ead63ee9164e
children 75d5c2fc3073
files xen/arch/i386/rwlock.c xen/common/schedule.c xen/drivers/scsi/scsi.c xen/drivers/scsi/sd.c
line diff
     1.1 --- a/xen/arch/i386/rwlock.c	Fri Mar 14 16:57:54 2003 +0000
     1.2 +++ b/xen/arch/i386/rwlock.c	Fri Mar 14 18:21:09 2003 +0000
     1.3 @@ -3,31 +3,26 @@
     1.4  
     1.5  #if defined(CONFIG_SMP)
     1.6  asm(
     1.7 -"
     1.8 -.align  4
     1.9 -.globl  __write_lock_failed
    1.10 -__write_lock_failed:
    1.11 -        " LOCK "addl    $" RW_LOCK_BIAS_STR ",(%eax)
    1.12 -1:      rep; nop
    1.13 -        cmpl    $" RW_LOCK_BIAS_STR ",(%eax)
    1.14 -        jne     1b
    1.15 -
    1.16 -        " LOCK "subl    $" RW_LOCK_BIAS_STR ",(%eax)
    1.17 -        jnz     __write_lock_failed
    1.18 -        ret
    1.19 +".align  4\n"
    1.20 +".globl  __write_lock_failed\n"
    1.21 +"__write_lock_failed:\n"
    1.22 +"        " LOCK "addl    $" RW_LOCK_BIAS_STR ",(%eax)\n"
    1.23 +"1:      rep; nop\n"
    1.24 +"        cmpl    $" RW_LOCK_BIAS_STR ",(%eax)\n"
    1.25 +"        jne     1b\n"
    1.26 +"        " LOCK "subl    $" RW_LOCK_BIAS_STR ",(%eax)\n"
    1.27 +"        jnz     __write_lock_failed\n"
    1.28 +"        ret\n"
    1.29  
    1.30 -
    1.31 -.align  4
    1.32 -.globl  __read_lock_failed
    1.33 -__read_lock_failed:
    1.34 -        lock ; incl     (%eax)
    1.35 -1:      rep; nop
    1.36 -        cmpl    $1,(%eax)
    1.37 -        js      1b
    1.38 -
    1.39 -        lock ; decl     (%eax)
    1.40 -        js      __read_lock_failed
    1.41 -        ret
    1.42 -"
    1.43 +".align  4\n"
    1.44 +".globl  __read_lock_failed\n"
    1.45 +"__read_lock_failed:\n"
    1.46 +"        lock ; incl     (%eax)\n"
    1.47 +"1:      rep; nop\n"
    1.48 +"        cmpl    $1,(%eax)\n"
    1.49 +"        js      1b\n"
    1.50 +"        lock ; decl     (%eax)\n"
    1.51 +"        js      __read_lock_failed\n"
    1.52 +"        ret\n"
    1.53  );
    1.54  #endif
     2.1 --- a/xen/common/schedule.c	Fri Mar 14 16:57:54 2003 +0000
     2.2 +++ b/xen/common/schedule.c	Fri Mar 14 18:21:09 2003 +0000
     2.3 @@ -593,7 +593,7 @@ static void dump_rqueue(struct list_head
     2.4              (unsigned long) queue->next, (unsigned long) queue->prev);
     2.5      list_for_each (list, queue) {
     2.6          p = list_entry(list, struct task_struct, run_list);
     2.7 -        printk("%3d: %3d has=%c mcua=0x%04X ev=0x%08X av=0x%08X c=0x%X%08X\n",
     2.8 +        printk("%3d: %3d has=%c mcua=0x%04lX ev=0x%08X av=0x%08X c=0x%X%08X\n",
     2.9                 loop++, p->domain,
    2.10                 p->has_cpu ? 'T':'F',
    2.11                 p->mcu_advance, p->evt, p->avt,
     3.1 --- a/xen/drivers/scsi/scsi.c	Fri Mar 14 16:57:54 2003 +0000
     3.2 +++ b/xen/drivers/scsi/scsi.c	Fri Mar 14 18:21:09 2003 +0000
     3.3 @@ -855,7 +855,6 @@ void scsi_wait_req (Scsi_Request * SRpnt
     3.4              *(int *)(SRpnt->sr_request.waiting) = 0; 
     3.5          } 
     3.6      }
     3.7 -printk("*");
     3.8  #endif
     3.9  
    3.10  
     4.1 --- a/xen/drivers/scsi/sd.c	Fri Mar 14 16:57:54 2003 +0000
     4.2 +++ b/xen/drivers/scsi/sd.c	Fri Mar 14 18:21:09 2003 +0000
     4.3 @@ -1333,7 +1333,7 @@ void scsi_probe_devices(xen_disk_info_t 
     4.4          xen_xdi->disks[xen_xdi->count].capacity = capacity; 
     4.5          xen_xdi->count++; 
     4.6                  
     4.7 -        printk("Disk %d: SCSI-XENO capacity %dkB (%dMB)\n",
     4.8 +        printk("Disk %d: SCSI-XENO capacity %ldkB (%ldMB)\n",
     4.9                 xen_xdi->count, capacity>>1, capacity>>11);
    4.10      }
    4.11