Skip to content

Commit 133789d

Browse files
author
Russell King (Oracle)
committed
Revert part of ae1f8d7 ("ARM: 9304/1: add prototype for function called only from asm")
The build bot reports: >> arch/arm/vfp/vfpmodule.c:324:13: error: static declaration of 'VFP_bounce' follows non-static declaration static void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs) ^ arch/arm/include/asm/vfp.h:105:6: note: previous declaration is here void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs); ^ 1 error generated. This is due to a merge conflict between commit ae1f8d7 ("ARM: 9304/1: add prototype for function called only from asm") and Ard's commit 4708fb0 ("ARM: vfp: Reimplement VFP exception entry in C code"). Fix this by removing Arnd's change. No need to backport. Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202308150547.m54XHV12-lkp@intel.com/ Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
1 parent f493fed commit 133789d

File tree

1 file changed

+0
-1
lines changed
  • arch/arm/include/asm

1 file changed

+0
-1
lines changed

arch/arm/include/asm/vfp.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@
102102

103103
#ifndef __ASSEMBLY__
104104
void vfp_disable(void);
105-
void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs);
106105
#endif
107106

108107
#endif /* __ASM_VFP_H */

0 commit comments

Comments
 (0)