diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2026-02-19 22:08:53 +0300 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2026-02-19 22:08:53 +0300 |
| commit | b0a67f310bfa5e13d66c9f6b4bd88ea504a576a9 (patch) | |
| tree | f203082c07e790f8d4214075b8c81ace9717bd40 /include/linux/cpuset.h | |
| parent | 4c51f90d45dca71e7974ed5a7c40b9c04a6c6762 (diff) | |
| parent | 8bf22c33e7a172fbc72464f4cc484d23a6b412ba (diff) | |
| download | linux-b0a67f310bfa5e13d66c9f6b4bd88ea504a576a9.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf before 7.0-rc1
Cross-merge BPF and other fixes after downstream PR.
No conflicts.
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'include/linux/cpuset.h')
| -rw-r--r-- | include/linux/cpuset.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h index cbd402b4f974..65d76a38974b 100644 --- a/include/linux/cpuset.h +++ b/include/linux/cpuset.h @@ -176,7 +176,7 @@ static inline void set_mems_allowed(nodemask_t nodemask) task_unlock(current); } -extern bool cpuset_node_allowed(struct cgroup *cgroup, int nid); +extern void cpuset_nodes_allowed(struct cgroup *cgroup, nodemask_t *mask); #else /* !CONFIG_CPUSETS */ static inline bool cpusets_enabled(void) { return false; } @@ -299,9 +299,9 @@ static inline bool read_mems_allowed_retry(unsigned int seq) return false; } -static inline bool cpuset_node_allowed(struct cgroup *cgroup, int nid) +static inline void cpuset_nodes_allowed(struct cgroup *cgroup, nodemask_t *mask) { - return true; + nodes_copy(*mask, node_states[N_MEMORY]); } #endif /* !CONFIG_CPUSETS */ |