From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752628AbeDHTn1 (ORCPT ); Sun, 8 Apr 2018 15:43:27 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:33329 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752137AbeDHTn0 (ORCPT ); Sun, 8 Apr 2018 15:43:26 -0400 X-Google-Smtp-Source: AIpwx4/gDTxNKgYWTGlgFigFTjk3hVh9sorjd9RNsOyYdiCyCSfiXmujRJpPDDbhKJcHk8qtRl09Pg== From: Mathieu Malaterre To: Michael Ellerman Cc: Mathieu Malaterre , Benjamin Herrenschmidt , Paul Mackerras , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH] powerpc/32: Make some functions static Date: Sun, 8 Apr 2018 21:43:18 +0200 Message-Id: <20180408194318.8062-1-malat@debian.org> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In commit 4aea909eeba3 ("powerpc: Add missing prototypes in setup_32.c") prototypes for - ppc_setup_l2cr - ppc_setup_l3cr - ppc_init were added but at the same time in commit d15a261d876d ("powerpc/32: Make some functions static") those same functions were made static. Fix conflicting changes by removing the prototypes and leave the function as static. Fix the following warnings, treated as errors with W=1: arch/powerpc/kernel/setup_32.c:127:19: error: static declaration of ‘ppc_setup_l2cr’ follows non-static declaration arch/powerpc/kernel/setup_32.c:140:19: error: static declaration of ‘ppc_setup_l3cr’ follows non-static declaration arch/powerpc/kernel/setup_32.c:186:19: error: static declaration of ‘ppc_init’ follows non-static declaration Signed-off-by: Mathieu Malaterre --- arch/powerpc/kernel/setup_32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index 9827b6b3aaaa..9e79be13b937 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c @@ -124,7 +124,7 @@ notrace void __init machine_init(u64 dt_ptr) } /* Checks "l2cr=xxxx" command-line option */ -static int __init ppc_setup_l2cr(char *str) +int __init ppc_setup_l2cr(char *str) { if (cpu_has_feature(CPU_FTR_L2CR)) { unsigned long val = simple_strtoul(str, NULL, 0); @@ -137,7 +137,7 @@ static int __init ppc_setup_l2cr(char *str) __setup("l2cr=", ppc_setup_l2cr); /* Checks "l3cr=xxxx" command-line option */ -static int __init ppc_setup_l3cr(char *str) +int __init ppc_setup_l3cr(char *str) { if (cpu_has_feature(CPU_FTR_L3CR)) { unsigned long val = simple_strtoul(str, NULL, 0); @@ -183,7 +183,7 @@ EXPORT_SYMBOL(nvram_sync); #endif /* CONFIG_NVRAM */ -static int __init ppc_init(void) +int __init ppc_init(void) { /* clear the progress line */ if (ppc_md.progress) -- 2.11.0