ia64/xen-unstable

changeset 6027:f3f483059250

Fix two syntax errors in frame-and-sect decoding macros.
Both are in the non-grant-tables cases of
cset ae51fa1d32b23066c4342bbeb5f4dc401b82ea37.

Signed-off-by: andrew.warfield@cl.cam.ac.uk
author akw27@arcadians.cl.cam.ac.uk
date Thu Aug 04 14:32:21 2005 +0000 (2005-08-04)
parents d25da0ddd9d5
children 1d240086de52
files linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c xen/include/public/io/blkif.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c	Thu Aug 04 13:13:02 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c	Thu Aug 04 14:32:21 2005 +0000
     1.3 @@ -137,7 +137,7 @@ static vdisk_t *xlvbd_probe(int *ret)
     1.4      blkif_control_probe_send(&req, &rsp,
     1.5                               (unsigned long)(virt_to_machine(buf)));
     1.6  #else
     1.7 -    req.frame_and_sects[0] = blkif_fas(virt_to_machine(buf), 0, ((PAGE_SIZE/512)-1);
     1.8 +    req.frame_and_sects[0] = blkif_fas(virt_to_machine(buf), 0, (PAGE_SIZE/512)-1);
     1.9  
    1.10      blkif_control_send(&req, &rsp);
    1.11  #endif
     2.1 --- a/xen/include/public/io/blkif.h	Thu Aug 04 13:13:02 2005 +0000
     2.2 +++ b/xen/include/public/io/blkif.h	Thu Aug 04 14:32:21 2005 +0000
     2.3 @@ -47,7 +47,7 @@ typedef struct blkif_request {
     2.4      unsigned long  frame_and_sects[BLKIF_MAX_SEGMENTS_PER_REQUEST];
     2.5  } blkif_request_t;
     2.6  
     2.7 -#define blkif_fas(_addr, _fs, _ls) ((addr)|((_fs)<<5)|(_ls))
     2.8 +#define blkif_fas(_addr, _fs, _ls) ((_addr)|((_fs)<<5)|(_ls))
     2.9  #define blkif_first_sect(_fas) (((_fas)>>5)&31)
    2.10  #define blkif_last_sect(_fas)  ((_fas)&31)
    2.11