From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49128C4345E for ; Tue, 14 Jul 2020 14:41:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1F9422082F for ; Tue, 14 Jul 2020 14:41:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594737665; bh=hefa8JMmSI12GUN8k4OJXtkfvq+zxJV0gbxbA/x2908=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LP/J5xKf6MxkZ2HcNq+tAdv7iKJG9KFJi9o/AKD4UTKktecDZxzqRYIefPodzfybW q8bcRi+UmF5XBQeeVXTAjZMxCDD8d7Rmd3AYGDFcarPRkeIj9Ksv8QXe6T6pc3VExm YJ9usKWE0htOv0Q3SE9ZzyRpwJOyZ2jvCjANZqW8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729480AbgGNOlD (ORCPT ); Tue, 14 Jul 2020 10:41:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:56388 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729378AbgGNOk3 (ORCPT ); Tue, 14 Jul 2020 10:40:29 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9BA84206F5; Tue, 14 Jul 2020 14:40:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594737629; bh=hefa8JMmSI12GUN8k4OJXtkfvq+zxJV0gbxbA/x2908=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vyXk5XNvds51txD2RKKXWvw7nIM0gFLfELTXSxfycTw6bCeFk401NCpN99CHk1epW DXwSZTtH9sXVPEzXVJ8xev147PAEh6MJ7Q4f+ubSb9J+iR/VM/ad5SWVB7QViyQZzB m0R9qZbWNwE/5tbLoLmQAfAHKhDOJq2DdP2tl4Ms= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Max Filippov , Sasha Levin , linux-xtensa@linux-xtensa.org Subject: [PATCH AUTOSEL 4.4 4/9] xtensa: fix __sync_fetch_and_{and,or}_4 declarations Date: Tue, 14 Jul 2020 10:40:18 -0400 Message-Id: <20200714144024.4036118-4-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200714144024.4036118-1-sashal@kernel.org> References: <20200714144024.4036118-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Max Filippov [ 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 Signed-off-by: Sasha Levin --- arch/xtensa/kernel/xtensa_ksyms.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/xtensa/kernel/xtensa_ksyms.c b/arch/xtensa/kernel/xtensa_ksyms.c index e2dd9109df633..00f17b5ec9c92 100644 --- a/arch/xtensa/kernel/xtensa_ksyms.c +++ b/arch/xtensa/kernel/xtensa_ksyms.c @@ -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(); } -- 2.25.1