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=-10.1 required=3.0 tests=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=ham 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 9CB5AFC6194 for ; Fri, 8 Nov 2019 12:37:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 673442245A for ; Fri, 8 Nov 2019 12:37:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573216646; bh=bl8Anm6Rqz7HjqQzPP31u/t+5AkUIY1BmvC0v6lRSTY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tz0AoCKdw+18pNhMB7kgpiwW9zrYoL2fuM1Roo625geUg+6r1TzfOE2XGEmei3r1j gEcncAPBQa1GAJY3h/Eknv+DzX4m1xWK6SuafuXkwVqZZJK/iUqSF9kTKzyiLuNFhO jKasfv9XClk5G9TR7OmjlCqSk24M/3v4tKecNGFs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726301AbfKHMh0 (ORCPT ); Fri, 8 Nov 2019 07:37:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:45046 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726192AbfKHMhZ (ORCPT ); Fri, 8 Nov 2019 07:37:25 -0500 Received: from localhost.localdomain (lfbn-mar-1-550-151.w90-118.abo.wanadoo.fr [90.118.131.151]) (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 4DF172248C; Fri, 8 Nov 2019 12:37:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573216645; bh=bl8Anm6Rqz7HjqQzPP31u/t+5AkUIY1BmvC0v6lRSTY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VUFqedtIEKvRDS9rEJx1l9uKpeXq0+llKkwJ4vQDL0jfBew8R6UXcyI8d/jVtJQHb 15oDMrra4HBL1nuDSJbKV06Rk6FZUNhBLh0GOT7udOhqSaUhybjFgJ1IE2+78QONEo nfal3TEVJezwx5QdUXR51GKYt7Qg2vnUs8kzNESM= From: Ard Biesheuvel To: stable@vger.kernel.org Cc: linus.walleij@linaro.org, rmk+kernel@armlinux.org.uk, Ard Biesheuvel Subject: [PATCH for-stable-4.4 46/50] ARM: clean up per-processor check_bugs method call Date: Fri, 8 Nov 2019 13:35:50 +0100 Message-Id: <20191108123554.29004-47-ardb@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191108123554.29004-1-ardb@kernel.org> References: <20191108123554.29004-1-ardb@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Russell King Commit 945aceb1db8885d3a35790cf2e810f681db52756 upstream. Call the per-processor type check_bugs() method in the same way as we do other per-processor functions - move the "processor." detail into proc-fns.h. Reviewed-by: Julien Thierry Signed-off-by: Russell King Signed-off-by: David A. Long Reviewed-by: Julien Thierry Signed-off-by: Sasha Levin Signed-off-by: Ard Biesheuvel --- arch/arm/include/asm/proc-fns.h | 1 + arch/arm/kernel/bugs.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/proc-fns.h b/arch/arm/include/asm/proc-fns.h index f379f5f849a9..19939e88efca 100644 --- a/arch/arm/include/asm/proc-fns.h +++ b/arch/arm/include/asm/proc-fns.h @@ -99,6 +99,7 @@ extern void cpu_do_suspend(void *); extern void cpu_do_resume(void *); #else #define cpu_proc_init processor._proc_init +#define cpu_check_bugs processor.check_bugs #define cpu_proc_fin processor._proc_fin #define cpu_reset processor.reset #define cpu_do_idle processor._do_idle diff --git a/arch/arm/kernel/bugs.c b/arch/arm/kernel/bugs.c index 7be511310191..d41d3598e5e5 100644 --- a/arch/arm/kernel/bugs.c +++ b/arch/arm/kernel/bugs.c @@ -6,8 +6,8 @@ void check_other_bugs(void) { #ifdef MULTI_CPU - if (processor.check_bugs) - processor.check_bugs(); + if (cpu_check_bugs) + cpu_check_bugs(); #endif } -- 2.20.1