46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
From 4ac0383a598d4bddf13cbd8272f0ea7711614b79 Mon Sep 17 00:00:00 2001
|
|
From: Ben Hutchings <ben.hutchings@mind.be>
|
|
Date: Tue, 29 Jun 2021 01:24:46 +0200
|
|
Subject: utils: Fix BIT() to support up to 64 bits on all architectures
|
|
|
|
devlink and vdpa use BIT() together with 64-bit flag fields. devlink
|
|
is already using bit numbers greater than 31 and so does not work
|
|
correctly on 32-bit architectures.
|
|
|
|
Fix this by making BIT() use uint64_t instead of unsigned long.
|
|
|
|
Signed-off-by: Ben Hutchings <ben.hutchings@mind.be>
|
|
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
|
|
|
Conflict:NA
|
|
Reference:https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit?id=4ac0383a598d4bddf13cbd8272f0ea7711614b79
|
|
|
|
---
|
|
include/utils.h | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/include/utils.h b/include/utils.h
|
|
index 187444d52..70db9f609 100644
|
|
--- a/include/utils.h
|
|
+++ b/include/utils.h
|
|
@@ -8,6 +8,7 @@
|
|
#include <stdlib.h>
|
|
#include <stdbool.h>
|
|
#include <time.h>
|
|
+#include <stdint.h>
|
|
|
|
#ifdef HAVE_LIBBSD
|
|
#include <bsd/string.h>
|
|
@@ -264,7 +265,7 @@ void print_nlmsg_timestamp(FILE *fp, const struct nlmsghdr *n);
|
|
unsigned int print_name_and_link(const char *fmt,
|
|
const char *name, struct rtattr *tb[]);
|
|
|
|
-#define BIT(nr) (1UL << (nr))
|
|
+#define BIT(nr) (UINT64_C(1) << (nr))
|
|
|
|
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
|
|
|
|
--
|
|
cgit 1.2.3-korg
|
|
|