Commit 7cf76a68 authored by Mathieu Malaterre's avatar Mathieu Malaterre Committed by Michael Ellerman
Browse files

powerpc/altivec: Add missing prototypes for altivec 



Some functions prototypes were missing for the non-altivec code. Add the
missing prototypes in a new header file, fix warnings treated as errors
with W=1:

  arch/powerpc/lib/xor_vmx_glue.c:18:6: error: no previous prototype for ‘xor_altivec_2’ [-Werror=missing-prototypes]
  arch/powerpc/lib/xor_vmx_glue.c:29:6: error: no previous prototype for ‘xor_altivec_3’ [-Werror=missing-prototypes]
  arch/powerpc/lib/xor_vmx_glue.c:40:6: error: no previous prototype for ‘xor_altivec_4’ [-Werror=missing-prototypes]
  arch/powerpc/lib/xor_vmx_glue.c:52:6: error: no previous prototype for ‘xor_altivec_5’ [-Werror=missing-prototypes]

The prototypes were already present in <asm/xor.h> but this header file is
meant to be included after <include/linux/raid/xor.h>. Trying to re-use
<asm/xor.h> directly would lead to warnings such as:

  arch/powerpc/include/asm/xor.h:39:15: error: variable ‘xor_block_altivec’ has initializer but incomplete type

Trying to re-use <asm/xor.h> after <include/linux/raid/xor.h> in
xor_vmx_glue.c would in turn trigger the following warnings:

  include/asm-generic/xor.h:688:34: error: ‘xor_block_32regs’ defined but not used [-Werror=unused-variable]

Signed-off-by: default avatarMathieu Malaterre <malat@debian.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent eae5f709

arch/powerpc/include/asm/xor.h

+1 −11
Original line number Diff line number Diff line
@@ -24,17 +24,7 @@ 


#include <asm/cputable.h>

#include <asm/cpu_has_feature.h>



void xor_altivec_2(unsigned long bytes, unsigned long *v1_in,

		   unsigned long *v2_in);

void xor_altivec_3(unsigned long bytes, unsigned long *v1_in,

		   unsigned long *v2_in, unsigned long *v3_in);

void xor_altivec_4(unsigned long bytes, unsigned long *v1_in,

		   unsigned long *v2_in, unsigned long *v3_in,

		   unsigned long *v4_in);

void xor_altivec_5(unsigned long bytes, unsigned long *v1_in,

		   unsigned long *v2_in, unsigned long *v3_in,

		   unsigned long *v4_in, unsigned long *v5_in);

#include <asm/xor_altivec.h>



static struct xor_block_template xor_block_altivec = {

	.name = "altivec",

arch/powerpc/include/asm/xor_altivec.h

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_POWERPC_XOR_ALTIVEC_H

#define _ASM_POWERPC_XOR_ALTIVEC_H



#ifdef CONFIG_ALTIVEC



void xor_altivec_2(unsigned long bytes, unsigned long *v1_in,

		   unsigned long *v2_in);

void xor_altivec_3(unsigned long bytes, unsigned long *v1_in,

		   unsigned long *v2_in, unsigned long *v3_in);

void xor_altivec_4(unsigned long bytes, unsigned long *v1_in,

		   unsigned long *v2_in, unsigned long *v3_in,

		   unsigned long *v4_in);

void xor_altivec_5(unsigned long bytes, unsigned long *v1_in,

		   unsigned long *v2_in, unsigned long *v3_in,

		   unsigned long *v4_in, unsigned long *v5_in);



#endif

#endif /* _ASM_POWERPC_XOR_ALTIVEC_H */

arch/powerpc/lib/xor_vmx_glue.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/export.h>

#include <linux/sched.h>

#include <asm/switch_to.h>

#include <asm/xor_altivec.h>

#include "xor_vmx.h"



void xor_altivec_2(unsigned long bytes, unsigned long *v1_in,

CRA Git | Maintained and supported by SUSTech CRA and CCSE