From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752312AbdGDN71 (ORCPT ); Tue, 4 Jul 2017 09:59:27 -0400 Received: from terminus.zytor.com ([65.50.211.136]:40343 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752038AbdGDN70 (ORCPT ); Tue, 4 Jul 2017 09:59:26 -0400 Date: Tue, 4 Jul 2017 06:57:56 -0700 From: tip-bot for Colin Ian King Message-ID: Cc: colin.king@canonical.com, hpa@zytor.com, sivanich@sgi.com, douly.fnst@cn.fujitsu.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, abanman@hpe.com, mingo@kernel.org, mike.travis@hpe.com Reply-To: mike.travis@hpe.com, mingo@kernel.org, abanman@hpe.com, linux-kernel@vger.kernel.org, douly.fnst@cn.fujitsu.com, tglx@linutronix.de, sivanich@sgi.com, colin.king@canonical.com, hpa@zytor.com In-Reply-To: <20170704083129.10559-1-colin.king@canonical.com> References: <20170704083129.10559-1-colin.king@canonical.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/platform/uv/BAU: Minor cleanup, make some local functions static Git-Commit-ID: 5122daa017578ebc4818de8fb3c9d0e131f8b335 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 5122daa017578ebc4818de8fb3c9d0e131f8b335 Gitweb: http://git.kernel.org/tip/5122daa017578ebc4818de8fb3c9d0e131f8b335 Author: Colin Ian King AuthorDate: Tue, 4 Jul 2017 09:31:29 +0100 Committer: Thomas Gleixner CommitDate: Tue, 4 Jul 2017 15:52:37 +0200 x86/platform/uv/BAU: Minor cleanup, make some local functions static The functions handle_uv2_busy, uv_flush_send_and_wait and find_another_by_swack are local to the source, so make them static. Also remove normal_busy as it is no longer used. Fixes various smatch warnings, such as: "symbol 'find_another_by_swack' was not declared. Should it be static?" "symbol 'handle_uv2_busy' was not declared. Should it be static?" Signed-off-by: Colin Ian King Signed-off-by: Thomas Gleixner Cc: Mike Travis Cc: Andrew Banman Cc: kernel-janitors@vger.kernel.org Cc: Dimitri Sivanich Cc: Dou Liyang Link: http://lkml.kernel.org/r/20170704083129.10559-1-colin.king@canonical.com --- arch/x86/platform/uv/tlb_uv.c | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c index 2983faa..d4a61dd 100644 --- a/arch/x86/platform/uv/tlb_uv.c +++ b/arch/x86/platform/uv/tlb_uv.c @@ -588,31 +588,11 @@ static unsigned long uv2_3_read_status(unsigned long offset, int rshft, int desc } /* - * Return whether the status of the descriptor that is normally used for this - * cpu (the one indexed by its hub-relative cpu number) is busy. - * The status of the original 32 descriptors is always reflected in the 64 - * bits of UVH_LB_BAU_SB_ACTIVATION_STATUS_0. - * The bit provided by the activation_status_2 register is irrelevant to - * the status if it is only being tested for busy or not busy. - */ -int normal_busy(struct bau_control *bcp) -{ - int cpu = bcp->uvhub_cpu; - int mmr_offset; - int right_shift; - - mmr_offset = UVH_LB_BAU_SB_ACTIVATION_STATUS_0; - right_shift = cpu * UV_ACT_STATUS_SIZE; - return (((((read_lmmr(mmr_offset) >> right_shift) & - UV_ACT_STATUS_MASK)) << 1) == UV2H_DESC_BUSY); -} - -/* * Entered when a bau descriptor has gone into a permanent busy wait because * of a hardware bug. * Workaround the bug. */ -int handle_uv2_busy(struct bau_control *bcp) +static int handle_uv2_busy(struct bau_control *bcp) { struct ptc_stats *stat = bcp->statp; @@ -917,8 +897,9 @@ static void handle_cmplt(int completion_status, struct bau_desc *bau_desc, * Returns 1 if it gives up entirely and the original cpu mask is to be * returned to the kernel. */ -int uv_flush_send_and_wait(struct cpumask *flush_mask, struct bau_control *bcp, - struct bau_desc *bau_desc) +static int uv_flush_send_and_wait(struct cpumask *flush_mask, + struct bau_control *bcp, + struct bau_desc *bau_desc) { int seq_number = 0; int completion_stat = 0; @@ -1212,8 +1193,8 @@ const struct cpumask *uv_flush_tlb_others(const struct cpumask *cpumask, * Search the message queue for any 'other' unprocessed message with the * same software acknowledge resource bit vector as the 'msg' message. */ -struct bau_pq_entry *find_another_by_swack(struct bau_pq_entry *msg, - struct bau_control *bcp) +static struct bau_pq_entry *find_another_by_swack(struct bau_pq_entry *msg, + struct bau_control *bcp) { struct bau_pq_entry *msg_next = msg + 1; unsigned char swack_vec = msg->swack_vec;