History

Merge branch 'for-7.1-fixes' into for-7.2

Pull to receive 73bd1227787b ("rhashtable: Restore insecure_elasticity toggle") as a dependency for upcoming patches that use .insecure_elasticity = true on their rhashtables.

Tejun Heo committed 6 months ago

Commit ed859d42 parents ce0fb14 87019cb4 files · +9 −4Browse files

Showing the changes to kernel (1 of 4 files). Show all

Unified · Split

kernel/sched/ext.c+1−0
@@ -32,6 +32,7 @@ static const struct rhashtable_params scx_sched_hash_params = { · 31 unmodified lines
32 .key_len = sizeof_field(struct scx_sched, ops.sub_cgroup_id),32 .key_len = sizeof_field(struct scx_sched, ops.sub_cgroup_id),
33 .key_offset = offsetof(struct scx_sched, ops.sub_cgroup_id),33 .key_offset = offsetof(struct scx_sched, ops.sub_cgroup_id),
34 .head_offset = offsetof(struct scx_sched, hash_node),34 .head_offset = offsetof(struct scx_sched, hash_node),
35 .insecure_elasticity = true, /* inserted under scx_sched_lock */
35};36};
36 37
37static struct rhashtable scx_sched_hash;38static struct rhashtable scx_sched_hash;