diff options
author | rn@wyvis.research.intel-research.net <rn@wyvis.research.intel-research.net> | 2003-03-14 15:58:24 +0000 |
---|---|---|
committer | rn@wyvis.research.intel-research.net <rn@wyvis.research.intel-research.net> | 2003-03-14 15:58:24 +0000 |
commit | 0ec37682a14624a0f5097be9ea1fec77453dc8c1 (patch) | |
tree | bab97e72ada703fd5a1d9c774d3d0451d6ceade7 /xen/drivers/block/xen_block.c | |
parent | d9812e47d9c20b15dbb920cc451eff1c7b88e81c (diff) | |
parent | f9e443afb85c3843c8abd0760ee4a77b0aceeeed (diff) | |
download | xen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.tar.gz xen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.tar.bz2 xen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.zip |
bitkeeper revision 1.126 (3e71fc20anCOs2KFyD3-AMyHjdJQfg)
resolve merge conflicts manually
Diffstat (limited to 'xen/drivers/block/xen_block.c')
-rw-r--r-- | xen/drivers/block/xen_block.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/xen/drivers/block/xen_block.c b/xen/drivers/block/xen_block.c index bf9cfd7431..a49817d46f 100644 --- a/xen/drivers/block/xen_block.c +++ b/xen/drivers/block/xen_block.c @@ -17,10 +17,8 @@ #include <xeno/keyhandler.h> #include <xeno/interrupt.h> #include <xeno/segment.h> -#include <asm/domain_page.h> /* TEST_READ_VALIDITY */ -#if 1 -#define TEST_READ_VALIDITY +#if 0 #define DPRINTK(_f, _a...) printk( _f , ## _a ) #else #define DPRINTK(_f, _a...) ((void)0) @@ -206,16 +204,6 @@ static void end_block_io_op(struct buffer_head *bh, int uptodate) DPRINTK("Buffer not up-to-date at end of operation\n"); pending_req->status = 1; } -#ifdef TEST_READ_VALIDITY - else if ( pending_req->operation == READ ) - { - unsigned long *buff = map_domain_mem(virt_to_phys(bh->b_data)); - if ( (buff[ 0] == 0xdeadbeef) && - (buff[127] == 0xdeadbeef) ) - printk("An unmodified buffer at sector %ld\n", bh->b_rsector); - unmap_domain_mem(buff); - } -#endif unlock_buffer(pending_req->domain, virt_to_phys(bh->b_data), @@ -616,12 +604,6 @@ static void dispatch_rw_block_io(struct task_struct *p, int index) } else { -#ifdef TEST_READ_VALIDITY - unsigned long *buff = map_domain_mem(phys_seg[i].buffer); - buff[ 0] = 0xdeadbeef; - buff[127] = 0xdeadbeef; - unmap_domain_mem(buff); -#endif bh->b_state = (1 << BH_Mapped) | (1 << BH_Read); } |