diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-18 12:32:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-18 12:32:44 -0500 |
| commit | ea88eeac0cb8328014b53d80ca631e8dc0dc18dc (patch) | |
| tree | de605c1d0e7ab1e342eedad47c56061b65a6b790 /include/linux | |
| parent | 848b81415c42ff3dc9a4204749087b015c37ef66 (diff) | |
| parent | a9add5d92b64ea57fb4c3b557c3891cdeb15fa0c (diff) | |
Merge tag 'md-3.8' of git://neil.brown.name/md
Pull md update from Neil Brown:
"Mostly just little fixes. Probably biggest part is AVX accelerated
RAID6 calculations."
* tag 'md-3.8' of git://neil.brown.name/md:
md/raid5: add blktrace calls
md/raid5: use async_tx_quiesce() instead of open-coding it.
md: Use ->curr_resync as last completed request when cleanly aborting resync.
lib/raid6: build proper files on corresponding arch
lib/raid6: Add AVX2 optimized gen_syndrome functions
lib/raid6: Add AVX2 optimized recovery functions
md: Update checkpoint of resync/recovery based on time.
md:Add place to update ->recovery_cp.
md.c: re-indent various 'switch' statements.
md: close race between removing and adding a device.
md: removed unused variable in calc_sb_1_csm.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/raid/pq.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/raid/pq.h b/include/linux/raid/pq.h index 640c69ceec9..8dfaa2ce2e9 100644 --- a/include/linux/raid/pq.h +++ b/include/linux/raid/pq.h | |||
| @@ -98,6 +98,9 @@ extern const struct raid6_calls raid6_altivec1; | |||
| 98 | extern const struct raid6_calls raid6_altivec2; | 98 | extern const struct raid6_calls raid6_altivec2; |
| 99 | extern const struct raid6_calls raid6_altivec4; | 99 | extern const struct raid6_calls raid6_altivec4; |
| 100 | extern const struct raid6_calls raid6_altivec8; | 100 | extern const struct raid6_calls raid6_altivec8; |
| 101 | extern const struct raid6_calls raid6_avx2x1; | ||
| 102 | extern const struct raid6_calls raid6_avx2x2; | ||
| 103 | extern const struct raid6_calls raid6_avx2x4; | ||
| 101 | 104 | ||
| 102 | struct raid6_recov_calls { | 105 | struct raid6_recov_calls { |
| 103 | void (*data2)(int, size_t, int, int, void **); | 106 | void (*data2)(int, size_t, int, int, void **); |
| @@ -109,6 +112,7 @@ struct raid6_recov_calls { | |||
| 109 | 112 | ||
| 110 | extern const struct raid6_recov_calls raid6_recov_intx1; | 113 | extern const struct raid6_recov_calls raid6_recov_intx1; |
| 111 | extern const struct raid6_recov_calls raid6_recov_ssse3; | 114 | extern const struct raid6_recov_calls raid6_recov_ssse3; |
| 115 | extern const struct raid6_recov_calls raid6_recov_avx2; | ||
| 112 | 116 | ||
| 113 | /* Algorithm list */ | 117 | /* Algorithm list */ |
| 114 | extern const struct raid6_calls * const raid6_algos[]; | 118 | extern const struct raid6_calls * const raid6_algos[]; |
