diff mbox

[U-Boot,v1,01/41] bitops.h: Include bitsperlong.h as needed for GENMASK_ULL

Message ID 20170321142802.24276-2-sr@denx.de
State Accepted
Commit e1b27d27a64d3b007c877f48a1aa106d228db7fc
Delegated to: Stefan Roese
Headers show

Commit Message

Stefan Roese March 21, 2017, 2:27 p.m. UTC
The macro GENMASK_ULL needs the BITS_PER_LONG_LONG macro which is
defined in the bitsperlong.h header. Lets include this header as
the upcoming A7k/8k support in the Marvell mvpp2 ethernet driver
uses this macro.

Signed-off-by: Stefan Roese <sr@denx.de>
---

 include/linux/bitops.h | 1 +
 1 file changed, 1 insertion(+)

Comments

Tom Rini March 21, 2017, 3:02 p.m. UTC | #1
On Tue, Mar 21, 2017 at 03:27:22PM +0100, Stefan Roese wrote:

> The macro GENMASK_ULL needs the BITS_PER_LONG_LONG macro which is
> defined in the bitsperlong.h header. Lets include this header as
> the upcoming A7k/8k support in the Marvell mvpp2 ethernet driver
> uses this macro.
> 
> Signed-off-by: Stefan Roese <sr@denx.de>

I'm not super thrilled by this, but our headers here have diverged quite
a bit from Linux and I don't think a re-sync is going to be easy, so
this is the best solution for now (and mirrors, eventually)
bitsperlong.h ends up in bitops.h in Linux.

Reviewed-by: Tom Rini <trini@konsulko.com>
Joe Hershberger March 21, 2017, 4:53 p.m. UTC | #2
On Tue, Mar 21, 2017 at 9:27 AM, Stefan Roese <sr@denx.de> wrote:
> The macro GENMASK_ULL needs the BITS_PER_LONG_LONG macro which is
> defined in the bitsperlong.h header. Lets include this header as
> the upcoming A7k/8k support in the Marvell mvpp2 ethernet driver
> uses this macro.
>
> Signed-off-by: Stefan Roese <sr@denx.de>

Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
diff mbox

Patch

diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index 1b2e4915a0..576b15dc53 100644
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@ -2,6 +2,7 @@ 
 #define _LINUX_BITOPS_H
 
 #include <asm/types.h>
+#include <asm-generic/bitsperlong.h>
 #include <linux/compiler.h>
 
 #define BIT(nr)			(1UL << (nr))