Commit afdab700 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 85082897 5819e464

include/linux/cpumask.h

+1 −1
Original line number Diff line number Diff line
@@ -1037,7 +1037,7 @@ void init_cpu_online(const struct cpumask *src); 
	assign_bit(cpumask_check(cpu), cpumask_bits(mask), (val))



#define set_cpu_possible(cpu, possible)	assign_cpu((cpu), &__cpu_possible_mask, (possible))

#define set_cpu_enabled(cpu, enabled)	assign_cpu((cpu), &__cpu_possible_mask, (enabled))

#define set_cpu_enabled(cpu, enabled)	assign_cpu((cpu), &__cpu_enabled_mask, (enabled))

#define set_cpu_present(cpu, present)	assign_cpu((cpu), &__cpu_present_mask, (present))

#define set_cpu_active(cpu, active)	assign_cpu((cpu), &__cpu_active_mask, (active))

#define set_cpu_dying(cpu, dying)	assign_cpu((cpu), &__cpu_dying_mask, (dying))