From: Christian Brauner Date: Sat, 30 Jan 2021 16:28:32 +0000 (+0100) Subject: cgroups: use PTR_TO_U64() X-Git-Tag: lxc-5.0.0~312^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d2f7ae18514ed1b3abb70bb559716ebafaebdc9;p=thirdparty%2Flxc.git cgroups: use PTR_TO_U64() Signed-off-by: Christian Brauner --- diff --git a/src/lxc/cgroups/cgroup2_devices.c b/src/lxc/cgroups/cgroup2_devices.c index cd23b2c4e..faee4cc53 100644 --- 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 11da99118..ae629a790 100644 --- 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)))