From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3A8C92F8EBE for ; Wed, 24 Jun 2026 04:56:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782276987; cv=none; b=TTS0vltHxYhmujoCKZEHxBGRpXx7/ErttQWQYtga0aLd7kzmO6rmA4IAKmDqxsQC5jtvjClPTZXNCs+xDDW++UYqYTi+7Wu9dRjVdcch9C8bupZ3PmusSMpBWLh6Go6/qDSDG8aYTJNXq6rOO0TPbBZ0nGAr++H+hDTTro4zO+4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782276987; c=relaxed/simple; bh=tyW/BY0zPoa4RxO3wpcOXDDs1tuNutbFUrErYXJbHRY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=aHRYchLPwhFE/i61/K4upX7/sShyauwq+Wlb6hQlpwH135P6PED60FjtzBEyCC8ZYblGdsFHfPtNdaP2ADdMWTfhi1yUbpKF/Te+Fi512ILoh2sP0+k5t3r1JrnZsq9yiOW4KK0CuZ6ez+E4oSYEfHr6eN8/P/fZymz1jH97wmI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=qvvgSjMw; arc=none smtp.client-ip=209.85.216.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="qvvgSjMw" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-36ba285e98bso608037a91.2 for ; Tue, 23 Jun 2026 21:56:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782276984; x=1782881784; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=LRhN4tFLAXs+oOwXmt8uJZZl8XwYpZaVH7qWqPWWdnk=; b=qvvgSjMwbXWRKLVbWKc54i48OL6Zz+Cpq1v7Jal7ENQA3nvURgrfiy9WYRxIknbtgG oqkBNXcbYASB0zuLj896tZDhKcojWOwV5MALzej+EUlNuoDxCkySetnI1XHgtuknKzIt UlBSdxNWbRyFPxED/siaIU/B00Bom4lxHzN2wh3f3eNlBkoMcvL5+RC8+y2AgjNYWEEc tKEOx9hhYgRd+hhqK+R7DQs9HO2t5cyOmSJBQbUtLrEwn/E3Wv+NEatoMIsDFjkqhhzy yZPPAC9RksCfm104a7duU4eTsWYv4ZWF3s/h0VNvMbTL3BZSMj3RF7N19e2jhwRN8S0j ctlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782276984; x=1782881784; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=LRhN4tFLAXs+oOwXmt8uJZZl8XwYpZaVH7qWqPWWdnk=; b=nj3TVEZ7GhmEkLXb2OtrDgZZCYk9o9U6E2pnjtkXl8SW+FFlWQyXr9dLQtnpU5Ui0g 90uBD3BdpsEhdXJtM4izj+VMCidAbaDiBHLS9kbg36zgF1ndzht4nwE6GRbx12+cuNT6 oxC5NEX+FcXgGjREqhuqBRw4lnFNpgsO87j8r7vnw+fl5MQUXEnIlrIsZ9ZnGx2Yv28a L11A7KRXdnMs2izJ0jmWRuATYQNqUZGaEIMjwHhbhHRal5dXP78zhwxYVCopVmCj/2/B Sx3APiHiphF91YSjTXFnrYTd1gf2l3+OQJA24XmADd01wVYyGjKhB995EwumEJ6Nn5S9 85Ag== X-Gm-Message-State: AOJu0YzgFTesTKqIRpIl9KfNhUqaDAtI6WJtBtoDteE/5byMvDhNbQRM pOoDAgyLN9q3wZ9lRvOGeTh3EercE9Y/ps76Kar9Qn0SIh3LM0gLspVZyR7xV+LJI3UxKw== X-Gm-Gg: AfdE7cm15BZAnb6aVs3D6oc2iXKLuSyuSSX+FQRWgfBY3AhkJzkOmBbJxQNlyNBilkQ +SEMDYmdPh3rVTc6128ZlmOpQ6MOnlJ7uAIMC1sMVxslaW8/zRixqqM/6HkLM4d3K/RPQ7RoGuZ NeC8Hm+qZ5crMJnWLNfXtAJOfLnp6xm822milI1a+ZXoogMexOq+wDFeRRzpOk2CsDby//80SpK LnaqqQbOLFBHLWazrGGO6p2pvCntxxMeH7xcdhgnYXvDH8t2fvFnABfqpntRmDn5CQ2DbiT7cMj SZul0jdXcXvOsIpHCotIEy/dBjD139z77Qs6AkkkKlw1c/Ha+7jz6vWU2DJai1lsVXm9MM5O7pr xEKf1FOiDSIxiiTSPzhllZpIrRdZZb8rDd4FGQKMhlwRvPT6sjaq3FFouG4FG0cOiSSwOjwcXfJ o+muNsRc4DWZ5VdBQx X-Received: by 2002:a17:90b:5405:b0:36b:3ecd:88d2 with SMTP id 98e67ed59e1d1-37dd0d0d8d1mr6926812a91.3.1782276984193; Tue, 23 Jun 2026 21:56:24 -0700 (PDT) Received: from Louie360.grammar.local ([138.44.161.233]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-37de3bbd5fcsm1082501a91.17.2026.06.23.21.56.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 21:56:23 -0700 (PDT) From: Watson Wheeler X-Google-Original-From: Watson Wheeler To: ebiggers@kernel.org, akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, Watson Wheeler Subject: [PATCH] lib/raid/xor: Fix spacing around __restrict pointers Date: Wed, 24 Jun 2026 14:55:15 +1000 Message-ID: <20260624045515.1648-1-git@tazy.dev> X-Mailer: git-send-email 2.47.3 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Adjust pointer declarations throughout the XOR implementations to follow kernel coding style guide. Signed-off-by: Watson Wheeler --- lib/raid/xor/alpha/xor.c | 56 +++++++++++++-------------- lib/raid/xor/arm/xor.c | 28 +++++++------- lib/raid/xor/arm64/xor-eor3.c | 28 +++++++------- lib/raid/xor/loongarch/xor_simd.h | 40 +++++++++---------- lib/raid/xor/loongarch/xor_template.c | 28 +++++++------- lib/raid/xor/powerpc/xor_vmx.c | 28 +++++++------- lib/raid/xor/s390/xor.c | 28 +++++++------- lib/raid/xor/sparc/xor-sparc32.c | 28 +++++++------- lib/raid/xor/sparc/xor-sparc64-glue.c | 56 +++++++++++++-------------- lib/raid/xor/x86/xor-avx.c | 28 +++++++------- lib/raid/xor/x86/xor-mmx.c | 56 +++++++++++++-------------- lib/raid/xor/x86/xor-sse.c | 56 +++++++++++++-------------- lib/raid/xor/xor-32regs-prefetch.c | 28 +++++++------- lib/raid/xor/xor-32regs.c | 28 +++++++------- lib/raid/xor/xor-8regs-prefetch.c | 28 +++++++------- lib/raid/xor/xor-8regs.c | 28 +++++++------- lib/raid/xor/xor-neon.c | 28 +++++++------- 17 files changed, 300 insertions(+), 300 deletions(-) diff --git a/lib/raid/xor/alpha/xor.c b/lib/raid/xor/alpha/xor.c index a8f72f2dd3a5..a315d32641c6 100644 --- a/lib/raid/xor/alpha/xor.c +++ b/lib/raid/xor/alpha/xor.c @@ -6,42 +6,42 @@ #include "xor_arch.h" extern void -xor_alpha_2(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2); +xor_alpha_2(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2); extern void -xor_alpha_3(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3); +xor_alpha_3(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3); extern void -xor_alpha_4(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4); +xor_alpha_4(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4); extern void -xor_alpha_5(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4, - const unsigned long * __restrict p5); +xor_alpha_5(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4, + const unsigned long *__restrict p5); extern void -xor_alpha_prefetch_2(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2); +xor_alpha_prefetch_2(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2); extern void -xor_alpha_prefetch_3(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3); +xor_alpha_prefetch_3(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3); extern void -xor_alpha_prefetch_4(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4); +xor_alpha_prefetch_4(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4); extern void -xor_alpha_prefetch_5(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4, - const unsigned long * __restrict p5); +xor_alpha_prefetch_5(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4, + const unsigned long *__restrict p5); asm(" \n\ .text \n\ diff --git a/lib/raid/xor/arm/xor.c b/lib/raid/xor/arm/xor.c index 45139b6c55ea..2f73daac99da 100644 --- a/lib/raid/xor/arm/xor.c +++ b/lib/raid/xor/arm/xor.c @@ -40,8 +40,8 @@ : "0" (dst), "r" (a1), "r" (a2), "r" (a3), "r" (a4)) static void -xor_arm4regs_2(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2) +xor_arm4regs_2(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2) { unsigned int lines = bytes / sizeof(unsigned long) / 4; register unsigned int a1 __asm__("r4"); @@ -61,9 +61,9 @@ xor_arm4regs_2(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_arm4regs_3(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3) +xor_arm4regs_3(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3) { unsigned int lines = bytes / sizeof(unsigned long) / 4; register unsigned int a1 __asm__("r4"); @@ -84,10 +84,10 @@ xor_arm4regs_3(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_arm4regs_4(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4) +xor_arm4regs_4(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4) { unsigned int lines = bytes / sizeof(unsigned long) / 2; register unsigned int a1 __asm__("r8"); @@ -105,11 +105,11 @@ xor_arm4regs_4(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_arm4regs_5(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4, - const unsigned long * __restrict p5) +xor_arm4regs_5(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4, + const unsigned long *__restrict p5) { unsigned int lines = bytes / sizeof(unsigned long) / 2; register unsigned int a1 __asm__("r8"); diff --git a/lib/raid/xor/arm64/xor-eor3.c b/lib/raid/xor/arm64/xor-eor3.c index e44016c363f1..ddd8bd2c9cd0 100644 --- a/lib/raid/xor/arm64/xor-eor3.c +++ b/lib/raid/xor/arm64/xor-eor3.c @@ -6,8 +6,8 @@ #include "xor_arch.h" #include "xor-neon.h" -extern void __xor_eor3_2(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2); +extern void __xor_eor3_2(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2); static inline uint64x2_t eor3(uint64x2_t p, uint64x2_t q, uint64x2_t r) { @@ -19,9 +19,9 @@ static inline uint64x2_t eor3(uint64x2_t p, uint64x2_t q, uint64x2_t r) return res; } -static void __xor_eor3_3(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3) +static void __xor_eor3_3(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3) { uint64_t *dp1 = (uint64_t *)p1; uint64_t *dp2 = (uint64_t *)p2; @@ -53,10 +53,10 @@ static void __xor_eor3_3(unsigned long bytes, unsigned long * __restrict p1, } while (--lines > 0); } -static void __xor_eor3_4(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4) +static void __xor_eor3_4(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4) { uint64_t *dp1 = (uint64_t *)p1; uint64_t *dp2 = (uint64_t *)p2; @@ -96,11 +96,11 @@ static void __xor_eor3_4(unsigned long bytes, unsigned long * __restrict p1, } while (--lines > 0); } -static void __xor_eor3_5(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4, - const unsigned long * __restrict p5) +static void __xor_eor3_5(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4, + const unsigned long *__restrict p5) { uint64_t *dp1 = (uint64_t *)p1; uint64_t *dp2 = (uint64_t *)p2; diff --git a/lib/raid/xor/loongarch/xor_simd.h b/lib/raid/xor/loongarch/xor_simd.h index f50f32514d80..dee971d50434 100644 --- a/lib/raid/xor/loongarch/xor_simd.h +++ b/lib/raid/xor/loongarch/xor_simd.h @@ -10,29 +10,29 @@ #define __LOONGARCH_LIB_XOR_SIMD_H #ifdef CONFIG_CPU_HAS_LSX -void __xor_lsx_2(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2); -void __xor_lsx_3(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, const unsigned long * __restrict p3); -void __xor_lsx_4(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, const unsigned long * __restrict p3, - const unsigned long * __restrict p4); -void __xor_lsx_5(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, const unsigned long * __restrict p3, - const unsigned long * __restrict p4, const unsigned long * __restrict p5); +void __xor_lsx_2(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2); +void __xor_lsx_3(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, const unsigned long *__restrict p3); +void __xor_lsx_4(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, const unsigned long *__restrict p3, + const unsigned long *__restrict p4); +void __xor_lsx_5(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, const unsigned long *__restrict p3, + const unsigned long *__restrict p4, const unsigned long *__restrict p5); #endif /* CONFIG_CPU_HAS_LSX */ #ifdef CONFIG_CPU_HAS_LASX -void __xor_lasx_2(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2); -void __xor_lasx_3(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, const unsigned long * __restrict p3); -void __xor_lasx_4(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, const unsigned long * __restrict p3, - const unsigned long * __restrict p4); -void __xor_lasx_5(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, const unsigned long * __restrict p3, - const unsigned long * __restrict p4, const unsigned long * __restrict p5); +void __xor_lasx_2(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2); +void __xor_lasx_3(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, const unsigned long *__restrict p3); +void __xor_lasx_4(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, const unsigned long *__restrict p3, + const unsigned long *__restrict p4); +void __xor_lasx_5(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, const unsigned long *__restrict p3, + const unsigned long *__restrict p4, const unsigned long *__restrict p5); #endif /* CONFIG_CPU_HAS_LASX */ #endif /* __LOONGARCH_LIB_XOR_SIMD_H */ diff --git a/lib/raid/xor/loongarch/xor_template.c b/lib/raid/xor/loongarch/xor_template.c index 0358ced7fe33..354df570a172 100644 --- a/lib/raid/xor/loongarch/xor_template.c +++ b/lib/raid/xor/loongarch/xor_template.c @@ -14,8 +14,8 @@ */ void XOR_FUNC_NAME(2)(unsigned long bytes, - unsigned long * __restrict v1, - const unsigned long * __restrict v2) + unsigned long *__restrict v1, + const unsigned long *__restrict v2) { unsigned long lines = bytes / LINE_WIDTH; @@ -33,9 +33,9 @@ void XOR_FUNC_NAME(2)(unsigned long bytes, } void XOR_FUNC_NAME(3)(unsigned long bytes, - unsigned long * __restrict v1, - const unsigned long * __restrict v2, - const unsigned long * __restrict v3) + unsigned long *__restrict v1, + const unsigned long *__restrict v2, + const unsigned long *__restrict v3) { unsigned long lines = bytes / LINE_WIDTH; @@ -55,10 +55,10 @@ void XOR_FUNC_NAME(3)(unsigned long bytes, } void XOR_FUNC_NAME(4)(unsigned long bytes, - unsigned long * __restrict v1, - const unsigned long * __restrict v2, - const unsigned long * __restrict v3, - const unsigned long * __restrict v4) + unsigned long *__restrict v1, + const unsigned long *__restrict v2, + const unsigned long *__restrict v3, + const unsigned long *__restrict v4) { unsigned long lines = bytes / LINE_WIDTH; @@ -81,11 +81,11 @@ void XOR_FUNC_NAME(4)(unsigned long bytes, } void XOR_FUNC_NAME(5)(unsigned long bytes, - unsigned long * __restrict v1, - const unsigned long * __restrict v2, - const unsigned long * __restrict v3, - const unsigned long * __restrict v4, - const unsigned long * __restrict v5) + unsigned long *__restrict v1, + const unsigned long *__restrict v2, + const unsigned long *__restrict v3, + const unsigned long *__restrict v4, + const unsigned long *__restrict v5) { unsigned long lines = bytes / LINE_WIDTH; diff --git a/lib/raid/xor/powerpc/xor_vmx.c b/lib/raid/xor/powerpc/xor_vmx.c index 09bed98c1bc7..17d96d42660b 100644 --- a/lib/raid/xor/powerpc/xor_vmx.c +++ b/lib/raid/xor/powerpc/xor_vmx.c @@ -51,8 +51,8 @@ typedef vector signed char unative_t; } while (0) static void __xor_altivec_2(unsigned long bytes, - unsigned long * __restrict v1_in, - const unsigned long * __restrict v2_in) + unsigned long *__restrict v1_in, + const unsigned long *__restrict v2_in) { DEFINE(v1); DEFINE(v2); @@ -70,9 +70,9 @@ static void __xor_altivec_2(unsigned long bytes, } static void __xor_altivec_3(unsigned long bytes, - unsigned long * __restrict v1_in, - const unsigned long * __restrict v2_in, - const unsigned long * __restrict v3_in) + unsigned long *__restrict v1_in, + const unsigned long *__restrict v2_in, + const unsigned long *__restrict v3_in) { DEFINE(v1); DEFINE(v2); @@ -94,10 +94,10 @@ static void __xor_altivec_3(unsigned long bytes, } static void __xor_altivec_4(unsigned long bytes, - unsigned long * __restrict v1_in, - const unsigned long * __restrict v2_in, - const unsigned long * __restrict v3_in, - const unsigned long * __restrict v4_in) + unsigned long *__restrict v1_in, + const unsigned long *__restrict v2_in, + const unsigned long *__restrict v3_in, + const unsigned long *__restrict v4_in) { DEFINE(v1); DEFINE(v2); @@ -123,11 +123,11 @@ static void __xor_altivec_4(unsigned long bytes, } static void __xor_altivec_5(unsigned long bytes, - unsigned long * __restrict v1_in, - const unsigned long * __restrict v2_in, - const unsigned long * __restrict v3_in, - const unsigned long * __restrict v4_in, - const unsigned long * __restrict v5_in) + unsigned long *__restrict v1_in, + const unsigned long *__restrict v2_in, + const unsigned long *__restrict v3_in, + const unsigned long *__restrict v4_in, + const unsigned long *__restrict v5_in) { DEFINE(v1); DEFINE(v2); diff --git a/lib/raid/xor/s390/xor.c b/lib/raid/xor/s390/xor.c index 0c478678a129..aa6114d9f9e3 100644 --- a/lib/raid/xor/s390/xor.c +++ b/lib/raid/xor/s390/xor.c @@ -10,8 +10,8 @@ #include "xor_impl.h" #include "xor_arch.h" -static void xor_xc_2(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2) +static void xor_xc_2(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2) { asm volatile( " aghi %0,-1\n" @@ -31,9 +31,9 @@ static void xor_xc_2(unsigned long bytes, unsigned long * __restrict p1, : : "0", "cc", "memory"); } -static void xor_xc_3(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3) +static void xor_xc_3(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3) { asm volatile( " aghi %0,-1\n" @@ -57,10 +57,10 @@ static void xor_xc_3(unsigned long bytes, unsigned long * __restrict p1, : : "0", "cc", "memory"); } -static void xor_xc_4(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4) +static void xor_xc_4(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4) { asm volatile( " aghi %0,-1\n" @@ -88,11 +88,11 @@ static void xor_xc_4(unsigned long bytes, unsigned long * __restrict p1, : : "0", "cc", "memory"); } -static void xor_xc_5(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4, - const unsigned long * __restrict p5) +static void xor_xc_5(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4, + const unsigned long *__restrict p5) { asm volatile( " aghi %0,-1\n" diff --git a/lib/raid/xor/sparc/xor-sparc32.c b/lib/raid/xor/sparc/xor-sparc32.c index fb37631e90e6..4d9d683d2546 100644 --- a/lib/raid/xor/sparc/xor-sparc32.c +++ b/lib/raid/xor/sparc/xor-sparc32.c @@ -9,8 +9,8 @@ #include "xor_arch.h" static void -sparc_2(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2) +sparc_2(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2) { int lines = bytes / (sizeof (long)) / 8; @@ -47,9 +47,9 @@ sparc_2(unsigned long bytes, unsigned long * __restrict p1, } static void -sparc_3(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3) +sparc_3(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3) { int lines = bytes / (sizeof (long)) / 8; @@ -99,10 +99,10 @@ sparc_3(unsigned long bytes, unsigned long * __restrict p1, } static void -sparc_4(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4) +sparc_4(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4) { int lines = bytes / (sizeof (long)) / 8; @@ -165,11 +165,11 @@ sparc_4(unsigned long bytes, unsigned long * __restrict p1, } static void -sparc_5(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4, - const unsigned long * __restrict p5) +sparc_5(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4, + const unsigned long *__restrict p5) { int lines = bytes / (sizeof (long)) / 8; diff --git a/lib/raid/xor/sparc/xor-sparc64-glue.c b/lib/raid/xor/sparc/xor-sparc64-glue.c index a8a686e0d258..4eb88e599265 100644 --- a/lib/raid/xor/sparc/xor-sparc64-glue.c +++ b/lib/raid/xor/sparc/xor-sparc64-glue.c @@ -11,20 +11,20 @@ #include "xor_impl.h" #include "xor_arch.h" -void xor_vis_2(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2); -void xor_vis_3(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3); -void xor_vis_4(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4); -void xor_vis_5(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4, - const unsigned long * __restrict p5); +void xor_vis_2(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2); +void xor_vis_3(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3); +void xor_vis_4(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4); +void xor_vis_5(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4, + const unsigned long *__restrict p5); /* XXX Ugh, write cheetah versions... -DaveM */ @@ -35,20 +35,20 @@ struct xor_block_template xor_block_VIS = { .xor_gen = xor_gen_vis, }; -void xor_niagara_2(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2); -void xor_niagara_3(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3); -void xor_niagara_4(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4); -void xor_niagara_5(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4, - const unsigned long * __restrict p5); +void xor_niagara_2(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2); +void xor_niagara_3(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3); +void xor_niagara_4(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4); +void xor_niagara_5(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4, + const unsigned long *__restrict p5); DO_XOR_BLOCKS(niagara, xor_niagara_2, xor_niagara_3, xor_niagara_4, xor_niagara_5); diff --git a/lib/raid/xor/x86/xor-avx.c b/lib/raid/xor/x86/xor-avx.c index f7777d7aa269..9e8b95bcde3e 100644 --- a/lib/raid/xor/x86/xor-avx.c +++ b/lib/raid/xor/x86/xor-avx.c @@ -24,8 +24,8 @@ BLOCK4(8) \ BLOCK4(12) -static void xor_avx_2(unsigned long bytes, unsigned long * __restrict p0, - const unsigned long * __restrict p1) +static void xor_avx_2(unsigned long bytes, unsigned long *__restrict p0, + const unsigned long *__restrict p1) { unsigned long lines = bytes >> 9; @@ -47,9 +47,9 @@ do { \ } } -static void xor_avx_3(unsigned long bytes, unsigned long * __restrict p0, - const unsigned long * __restrict p1, - const unsigned long * __restrict p2) +static void xor_avx_3(unsigned long bytes, unsigned long *__restrict p0, + const unsigned long *__restrict p1, + const unsigned long *__restrict p2) { unsigned long lines = bytes >> 9; @@ -74,10 +74,10 @@ do { \ } } -static void xor_avx_4(unsigned long bytes, unsigned long * __restrict p0, - const unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3) +static void xor_avx_4(unsigned long bytes, unsigned long *__restrict p0, + const unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3) { unsigned long lines = bytes >> 9; @@ -105,11 +105,11 @@ do { \ } } -static void xor_avx_5(unsigned long bytes, unsigned long * __restrict p0, - const unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4) +static void xor_avx_5(unsigned long bytes, unsigned long *__restrict p0, + const unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4) { unsigned long lines = bytes >> 9; diff --git a/lib/raid/xor/x86/xor-mmx.c b/lib/raid/xor/x86/xor-mmx.c index 63a8b0444fce..605f333c57ba 100644 --- a/lib/raid/xor/x86/xor-mmx.c +++ b/lib/raid/xor/x86/xor-mmx.c @@ -16,8 +16,8 @@ #define XO4(x, y) " pxor 8*("#x")(%5), %%mm"#y" ;\n" static void -xor_pII_mmx_2(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2) +xor_pII_mmx_2(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2) { unsigned long lines = bytes >> 7; @@ -56,9 +56,9 @@ xor_pII_mmx_2(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_pII_mmx_3(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3) +xor_pII_mmx_3(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3) { unsigned long lines = bytes >> 7; @@ -102,10 +102,10 @@ xor_pII_mmx_3(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_pII_mmx_4(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4) +xor_pII_mmx_4(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4) { unsigned long lines = bytes >> 7; @@ -155,11 +155,11 @@ xor_pII_mmx_4(unsigned long bytes, unsigned long * __restrict p1, static void -xor_pII_mmx_5(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4, - const unsigned long * __restrict p5) +xor_pII_mmx_5(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4, + const unsigned long *__restrict p5) { unsigned long lines = bytes >> 7; @@ -234,8 +234,8 @@ xor_pII_mmx_5(unsigned long bytes, unsigned long * __restrict p1, #undef BLOCK static void -xor_p5_mmx_2(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2) +xor_p5_mmx_2(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2) { unsigned long lines = bytes >> 6; @@ -278,9 +278,9 @@ xor_p5_mmx_2(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_p5_mmx_3(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3) +xor_p5_mmx_3(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3) { unsigned long lines = bytes >> 6; @@ -332,10 +332,10 @@ xor_p5_mmx_3(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_p5_mmx_4(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4) +xor_p5_mmx_4(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4) { unsigned long lines = bytes >> 6; @@ -396,11 +396,11 @@ xor_p5_mmx_4(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_p5_mmx_5(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4, - const unsigned long * __restrict p5) +xor_p5_mmx_5(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4, + const unsigned long *__restrict p5) { unsigned long lines = bytes >> 6; diff --git a/lib/raid/xor/x86/xor-sse.c b/lib/raid/xor/x86/xor-sse.c index c6626ecae6ba..df4793f339c0 100644 --- a/lib/raid/xor/x86/xor-sse.c +++ b/lib/raid/xor/x86/xor-sse.c @@ -46,8 +46,8 @@ op(i + 3, 3) static void -xor_sse_2(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2) +xor_sse_2(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2) { unsigned long lines = bytes >> 8; @@ -94,8 +94,8 @@ xor_sse_2(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_sse_2_pf64(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2) +xor_sse_2_pf64(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2) { unsigned long lines = bytes >> 8; @@ -125,9 +125,9 @@ xor_sse_2_pf64(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_sse_3(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3) +xor_sse_3(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3) { unsigned long lines = bytes >> 8; @@ -181,9 +181,9 @@ xor_sse_3(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_sse_3_pf64(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3) +xor_sse_3_pf64(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3) { unsigned long lines = bytes >> 8; @@ -215,10 +215,10 @@ xor_sse_3_pf64(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_sse_4(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4) +xor_sse_4(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4) { unsigned long lines = bytes >> 8; @@ -279,10 +279,10 @@ xor_sse_4(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_sse_4_pf64(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4) +xor_sse_4_pf64(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4) { unsigned long lines = bytes >> 8; @@ -316,11 +316,11 @@ xor_sse_4_pf64(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_sse_5(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4, - const unsigned long * __restrict p5) +xor_sse_5(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4, + const unsigned long *__restrict p5) { unsigned long lines = bytes >> 8; @@ -388,11 +388,11 @@ xor_sse_5(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_sse_5_pf64(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4, - const unsigned long * __restrict p5) +xor_sse_5_pf64(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4, + const unsigned long *__restrict p5) { unsigned long lines = bytes >> 8; diff --git a/lib/raid/xor/xor-32regs-prefetch.c b/lib/raid/xor/xor-32regs-prefetch.c index ade2a7d8cbe2..1c51c1537bbd 100644 --- a/lib/raid/xor/xor-32regs-prefetch.c +++ b/lib/raid/xor/xor-32regs-prefetch.c @@ -3,8 +3,8 @@ #include "xor_impl.h" static void -xor_32regs_p_2(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2) +xor_32regs_p_2(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2) { long lines = bytes / (sizeof (long)) / 8 - 1; @@ -49,9 +49,9 @@ xor_32regs_p_2(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_32regs_p_3(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3) +xor_32regs_p_3(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3) { long lines = bytes / (sizeof (long)) / 8 - 1; @@ -107,10 +107,10 @@ xor_32regs_p_3(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_32regs_p_4(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4) +xor_32regs_p_4(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4) { long lines = bytes / (sizeof (long)) / 8 - 1; @@ -177,11 +177,11 @@ xor_32regs_p_4(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_32regs_p_5(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4, - const unsigned long * __restrict p5) +xor_32regs_p_5(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4, + const unsigned long *__restrict p5) { long lines = bytes / (sizeof (long)) / 8 - 1; diff --git a/lib/raid/xor/xor-32regs.c b/lib/raid/xor/xor-32regs.c index acb4a10d1e95..46dfa0d8a453 100644 --- a/lib/raid/xor/xor-32regs.c +++ b/lib/raid/xor/xor-32regs.c @@ -2,8 +2,8 @@ #include "xor_impl.h" static void -xor_32regs_2(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2) +xor_32regs_2(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2) { long lines = bytes / (sizeof (long)) / 8; @@ -39,9 +39,9 @@ xor_32regs_2(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_32regs_3(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3) +xor_32regs_3(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3) { long lines = bytes / (sizeof (long)) / 8; @@ -86,10 +86,10 @@ xor_32regs_3(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_32regs_4(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4) +xor_32regs_4(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4) { long lines = bytes / (sizeof (long)) / 8; @@ -143,11 +143,11 @@ xor_32regs_4(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_32regs_5(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4, - const unsigned long * __restrict p5) +xor_32regs_5(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4, + const unsigned long *__restrict p5) { long lines = bytes / (sizeof (long)) / 8; diff --git a/lib/raid/xor/xor-8regs-prefetch.c b/lib/raid/xor/xor-8regs-prefetch.c index 451527a951b1..93820d976cb0 100644 --- a/lib/raid/xor/xor-8regs-prefetch.c +++ b/lib/raid/xor/xor-8regs-prefetch.c @@ -3,8 +3,8 @@ #include "xor_impl.h" static void -xor_8regs_p_2(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2) +xor_8regs_p_2(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2) { long lines = bytes / (sizeof (long)) / 8 - 1; prefetchw(p1); @@ -30,9 +30,9 @@ xor_8regs_p_2(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_8regs_p_3(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3) +xor_8regs_p_3(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3) { long lines = bytes / (sizeof (long)) / 8 - 1; prefetchw(p1); @@ -61,10 +61,10 @@ xor_8regs_p_3(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_8regs_p_4(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4) +xor_8regs_p_4(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4) { long lines = bytes / (sizeof (long)) / 8 - 1; @@ -97,11 +97,11 @@ xor_8regs_p_4(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_8regs_p_5(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4, - const unsigned long * __restrict p5) +xor_8regs_p_5(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4, + const unsigned long *__restrict p5) { long lines = bytes / (sizeof (long)) / 8 - 1; diff --git a/lib/raid/xor/xor-8regs.c b/lib/raid/xor/xor-8regs.c index 46b3c8bdc27f..f0adeb37700f 100644 --- a/lib/raid/xor/xor-8regs.c +++ b/lib/raid/xor/xor-8regs.c @@ -2,8 +2,8 @@ #include "xor_impl.h" static void -xor_8regs_2(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2) +xor_8regs_2(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2) { long lines = bytes / (sizeof (long)) / 8; @@ -22,9 +22,9 @@ xor_8regs_2(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_8regs_3(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3) +xor_8regs_3(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3) { long lines = bytes / (sizeof (long)) / 8; @@ -44,10 +44,10 @@ xor_8regs_3(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_8regs_4(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4) +xor_8regs_4(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4) { long lines = bytes / (sizeof (long)) / 8; @@ -68,11 +68,11 @@ xor_8regs_4(unsigned long bytes, unsigned long * __restrict p1, } static void -xor_8regs_5(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4, - const unsigned long * __restrict p5) +xor_8regs_5(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4, + const unsigned long *__restrict p5) { long lines = bytes / (sizeof (long)) / 8; diff --git a/lib/raid/xor/xor-neon.c b/lib/raid/xor/xor-neon.c index c7c3cf634e23..661f78256197 100644 --- a/lib/raid/xor/xor-neon.c +++ b/lib/raid/xor/xor-neon.c @@ -9,8 +9,8 @@ #include -static void __xor_neon_2(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2) +static void __xor_neon_2(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2) { uint64_t *dp1 = (uint64_t *)p1; uint64_t *dp2 = (uint64_t *)p2; @@ -36,9 +36,9 @@ static void __xor_neon_2(unsigned long bytes, unsigned long * __restrict p1, } while (--lines > 0); } -static void __xor_neon_3(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3) +static void __xor_neon_3(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3) { uint64_t *dp1 = (uint64_t *)p1; uint64_t *dp2 = (uint64_t *)p2; @@ -72,10 +72,10 @@ static void __xor_neon_3(unsigned long bytes, unsigned long * __restrict p1, } while (--lines > 0); } -static void __xor_neon_4(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4) +static void __xor_neon_4(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4) { uint64_t *dp1 = (uint64_t *)p1; uint64_t *dp2 = (uint64_t *)p2; @@ -117,11 +117,11 @@ static void __xor_neon_4(unsigned long bytes, unsigned long * __restrict p1, } while (--lines > 0); } -static void __xor_neon_5(unsigned long bytes, unsigned long * __restrict p1, - const unsigned long * __restrict p2, - const unsigned long * __restrict p3, - const unsigned long * __restrict p4, - const unsigned long * __restrict p5) +static void __xor_neon_5(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4, + const unsigned long *__restrict p5) { uint64_t *dp1 = (uint64_t *)p1; uint64_t *dp2 = (uint64_t *)p2; -- 2.47.3