Skip to content

Commit afdab70

Browse files
committed
Merge tag 'bitmap-6.11-rc' of https://github.com/norov/linux
Pull cpumask fix from Yury Norov: "Fix for cpumask merge" [ Mea culpa, this was my mismerge due to too much cut-and-paste - Linus ] * tag 'bitmap-6.11-rc' of https://github.com/norov/linux: cpumask: Fix crash on updating CPU enabled mask
2 parents 8508289 + 5819e46 commit afdab70

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

include/linux/cpumask.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,7 @@ void init_cpu_online(const struct cpumask *src);
10371037
assign_bit(cpumask_check(cpu), cpumask_bits(mask), (val))
10381038

10391039
#define set_cpu_possible(cpu, possible) assign_cpu((cpu), &__cpu_possible_mask, (possible))
1040-
#define set_cpu_enabled(cpu, enabled) assign_cpu((cpu), &__cpu_possible_mask, (enabled))
1040+
#define set_cpu_enabled(cpu, enabled) assign_cpu((cpu), &__cpu_enabled_mask, (enabled))
10411041
#define set_cpu_present(cpu, present) assign_cpu((cpu), &__cpu_present_mask, (present))
10421042
#define set_cpu_active(cpu, active) assign_cpu((cpu), &__cpu_active_mask, (active))
10431043
#define set_cpu_dying(cpu, dying) assign_cpu((cpu), &__cpu_dying_mask, (dying))

0 commit comments

Comments
 (0)