lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'md-raid6-accel' into ioat3.2

Browse Source 
Conflicts:
	include/linux/dmaengine.h
This commit is contained in:
Dan Williams
2009-09-08 17:42:29 -07:00
parent 4b652f0db3 07a3b417dc
commit f9dd213437
23 changed files with 2528 additions and 927 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/include/asm/hardware/iop3xx-adma.h
View File

@@ -756,13 +756,14 @@ static inline void iop_desc_set_block_fill_val(struct iop_adma_desc_slot *desc,
hw_desc->src[0] = val;
}
static inline int iop_desc_get_zero_result(struct iop_adma_desc_slot *desc)
static inline enum sum_check_flags
iop_desc_get_zero_result(struct iop_adma_desc_slot *desc)
{
struct iop3xx_desc_aau *hw_desc = desc->hw_desc;
struct iop3xx_aau_desc_ctrl desc_ctrl = hw_desc->desc_ctrl_field;
iop_paranoia(!(desc_ctrl.tx_complete && desc_ctrl.zero_result_en));
return desc_ctrl.zero_result_err;
return desc_ctrl.zero_result_err << SUM_CHECK_P;
}
static inline void iop_chan_append(struct iop_adma_chan *chan)