diff options
| author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2023-08-14 23:22:51 +0100 |
|---|---|---|
| committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2023-08-15 10:07:48 +0100 |
| commit | 133789d4a458c761f60ef71cc5a6ede5a617ed7e (patch) | |
| tree | d07bfe4b9a4dcd4e6343e57c3dad20d0d01d5713 /arch/arm/include/asm/vfp.h | |
| parent | f493fedcc3016e46ecbf7ab9490ba4762723efab (diff) | |
Revert part of ae1f8d793a19 ("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 ae1f8d793a19 ("ARM:
9304/1: add prototype for function called only from asm") and Ard's
commit 4708fb041346 ("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>
Diffstat (limited to 'arch/arm/include/asm/vfp.h')
| -rw-r--r-- | arch/arm/include/asm/vfp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/include/asm/vfp.h b/arch/arm/include/asm/vfp.h index 5b57b8768bac..157ea3426158 100644 --- a/arch/arm/include/asm/vfp.h +++ b/arch/arm/include/asm/vfp.h @@ -102,7 +102,6 @@ #ifndef __ASSEMBLY__ void vfp_disable(void); -void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs); #endif #endif /* __ASM_VFP_H */ |