Commit 068dae90 authored Jun 04, 2020 by Max Filippov Committed by Greg Kroah-Hartman Jul 31, 2020

xtensa: fix __sync_fetch_and_{and,or}_4 declarations



[ Upstream commit 73f9941306d5ce030f3ffc7db425c7b2a798cf8e ]

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 <jcmvbkbc@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent f7a44712

arch/xtensa/kernel/xtensa_ksyms.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -82,13 +82,13 @@ void __xtensa_libgcc_window_spill(void)
		}
		EXPORT_SYMBOL(__xtensa_libgcc_window_spill);

		unsigned long __sync_fetch_and_and_4(unsigned long *p, unsigned long v)
		unsigned int __sync_fetch_and_and_4(volatile void *p, unsigned int v)
		{
		BUG();
		}
		EXPORT_SYMBOL(__sync_fetch_and_and_4);

		unsigned long __sync_fetch_and_or_4(unsigned long *p, unsigned long v)
		unsigned int __sync_fetch_and_or_4(volatile void *p, unsigned int v)
		{
		BUG();
		}