diff options
author | H. Peter Anvin <hpa@zytor.com> | 2009-08-25 18:40:29 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-08-25 18:40:29 -0400 |
commit | e8a2eb47e6ca03d4a4f98f0beef73720c5dddc0c (patch) | |
tree | 31c4d7718111abddfaaa8d3fb14ab4a7e2554cd9 /drivers/misc/cb710/sgbuf2.c | |
parent | 8b5a10fc6fd02289ea03480f93382b1a99006142 (diff) | |
parent | c62e43202e7cf50ca24bce58b255df7bf5de69d0 (diff) |
Merge commit 'origin/x86/urgent' into x86/asm
Diffstat (limited to 'drivers/misc/cb710/sgbuf2.c')
-rw-r--r-- | drivers/misc/cb710/sgbuf2.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/misc/cb710/sgbuf2.c b/drivers/misc/cb710/sgbuf2.c index d38a7acdb6ec..d019746551f3 100644 --- a/drivers/misc/cb710/sgbuf2.c +++ b/drivers/misc/cb710/sgbuf2.c | |||
@@ -114,7 +114,6 @@ static void sg_dwiter_write_slow(struct sg_mapping_iter *miter, uint32_t data) | |||
114 | if (!left) | 114 | if (!left) |
115 | return; | 115 | return; |
116 | addr += len; | 116 | addr += len; |
117 | flush_kernel_dcache_page(miter->page); | ||
118 | } while (sg_dwiter_next(miter)); | 117 | } while (sg_dwiter_next(miter)); |
119 | } | 118 | } |
120 | 119 | ||
@@ -142,9 +141,6 @@ void cb710_sg_dwiter_write_next_block(struct sg_mapping_iter *miter, uint32_t da | |||
142 | return; | 141 | return; |
143 | } else | 142 | } else |
144 | sg_dwiter_write_slow(miter, data); | 143 | sg_dwiter_write_slow(miter, data); |
145 | |||
146 | if (miter->length == miter->consumed) | ||
147 | flush_kernel_dcache_page(miter->page); | ||
148 | } | 144 | } |
149 | EXPORT_SYMBOL_GPL(cb710_sg_dwiter_write_next_block); | 145 | EXPORT_SYMBOL_GPL(cb710_sg_dwiter_write_next_block); |
150 | 146 | ||