Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <4312c1f9-7926-6dc3-6a28-049612354d39@physik.fu-berlin.de>
Date:   Tue, 17 Jan 2023 16:44:10 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.6.1
Subject: Re: [PATCH] ia64: Fix build error due to switch case label appearing
 next to declaration
Content-Language: en-US
To:     James Morse <james.morse@arm.com>, linux-ia64@vger.kernel.org,
        linux-kernel@vger.kernel.org
Cc:     Sergei Trofimovich <slyich@gmail.com>,
        matoro <matoro_mailinglist_kernel@matoro.tk>,
        =?UTF-8?Q?=c3=89meric_Maschino?= <emeric.maschino@gmail.com>,
        Andrew Morton <akpm@linux-foundation.org>
References: <20230117151632.393836-1-james.morse@arm.com>
From:   John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
In-Reply-To: <20230117151632.393836-1-james.morse@arm.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

Hi James!

On 1/17/23 16:16, James Morse wrote:
> Since commit aa06a9bd8533 ("ia64: fix clock_getres(CLOCK_MONOTONIC) to
> report ITC frequency"), gcc 10.1.0 fails to build ia64 with the gnomic:
> | ../arch/ia64/kernel/sys_ia64.c: In function 'ia64_clock_getres':
> | ../arch/ia64/kernel/sys_ia64.c:189:3: error: a label can only be part of a statement and a declaration is not a statement
> |   189 |   s64 tick_ns = DIV_ROUND_UP(NSEC_PER_SEC, local_cpu_data->itc_freq);
> 
> This line appears immediately after a case label in a switch.
> 
> Move the declarations out of the case, to the top of the function.
> 
> Fixes: aa06a9bd8533 ("ia64: fix clock_getres(CLOCK_MONOTONIC) to report ITC frequency")
> Signed-off-by: James Morse <james.morse@arm.com>
> ---
> Found when build testing another series.
> I've only build tested this.
> 
>   arch/ia64/kernel/sys_ia64.c | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
> index f6a502e8f02c..6e948d015332 100644
> --- a/arch/ia64/kernel/sys_ia64.c
> +++ b/arch/ia64/kernel/sys_ia64.c
> @@ -170,6 +170,9 @@ ia64_mremap (unsigned long addr, unsigned long old_len, unsigned long new_len, u
>   asmlinkage long
>   ia64_clock_getres(const clockid_t which_clock, struct __kernel_timespec __user *tp)
>   {
> +	struct timespec64 rtn_tp;
> +	s64 tick_ns;
> +
>   	/*
>   	 * ia64's clock_gettime() syscall is implemented as a vdso call
>   	 * fsys_clock_gettime(). Currently it handles only
> @@ -185,8 +188,8 @@ ia64_clock_getres(const clockid_t which_clock, struct __kernel_timespec __user *
>   	switch (which_clock) {
>   	case CLOCK_REALTIME:
>   	case CLOCK_MONOTONIC:
> -		s64 tick_ns = DIV_ROUND_UP(NSEC_PER_SEC, local_cpu_data->itc_freq);
> -		struct timespec64 rtn_tp = ns_to_timespec64(tick_ns);
> +		tick_ns = DIV_ROUND_UP(NSEC_PER_SEC, local_cpu_data->itc_freq);
> +		rtn_tp = ns_to_timespec64(tick_ns);
>   		return put_timespec64(&rtn_tp, tp);
>   	}
>   

Thanks for the patch. I just gave it a try and it didn't make any difference for me.

The kernel builds fine in both cases (with CONFIG_WERROR disabled) on 6e50979a9c87.

I can boot-test the patch later tonight with my RX2600 at home.

Adrian

-- 
  .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer
`. `'   Physicist
   `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913