Skip to content

Commit 73f9941

Browse files
committed
xtensa: fix __sync_fetch_and_{and,or}_4 declarations
Building xtensa kernel with gcc-10 produces the following warnings: arch/xtensa/kernel/xtensa_ksyms.c:90:15: warning: conflicting types for built-in function ‘__sync_fetch_and_and_4’; expected ‘unsigned int(volatile void *, unsigned int)’ [-Wbuiltin-declaration-mismatch] arch/xtensa/kernel/xtensa_ksyms.c:96:15: warning: conflicting types for built-in function ‘__sync_fetch_and_or_4’; expected ‘unsigned int(volatile void *, unsigned int)’ [-Wbuiltin-declaration-mismatch] Fix declarations of these functions to avoid the warning. Signed-off-by: Max Filippov <[email protected]>
1 parent 9ebcfad commit 73f9941

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/xtensa/kernel/xtensa_ksyms.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@ void __xtensa_libgcc_window_spill(void)
8787
}
8888
EXPORT_SYMBOL(__xtensa_libgcc_window_spill);
8989

90-
unsigned long __sync_fetch_and_and_4(unsigned long *p, unsigned long v)
90+
unsigned int __sync_fetch_and_and_4(volatile void *p, unsigned int v)
9191
{
9292
BUG();
9393
}
9494
EXPORT_SYMBOL(__sync_fetch_and_and_4);
9595

96-
unsigned long __sync_fetch_and_or_4(unsigned long *p, unsigned long v)
96+
unsigned int __sync_fetch_and_or_4(volatile void *p, unsigned int v)
9797
{
9898
BUG();
9999
}

0 commit comments

Comments
 (0)