lkml.org 
[lkml]   [2023]   [Jan]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH] ia64: Fix build error due to switch case label appearing next to declaration
On Tue, 17 Jan 2023 15:16:32 +0000 James Morse <james.morse@arm.com> 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);
>
> ...
>
> @@ -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);
> }
>

Huh, how did that sneak through. We usually use an extra set of braces
for this.

Thanks, I'll add cc:stable to this.

\
 
 \ /
  Last update: 2023-03-26 23:45    [W:0.048 / U:18.916 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site