Skip to content

Commit c966483

Browse files
arndbhansendc
authored andcommitted
x86: Avoid missing-prototype warnings for doublefault code
Two functions in the 32-bit doublefault code are lacking a prototype: arch/x86/kernel/doublefault_32.c:23:36: error: no previous prototype for 'doublefault_shim' [-Werror=missing-prototypes] 23 | asmlinkage noinstr void __noreturn doublefault_shim(void) | ^~~~~~~~~~~~~~~~ arch/x86/kernel/doublefault_32.c:114:6: error: no previous prototype for 'doublefault_init_cpu_tss' [-Werror=missing-prototypes] 114 | void doublefault_init_cpu_tss(void) The first one is only called from assembler, while the second one is declared in doublefault.h, but this file is not included. Include the header file and add the other declaration there as well. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Reviewed-by: Alexander Lobakin <aleksander.lobakin@intel.com> Link: https://lore.kernel.org/all/20230516193549.544673-8-arnd%40kernel.org
1 parent 16db7e9 commit c966483

2 files changed

Lines changed: 5 additions & 0 deletions

File tree

arch/x86/include/asm/doublefault.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
#ifndef _ASM_X86_DOUBLEFAULT_H
33
#define _ASM_X86_DOUBLEFAULT_H
44

5+
#include <linux/linkage.h>
6+
57
#ifdef CONFIG_X86_32
68
extern void doublefault_init_cpu_tss(void);
79
#else
@@ -10,4 +12,6 @@ static inline void doublefault_init_cpu_tss(void)
1012
}
1113
#endif
1214

15+
asmlinkage void __noreturn doublefault_shim(void);
16+
1317
#endif /* _ASM_X86_DOUBLEFAULT_H */

arch/x86/kernel/doublefault_32.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <asm/processor.h>
1010
#include <asm/desc.h>
1111
#include <asm/traps.h>
12+
#include <asm/doublefault.h>
1213

1314
#define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
1415

0 commit comments

Comments
 (0)