summaryrefslogtreecommitdiffstats
path: root/lib/raid6
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-04-05 14:56:35 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2018-04-05 14:56:35 -0400
commit672a9c106966f8d418478830975288b8096bb058 (patch)
treee47259d8a96084affaab87b0104b56ac352dc0eb /lib/raid6
parente8403b493fd5180e351ca67eb66406d95dadcd0b (diff)
parent75a24b822d383489badd343cab4cb171d09f93ef (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: kfifo: fix inaccurate comment tools/thermal: tmon: fix for segfault net: Spelling s/stucture/structure/ edd: don't spam log if no EDD information is present Documentation: Fix early-microcode.txt references after file rename tracing: Block comments should align the * on each line treewide: Fix typos in printk GenWQE: Fix a typo in two comments treewide: Align function definition open/close braces
Diffstat (limited to 'lib/raid6')
-rw-r--r--lib/raid6/sse2.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/raid6/sse2.c b/lib/raid6/sse2.c
index 1d2276b007ee..8191e1d0d2fb 100644
--- a/lib/raid6/sse2.c
+++ b/lib/raid6/sse2.c
@@ -91,7 +91,7 @@ static void raid6_sse21_gen_syndrome(int disks, size_t bytes, void **ptrs)
91 91
92static void raid6_sse21_xor_syndrome(int disks, int start, int stop, 92static void raid6_sse21_xor_syndrome(int disks, int start, int stop,
93 size_t bytes, void **ptrs) 93 size_t bytes, void **ptrs)
94 { 94{
95 u8 **dptr = (u8 **)ptrs; 95 u8 **dptr = (u8 **)ptrs;
96 u8 *p, *q; 96 u8 *p, *q;
97 int d, z, z0; 97 int d, z, z0;
@@ -200,9 +200,9 @@ static void raid6_sse22_gen_syndrome(int disks, size_t bytes, void **ptrs)
200 kernel_fpu_end(); 200 kernel_fpu_end();
201} 201}
202 202
203 static void raid6_sse22_xor_syndrome(int disks, int start, int stop, 203static void raid6_sse22_xor_syndrome(int disks, int start, int stop,
204 size_t bytes, void **ptrs) 204 size_t bytes, void **ptrs)
205 { 205{
206 u8 **dptr = (u8 **)ptrs; 206 u8 **dptr = (u8 **)ptrs;
207 u8 *p, *q; 207 u8 *p, *q;
208 int d, z, z0; 208 int d, z, z0;
@@ -265,7 +265,7 @@ static void raid6_sse22_gen_syndrome(int disks, size_t bytes, void **ptrs)
265 265
266 asm volatile("sfence" : : : "memory"); 266 asm volatile("sfence" : : : "memory");
267 kernel_fpu_end(); 267 kernel_fpu_end();
268 } 268}
269 269
270const struct raid6_calls raid6_sse2x2 = { 270const struct raid6_calls raid6_sse2x2 = {
271 raid6_sse22_gen_syndrome, 271 raid6_sse22_gen_syndrome,
@@ -366,9 +366,9 @@ static void raid6_sse24_gen_syndrome(int disks, size_t bytes, void **ptrs)
366 kernel_fpu_end(); 366 kernel_fpu_end();
367} 367}
368 368
369 static void raid6_sse24_xor_syndrome(int disks, int start, int stop, 369static void raid6_sse24_xor_syndrome(int disks, int start, int stop,
370 size_t bytes, void **ptrs) 370 size_t bytes, void **ptrs)
371 { 371{
372 u8 **dptr = (u8 **)ptrs; 372 u8 **dptr = (u8 **)ptrs;
373 u8 *p, *q; 373 u8 *p, *q;
374 int d, z, z0; 374 int d, z, z0;
@@ -471,7 +471,7 @@ static void raid6_sse24_gen_syndrome(int disks, size_t bytes, void **ptrs)
471 } 471 }
472 asm volatile("sfence" : : : "memory"); 472 asm volatile("sfence" : : : "memory");
473 kernel_fpu_end(); 473 kernel_fpu_end();
474 } 474}
475 475
476 476
477const struct raid6_calls raid6_sse2x4 = { 477const struct raid6_calls raid6_sse2x4 = {