[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <871scs7vs9.fsf@concordia.ellerman.id.au>
Date: Wed, 27 Jun 2018 13:28:22 +1000
From: Michael Ellerman <mpe@...erman.id.au>
To: Mathieu Malaterre <malat@...ian.org>
Cc: Benjamin Herrenschmidt <benh@...nel.crashing.org>,
Paul Mackerras <paulus@...ba.org>,
Nicholas Piggin <npiggin@...il.com>,
linuxppc-dev <linuxppc-dev@...ts.ozlabs.org>,
LKML <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v3] powerpc/32: Remove left over function prototypes
Mathieu Malaterre <malat@...ian.org> writes:
> On Thu, Jun 21, 2018 at 1:27 PM Michael Ellerman <mpe@...erman.id.au> wrote:
>> Mathieu Malaterre <malat@...ian.org> writes:
>>
>> > In commit 4aea909eeba3 ("powerpc: Add missing prototypes in setup_32.c")
>>
>> I don't have that commit ^ ?
>>
>> That might be because I squashed some of your fixes together or something?
>
> I am doing an awful lots of mistakes these days. Indeed you've changed
> one of my patch:
>
> https://patchwork.kernel.org/patch/10240997/
>
> This one appeared after a git rebase on my side.
>
>> > diff --git a/arch/powerpc/kernel/setup.h b/arch/powerpc/kernel/setup.h
>> > index 35ca309848d7..829ed66f0a40 100644
>> > --- a/arch/powerpc/kernel/setup.h
>> > +++ b/arch/powerpc/kernel/setup.h
>> > @@ -19,9 +19,6 @@ void irqstack_early_init(void);
>> > void setup_power_save(void);
>> > unsigned long __init early_init(unsigned long dt_ptr);
>> > void __init machine_init(u64 dt_ptr);
>> > -int __init ppc_setup_l2cr(char *str);
>> > -int __init ppc_setup_l3cr(char *str);
>> > -int __init ppc_init(void);
>> > #else
>> > static inline void setup_power_save(void) { };
>> > #endif
>>
>> I have:
>>
>> #ifdef CONFIG_PPC32
>> void setup_power_save(void);
>> #else
>> static inline void setup_power_save(void) { };
>> #endif
>
> Correct.
>
> Sorry for the noise.
OK, no worries. Thanks for persisting.
cheers
Powered by blists - more mailing lists