Re: [tglx-devel:x86/fpu 31/67] arch/x86/math-emu/fpu_proto.h:147:13: error: conflicting types for 'frstor'

[Borislav Petkov <bp@suse.de>]

[-- Attachment #1: Type: text/plain, Size: 4217 bytes --]

On Wed, Jun 23, 2021 at 04:21:10PM +0800, kernel test robot wrote:
> tree:   https://git.kernel.org/pub/scm/linux/kernel/git/tglx/devel.git x86/fpu
> head:   b408a673a7086acb9f3b4ab3084e67652f94f7a6
> commit: 54a8a528861610b4227a5933f2b298bc21a11596 [31/67] x86/fpu: Rename fregs related copy functions
> config: i386-randconfig-r023-20210622 (attached as .config)
> compiler: gcc-9 (Debian 9.3.0-22) 9.3.0
> reproduce (this is a W=1 build):
>         # https://git.kernel.org/pub/scm/linux/kernel/git/tglx/devel.git/commit/?id=54a8a528861610b4227a5933f2b298bc21a11596
>         git remote add tglx-devel https://git.kernel.org/pub/scm/linux/kernel/git/tglx/devel.git
>         git fetch --no-tags tglx-devel x86/fpu
>         git checkout 54a8a528861610b4227a5933f2b298bc21a11596
>         # save the attached .config to linux build tree
>         make W=1 ARCH=i386 
> 
> If you fix the issue, kindly add following tag as appropriate
> Reported-by: kernel test robot <lkp@intel.com>
> 
> All errors (new ones prefixed by >>):
> 
>    In file included from arch/x86/math-emu/fpu_emu.h:213,
>                     from arch/x86/math-emu/fpu_entry.c:37:
> >> arch/x86/math-emu/fpu_proto.h:147:13: error: conflicting types for 'frstor'
>      147 | extern void frstor(fpu_addr_modes addr_modes, u_char __user *data_address);
>          |             ^~~~~~
>    In file included from arch/x86/math-emu/fpu_entry.c:34:
>    arch/x86/include/asm/fpu/internal.h:165:20: note: previous definition of 'frstor' was here
>      165 | static inline void frstor(struct fregs_state *fx)
>          |                    ^~~~~~
>    arch/x86/math-emu/fpu_entry.c:638:5: warning: no previous prototype for 'fpregs_soft_set' [-Wmissing-prototypes]
>      638 | int fpregs_soft_set(struct task_struct *target,
>          |     ^~~~~~~~~~~~~~~
>    arch/x86/math-emu/fpu_entry.c:690:5: warning: no previous prototype for 'fpregs_soft_get' [-Wmissing-prototypes]
>      690 | int fpregs_soft_get(struct task_struct *target,
>          |     ^~~~~~~~~~~~~~~

Thanks for the report.

I guess math-emu can s**k it:

---
diff --git a/arch/x86/math-emu/fpu_proto.h b/arch/x86/math-emu/fpu_proto.h
index 70d35c200945..94c4023092f3 100644
--- a/arch/x86/math-emu/fpu_proto.h
+++ b/arch/x86/math-emu/fpu_proto.h
@@ -144,7 +144,7 @@ extern int FPU_store_int16(FPU_REG *st0_ptr, u_char st0_tag, short __user *d);
 extern int FPU_store_bcd(FPU_REG *st0_ptr, u_char st0_tag, u_char __user *d);
 extern int FPU_round_to_int(FPU_REG *r, u_char tag);
 extern u_char __user *fldenv(fpu_addr_modes addr_modes, u_char __user *s);
-extern void frstor(fpu_addr_modes addr_modes, u_char __user *data_address);
+extern void FPU_frstor(fpu_addr_modes addr_modes, u_char __user *data_address);
 extern u_char __user *fstenv(fpu_addr_modes addr_modes, u_char __user *d);
 extern void fsave(fpu_addr_modes addr_modes, u_char __user *data_address);
 extern int FPU_tagof(FPU_REG *ptr);
diff --git a/arch/x86/math-emu/load_store.c b/arch/x86/math-emu/load_store.c
index f15263e158e8..4092df79de4f 100644
--- a/arch/x86/math-emu/load_store.c
+++ b/arch/x86/math-emu/load_store.c
@@ -240,7 +240,7 @@ int FPU_load_store(u_char type, fpu_addr_modes addr_modes,
 		   fix-up operations. */
 		return 1;
 	case 022:		/* frstor m94/108byte */
-		frstor(addr_modes, (u_char __user *) data_address);
+		FPU_frstor(addr_modes, (u_char __user *) data_address);
 		/* Ensure that the values just loaded are not changed by
 		   fix-up operations. */
 		return 1;
diff --git a/arch/x86/math-emu/reg_ld_str.c b/arch/x86/math-emu/reg_ld_str.c
index 7ca6417c0c8d..7e4521fbe7da 100644
--- a/arch/x86/math-emu/reg_ld_str.c
+++ b/arch/x86/math-emu/reg_ld_str.c
@@ -1117,7 +1117,7 @@ u_char __user *fldenv(fpu_addr_modes addr_modes, u_char __user *s)
 	return s;
 }
 
-void frstor(fpu_addr_modes addr_modes, u_char __user *data_address)
+void FPU_frstor(fpu_addr_modes addr_modes, u_char __user *data_address)
 {
 	int i, regnr;
 	u_char __user *s = fldenv(addr_modes, data_address);

-- 
Regards/Gruss,
    Boris.

SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg