Message ID | 20210425122222.223839-1-erik@flodin.me (mailing list archive) |
---|---|
State | Superseded |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [v3] can: proc: fix rcvlist_* header alignment on 64-bit system | expand |
Context | Check | Description |
---|---|---|
netdev/tree_selection | success | Series ignored based on subject |
On 25.04.2021 14:22:12, Erik Flodin wrote: > Before this fix, the function and userdata columns weren't aligned: > device can_id can_mask function userdata matches ident > vcan0 92345678 9fffffff 0000000000000000 0000000000000000 0 raw > vcan0 123 00000123 0000000000000000 0000000000000000 0 raw > > After the fix they are: > device can_id can_mask function userdata matches ident > vcan0 92345678 9fffffff 0000000000000000 0000000000000000 0 raw > vcan0 123 00000123 0000000000000000 0000000000000000 0 raw > > Signed-off-by: Erik Flodin <erik@flodin.me> > --- > net/can/proc.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/net/can/proc.c b/net/can/proc.c > index 5ea8695f507e..35b6c7512785 100644 > --- a/net/can/proc.c > +++ b/net/can/proc.c > @@ -205,8 +205,11 @@ static void can_print_recv_banner(struct seq_file *m) > * can1. 00000000 00000000 00000000 > * ....... 0 tp20 > */ > - seq_puts(m, " device can_id can_mask function" > - " userdata matches ident\n"); > +#ifdef CONFIG_64BIT > + seq_puts(m, " device can_id can_mask function userdata matches ident\n"); > +#else > + seq_puts(m, " device can_id can_mask function userdata matches ident\n"); > +#endif Please use "if (IS_ENABLED(CONFIG_64BIT))" as in your example in your previous mail. Marc
Hi, On Sun, 25 Apr 2021 at 14:27, Marc Kleine-Budde <mkl@pengutronix.de> wrote: > > On 25.04.2021 14:22:12, Erik Flodin wrote: > > Before this fix, the function and userdata columns weren't aligned: > > device can_id can_mask function userdata matches ident > > vcan0 92345678 9fffffff 0000000000000000 0000000000000000 0 raw > > vcan0 123 00000123 0000000000000000 0000000000000000 0 raw > > > > After the fix they are: > > device can_id can_mask function userdata matches ident > > vcan0 92345678 9fffffff 0000000000000000 0000000000000000 0 raw > > vcan0 123 00000123 0000000000000000 0000000000000000 0 raw > > > > Signed-off-by: Erik Flodin <erik@flodin.me> > > --- > > net/can/proc.c | 7 +++++-- > > 1 file changed, 5 insertions(+), 2 deletions(-) > > > > diff --git a/net/can/proc.c b/net/can/proc.c > > index 5ea8695f507e..35b6c7512785 100644 > > --- a/net/can/proc.c > > +++ b/net/can/proc.c > > @@ -205,8 +205,11 @@ static void can_print_recv_banner(struct seq_file *m) > > * can1. 00000000 00000000 00000000 > > * ....... 0 tp20 > > */ > > - seq_puts(m, " device can_id can_mask function" > > - " userdata matches ident\n"); > > +#ifdef CONFIG_64BIT > > + seq_puts(m, " device can_id can_mask function userdata matches ident\n"); > > +#else > > + seq_puts(m, " device can_id can_mask function userdata matches ident\n"); > > +#endif > > Please use "if (IS_ENABLED(CONFIG_64BIT))" as in your example in your > previous mail. Ok. I've sent a new patch, but of course I forgot to add -v4. Sorry about that. // Erik
diff --git a/net/can/proc.c b/net/can/proc.c index 5ea8695f507e..35b6c7512785 100644 --- a/net/can/proc.c +++ b/net/can/proc.c @@ -205,8 +205,11 @@ static void can_print_recv_banner(struct seq_file *m) * can1. 00000000 00000000 00000000 * ....... 0 tp20 */ - seq_puts(m, " device can_id can_mask function" - " userdata matches ident\n"); +#ifdef CONFIG_64BIT + seq_puts(m, " device can_id can_mask function userdata matches ident\n"); +#else + seq_puts(m, " device can_id can_mask function userdata matches ident\n"); +#endif } static int can_stats_proc_show(struct seq_file *m, void *v)
Before this fix, the function and userdata columns weren't aligned: device can_id can_mask function userdata matches ident vcan0 92345678 9fffffff 0000000000000000 0000000000000000 0 raw vcan0 123 00000123 0000000000000000 0000000000000000 0 raw After the fix they are: device can_id can_mask function userdata matches ident vcan0 92345678 9fffffff 0000000000000000 0000000000000000 0 raw vcan0 123 00000123 0000000000000000 0000000000000000 0 raw Signed-off-by: Erik Flodin <erik@flodin.me> --- net/can/proc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)