Fix for cpumask merge.

-----BEGIN PGP SIGNATURE-----
 
 iQGzBAABCgAdFiEEi8GdvG6xMhdgpu/4sUSA/TofvsgFAma1CvcACgkQsUSA/Tof
 vshhUgv9FFRwAuPFxo+O0LUJENQ+iBKhNRn73YrruJxqIMKir5sc85bwBI8Z9IMV
 nGc55DN/zNN0kYf+zQGp9FnDiV3LVVInOtag1vgOGEsfGVyARlZpxqCoUVHi3sW/
 Dse5bdm7pWxFPQAI8HOUzFmEwzgUmRljjxBB/ty8PmGhmyzPI6FjdGVtcx5rxlie
 hc0a2v21PtbzeWGUyuETSaXvc0qKZdnbjpxSsB07o3QJ76gRjjQc40yi6CYFr4XI
 kTnDxIsDxVAn+dvAyT25dzdE3mQDga7XVzAZNBTSP6tqxfBX4t2qnZsb+5tqG2bK
 ucAVXC1Kahq0gp/xMRYx73cFgYsJ4mgnO+fQapSr05XhigDu/g4F25nLUY3KtH2B
 0G7Lqseul3sOWkZ8qmrzJW/mArzzphAAZ2SBdjyCcKYT/mO3RyusifRpsFriovaQ
 XsXUitC/O0BtiyQsg3UaW94B1KsaMJGSN2nVBmWgbVLXbeHkKmIJhupk4ofOQKx2
 zi27xv/N
 =GTzH
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2024-08-09 11:18:09 -07:00
commit afdab700f6

View file

@ -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))