cgroups: use PTR_TO_U64()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/cgroups/cgroup2_devices.c b/src/lxc/cgroups/cgroup2_devices.c
index cd23b2c4ee510bec6084e354cc27edadf97419c8..faee4cc5359c0c7b39fcd80d74bc72e624f2c327 100644 (file)
--- a/src/lxc/cgroups/cgroup2_devices.c
+++ b/src/lxc/cgroups/cgroup2_devices.c
@@ -343,10 +343,10 @@ static int bpf_program_load_kernel(struct bpf_program *prog)
 
        attr = &(union bpf_attr){
                .prog_type      = prog->prog_type,
-               .insns          = PTR_TO_UINT64(prog->instructions),
+               .insns          = PTR_TO_U64(prog->instructions),
                .insn_cnt       = prog->n_instructions,
-               .license        = PTR_TO_UINT64("GPL"),
-               .log_buf        = PTR_TO_UINT64(log_buf),
+               .license        = PTR_TO_U64("GPL"),
+               .log_buf        = PTR_TO_U64(log_buf),
                .log_level      = log_level,
                .log_size       = log_size,
        };

diff --git a/src/lxc/macro.h b/src/lxc/macro.h
index 11da99118eddf115466fa7dc1874397bd2daf0a3..ae629a7904a3c60d547b890ffd1a101792debb1e 100644 (file)
--- a/src/lxc/macro.h
+++ b/src/lxc/macro.h
@@ -602,7 +602,8 @@ enum {
 #define PTR_TO_PID(p) ((pid_t)((intptr_t)(p)))
 #define PID_TO_PTR(u) ((void *)((intptr_t)(u)))
 
-#define PTR_TO_UINT64(p) ((uint64_t)((intptr_t)(p)))
+#define PTR_TO_UINT64(p) ((uint64_t)((uintptr_t)(p)))
+#define PTR_TO_U64(p) ((__u64)((uintptr_t)(p)))
 
 #define UINT_TO_PTR(u) ((void *) ((uintptr_t) (u)))
 #define PTR_TO_USHORT(p) ((unsigned short)((uintptr_t)(p)))