# HG changeset patch
# User akw27@xxxxxxxxxxxxxxxxxxxxxx
# Node ID f3f48305925034ce4a023bd0913ed4cf1866fccb
# Parent d25da0ddd9d51cfd4f4f487a46706290546563f6
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@xxxxxxxxxxxx
diff -r d25da0ddd9d5 -r f3f483059250
linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c Thu Aug 4 13:13:02 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c Thu Aug 4 14:32:21 2005
@@ -137,7 +137,7 @@
blkif_control_probe_send(&req, &rsp,
(unsigned long)(virt_to_machine(buf)));
#else
- req.frame_and_sects[0] = blkif_fas(virt_to_machine(buf), 0,
((PAGE_SIZE/512)-1);
+ req.frame_and_sects[0] = blkif_fas(virt_to_machine(buf), 0,
(PAGE_SIZE/512)-1);
blkif_control_send(&req, &rsp);
#endif
diff -r d25da0ddd9d5 -r f3f483059250 xen/include/public/io/blkif.h
--- a/xen/include/public/io/blkif.h Thu Aug 4 13:13:02 2005
+++ b/xen/include/public/io/blkif.h Thu Aug 4 14:32:21 2005
@@ -47,7 +47,7 @@
unsigned long frame_and_sects[BLKIF_MAX_SEGMENTS_PER_REQUEST];
} blkif_request_t;
-#define blkif_fas(_addr, _fs, _ls) ((addr)|((_fs)<<5)|(_ls))
+#define blkif_fas(_addr, _fs, _ls) ((_addr)|((_fs)<<5)|(_ls))
#define blkif_first_sect(_fas) (((_fas)>>5)&31)
#define blkif_last_sect(_fas) ((_fas)&31)
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|