linux-kernel - Re: linux-next: build failure after merge of the net-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Wed, 19 Jun 2019 15:09:44 +0000
From:   Kevin 'ldir' Darbyshire-Bryant <ldir@...byshire-bryant.me.uk>
To:     David Miller <davem@...emloft.net>
CC:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Networking <netdev@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        "yamada.masahiro@...ionext.com" <yamada.masahiro@...ionext.com>
Subject: Re: linux-next: build failure after merge of the net-next tree



> On 19 Jun 2019, at 15:13, David Miller <davem@...emloft.net> wrote:
> 
> 
> I've fixed this as follows, thanks:
> 
> ====================
> From 23cdf8752b26d4edbd60a6293bca492d83192d4d Mon Sep 17 00:00:00 2001
> From: "David S. Miller" <davem@...emloft.net>
> Date: Wed, 19 Jun 2019 10:12:58 -0400
> Subject: [PATCH] act_ctinfo: Don't use BIT() in UAPI headers.
> 
> Use _BITUL() instead.
> 
> Reported-by: Stephen Rothwell <sfr@...b.auug.org.au>
> Signed-off-by: David S. Miller <davem@...emloft.net>
> ---
> include/uapi/linux/tc_act/tc_ctinfo.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/include/uapi/linux/tc_act/tc_ctinfo.h b/include/uapi/linux/tc_act/tc_ctinfo.h
> index da803e05a89b..32337304fbe5 100644
> --- a/include/uapi/linux/tc_act/tc_ctinfo.h
> +++ b/include/uapi/linux/tc_act/tc_ctinfo.h
> @@ -27,8 +27,8 @@ enum {
> #define TCA_CTINFO_MAX (__TCA_CTINFO_MAX - 1)
> 
> enum {
> -	CTINFO_MODE_DSCP	= BIT(0),
> -	CTINFO_MODE_CPMARK	= BIT(1)
> +	CTINFO_MODE_DSCP	= _BITUL(0),
> +	CTINFO_MODE_CPMARK	= _BITUL(1)
> };
> 
> #endif
> --
> 2.20.1
> 

Hi David,

Thanks for that.  Owe you a beer!

Thinking out loud, doesn’t this also require:

#include <linux/const.h>


Or at least iproute2 would need to know about _BITUL as it doesn’t at present.
Which also means iproute2’s Linux uapi shadow would also have to import
linux/const.h.  Or have I got wrong end of stick?

Cheers,

Kevin



Download attachment "signature.asc" of type "application/pgp-signature" (834 bytes)