2021-12-09 01:55:07

by Zhangshaokun

[permalink] [raw]
Subject: [PATCH] x86/fpu: Clean up the repeated declaration

Function 'copy_fpstate_to_sigframe' is declared twice by
commit <0ae67cc34f76> ("x86/fpu: Remove internal.h dependency from fpu/signal.h").

Clean up the last one and remove the blank line.

Cc: Thomas Gleixner <[email protected]>
Cc: Borislav Petkov <[email protected]>
Signed-off-by: Shaokun Zhang <[email protected]>
---
arch/x86/include/asm/fpu/signal.h | 2 --
1 file changed, 2 deletions(-)

diff --git a/arch/x86/include/asm/fpu/signal.h b/arch/x86/include/asm/fpu/signal.h
index 22b0273a8bf1..2ec9df1d6daf 100644
--- a/arch/x86/include/asm/fpu/signal.h
+++ b/arch/x86/include/asm/fpu/signal.h
@@ -42,6 +42,4 @@ extern bool fpu__restore_sig(void __user *buf, int ia32_frame);

extern void restore_fpregs_from_fpstate(struct fpstate *fpstate, u64 mask);

-extern bool copy_fpstate_to_sigframe(void __user *buf, void __user *fp, int size);
-
#endif /* _ASM_X86_FPU_SIGNAL_H */
--
2.33.0



Subject: [tip: x86/cleanups] x86/fpu: Remove duplicate copy_fpstate_to_sigframe() prototype

The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID: 34c4aa156f810db51e9e97792ced52401d66655a
Gitweb: https://git.kernel.org/tip/34c4aa156f810db51e9e97792ced52401d66655a
Author: Shaokun Zhang <[email protected]>
AuthorDate: Thu, 09 Dec 2021 09:55:50 +08:00
Committer: Borislav Petkov <[email protected]>
CommitterDate: Fri, 10 Dec 2021 18:42:56 +01:00

x86/fpu: Remove duplicate copy_fpstate_to_sigframe() prototype

The function prototype of copy_fpstate_to_sigframe() is declared twice in

0ae67cc34f76 ("x86/fpu: Remove internal.h dependency from fpu/signal.h").

Remove one of them.

[ bp: Massage ]

Signed-off-by: Shaokun Zhang <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
arch/x86/include/asm/fpu/signal.h | 3 ---
1 file changed, 3 deletions(-)

diff --git a/arch/x86/include/asm/fpu/signal.h b/arch/x86/include/asm/fpu/signal.h
index 22b0273..e1c9df9 100644
--- a/arch/x86/include/asm/fpu/signal.h
+++ b/arch/x86/include/asm/fpu/signal.h
@@ -41,7 +41,4 @@ extern void fpu__clear_user_states(struct fpu *fpu);
extern bool fpu__restore_sig(void __user *buf, int ia32_frame);

extern void restore_fpregs_from_fpstate(struct fpstate *fpstate, u64 mask);
-
-extern bool copy_fpstate_to_sigframe(void __user *buf, void __user *fp, int size);
-
#endif /* _ASM_X86_FPU_SIGNAL_H */

Subject: [tip: x86/cleanups] x86/fpu: Remove duplicate copy_fpstate_to_sigframe() prototype

The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID: 20735d24adfe73c62f9482ae5b4f29cc5e00bbe8
Gitweb: https://git.kernel.org/tip/20735d24adfe73c62f9482ae5b4f29cc5e00bbe8
Author: Shaokun Zhang <[email protected]>
AuthorDate: Thu, 09 Dec 2021 09:55:50 +08:00
Committer: Borislav Petkov <[email protected]>
CommitterDate: Fri, 10 Dec 2021 19:13:06 +01:00

x86/fpu: Remove duplicate copy_fpstate_to_sigframe() prototype

The function prototype of copy_fpstate_to_sigframe() is declared twice in

0ae67cc34f76 ("x86/fpu: Remove internal.h dependency from fpu/signal.h").

Remove one of them.

[ bp: Massage ]

Signed-off-by: Shaokun Zhang <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
arch/x86/include/asm/fpu/signal.h | 3 ---
1 file changed, 3 deletions(-)

diff --git a/arch/x86/include/asm/fpu/signal.h b/arch/x86/include/asm/fpu/signal.h
index 22b0273..e1c9df9 100644
--- a/arch/x86/include/asm/fpu/signal.h
+++ b/arch/x86/include/asm/fpu/signal.h
@@ -41,7 +41,4 @@ extern void fpu__clear_user_states(struct fpu *fpu);
extern bool fpu__restore_sig(void __user *buf, int ia32_frame);

extern void restore_fpregs_from_fpstate(struct fpstate *fpstate, u64 mask);
-
-extern bool copy_fpstate_to_sigframe(void __user *buf, void __user *fp, int size);
-
#endif /* _ASM_X86_FPU_SIGNAL_H */