From patchwork Thu Mar 22 20:20:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Malaterre X-Patchwork-Id: 889599 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=kvm-ppc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="swAvjcV3"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 406dNc1TDkz9s3F for ; Fri, 23 Mar 2018 07:21:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752347AbeCVUVS (ORCPT ); Thu, 22 Mar 2018 16:21:18 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:40054 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752317AbeCVUVO (ORCPT ); Thu, 22 Mar 2018 16:21:14 -0400 Received: by mail-wr0-f196.google.com with SMTP id z8so9984482wrh.7; Thu, 22 Mar 2018 13:21:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=H1wD9jdgbLj2ktVat8+wW6wU+w6yUGjYesVPlwYPmtw=; b=swAvjcV3iUmYZcN2jAVsJh8lx+4P0UQMDTaUWppolnHO+qgqjDVykTqcqQm0Bl0F9w BgeQ9QpgkRmmptB2U8N9u4Sq8C21/wSNCKRXhilgO2iVqDwj3rITEjvhFABVsicPsE12 Plh9wym0N+3eiiaPfrumRbQfeD7bgIzloJr0aZEJmvFzUkC6D8Um+iALlIAvr+hxMdDe 8fQoJVIqRidTAsAes8Y0aanWshh6uIF4ttGvksDcs4rhug7fSDsnZ6in4A2BCWIeVcY2 Z/2yCvqszsT1KTR7sFfRBmgX5MBpv8GDQH27/n7HxfJeNuwhhqjKSNOa0rj1+Znoej1M O+2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=H1wD9jdgbLj2ktVat8+wW6wU+w6yUGjYesVPlwYPmtw=; b=CmfaL+co7ua4cypEpdpn6AqRK6eHCSMqTxsEnIjkX/NsOCiF8s0VqJFTc+mONDP900 2kuKyGzLvrhaR5ZawYFX1M6FipjOWHPBfCXsfzieMNqf0m5p4Zvr9G1mpzaL3lWnW/Lk Ty8YSIo5Ui2dqvLFckLtiyIS2juJyAVrZDqU27yppZDNcBihM+FSYONBKEg0s50C2GBM GHKQvUruTmYYwTdMERk97fiX8nf337quveZUIAMkxvKV29m4RjmxDHTgQNZqSctWVsSd 23DXdh36aKkudgc+jWbPm5gpi3RC4DG2K3CQYn1/cUl5l5aBmfCOAr0/fQUaRiJDpJaL iRzQ== X-Gm-Message-State: AElRT7EkA77qA+zFEUj49cw2f1+2r4ZktubHk9GZ8rGBoACQhC3tdpIG hUXLGA0MPti9xQlXJOC5rBg= X-Google-Smtp-Source: AG47ELswrI0VBHmtWchCXOka+8EUPVZMAH13pmXGH++DEqrAs2l+ugGI66QOAOyGkjRu5Uaecp4SVg== X-Received: by 10.223.189.14 with SMTP id j14mr9981348wrh.138.1521750072965; Thu, 22 Mar 2018 13:21:12 -0700 (PDT) Received: from macbookpro.malat.net (bru31-1-78-225-226-121.fbx.proxad.net. [78.225.226.121]) by smtp.gmail.com with ESMTPSA id m184sm6957115wme.40.2018.03.22.13.21.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Mar 2018 13:21:12 -0700 (PDT) Received: by macbookpro.malat.net (Postfix, from userid 1000) id 74C8610C03A5; Thu, 22 Mar 2018 21:21:11 +0100 (CET) From: Mathieu Malaterre To: Michael Ellerman Cc: Mathieu Malaterre , Benjamin Herrenschmidt , Paul Mackerras , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, kvm-ppc@vger.kernel.org Subject: [PATCH 19/19] powerpc/tau: Synchronize function prototypes and body Date: Thu, 22 Mar 2018 21:20:05 +0100 Message-Id: <20180322202007.23088-20-malat@debian.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180322202007.23088-1-malat@debian.org> References: <20180322202007.23088-1-malat@debian.org> MIME-Version: 1.0 Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org Some function prototypes and body for Thermal Assist Units were not in sync. Update the function definition to match the existing function declaration found in `setup-common.c`, changing an `int` return type to a `u32` return type. Move the prototypes to a header file. Fix the following warnings, treated as error with W=1: arch/powerpc/kernel/tau_6xx.c:257:5: error: no previous prototype for ‘cpu_temp_both’ [-Werror=missing-prototypes] arch/powerpc/kernel/tau_6xx.c:262:5: error: no previous prototype for ‘cpu_temp’ [-Werror=missing-prototypes] arch/powerpc/kernel/tau_6xx.c:267:5: error: no previous prototype for ‘tau_interrupts’ [-Werror=missing-prototypes] Compile tested with CONFIG_TAU_INT. Signed-off-by: Mathieu Malaterre --- arch/powerpc/kernel/irq.c | 2 +- arch/powerpc/kernel/setup-common.c | 6 ------ arch/powerpc/kernel/setup.h | 6 ++++++ arch/powerpc/kernel/tau_6xx.c | 7 +++++-- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index f88038847790..3777b6e09142 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c @@ -89,7 +89,7 @@ atomic_t ppc_n_lost_interrupts; #ifdef CONFIG_TAU_INT extern int tau_initialized; -extern int tau_interrupts(int); +extern u32 tau_interrupts(unsigned long cpu); #endif #endif /* CONFIG_PPC32 */ diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index d73ec518ef80..bd3675c3984b 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -192,12 +192,6 @@ void machine_halt(void) machine_hang(); } - -#ifdef CONFIG_TAU -extern u32 cpu_temp(unsigned long cpu); -extern u32 cpu_temp_both(unsigned long cpu); -#endif /* CONFIG_TAU */ - #ifdef CONFIG_SMP DEFINE_PER_CPU(unsigned int, cpu_pvr); #endif diff --git a/arch/powerpc/kernel/setup.h b/arch/powerpc/kernel/setup.h index d768023a04bd..3c9c19430439 100644 --- a/arch/powerpc/kernel/setup.h +++ b/arch/powerpc/kernel/setup.h @@ -70,4 +70,10 @@ void kvm_cma_reserve(void); static inline void kvm_cma_reserve(void) { }; #endif +#ifdef CONFIG_TAU +extern u32 cpu_temp(unsigned long cpu); +extern u32 cpu_temp_both(unsigned long cpu); +extern u32 tau_interrupts(unsigned long cpu); +#endif /* CONFIG_TAU */ + #endif /* __ARCH_POWERPC_KERNEL_SETUP_H */ diff --git a/arch/powerpc/kernel/tau_6xx.c b/arch/powerpc/kernel/tau_6xx.c index 1fc6a89a978e..e2ab8a111b69 100644 --- a/arch/powerpc/kernel/tau_6xx.c +++ b/arch/powerpc/kernel/tau_6xx.c @@ -27,6 +27,9 @@ #include #include #include +#include + +#include "setup.h" static struct tau_temp { @@ -259,12 +262,12 @@ u32 cpu_temp_both(unsigned long cpu) return ((tau[cpu].high << 16) | tau[cpu].low); } -int cpu_temp(unsigned long cpu) +u32 cpu_temp(unsigned long cpu) { return ((tau[cpu].high + tau[cpu].low) / 2); } -int tau_interrupts(unsigned long cpu) +u32 tau_interrupts(unsigned long cpu) { return (tau[cpu].interrupts); }