diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index ffa5626411ac..b7dbf3d9b5c0 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -4209,7 +4209,7 @@ static inline int bpf_map_check_op_flags(struct bpf_map *map, u64 flags, u64 all
 			return -EINVAL;
 
 		cpu = flags >> 32;
-		if ((flags & BPF_F_CPU) && cpu >= num_possible_cpus())
+		if ((flags & BPF_F_CPU) && (cpu >= nr_cpu_ids || !cpu_possible(cpu)))
 			return -ERANGE;
 	}