github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 12:44:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

- Fix timer debugobjects state corruption on CPU offlining

Browse Source 
(Thomas Gleixner)
 
 Signed-off-by: Ingo Molnar <mingo@kernel.org>
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCgAvFiEEBpT5eoXrXCwVQwEKEnMQ0APhK1gFAmqKE+URHG1pbmdvQGtl
 cm5lbC5vcmcACgkQEnMQ0APhK1ivYRAArC8Qh6Sl4jS42eDQZHUgb5SLS4/cims/
 Hl4Ibncg7Y98fs4FfSraUzPn6FHdAbhR7+7xWaibAfDQBIPkk4rREFh7uyGvMfbh
 h0HPACs42rU2j63oHip0ObPEfVF24LcpLpC8x5OuDB9hfxYq7zeIBQk/FWvvOHFw
 ZRzhY6Z6fKGK460kUQJEBIr4rcKoXwRIcODWqrz59ZKhdf1pC29EEq5CPTaV+m2p
 k59C6zfVUzzXuEipg9VIteNrfsLNrg+CeL3wV1YVKJlAPYnQ49LaVpSHEfiWg72U
 r7UcSeGgG0h9pem/0lHeUrOQE44cxROHS8Tw5f6+W6nT7h7rwzYMwbL4k4ExR2RA
 1SK7A1in9yr2Cn0yZODeznNbuNnWioDY09YjoqWQG7DlqtvDeOsgDa45JivY5PY4
 kJh2v5toqRItD/hgiqPFR8ruu5WEsppQE5SwoEosgl8Ile4Q66V8x6L9E8YKBa32
 jmn/LxpRlhmXy6XeGq1z87a0apZy8LHwFLlXRgeI4DYZRvejkZTyAhNpx1++Ami5
 mXrti4ULD1Ie4crR4CBP2sbjkvnY+tZ8D+O2m3H68RtXRvbXn1rW9LNn28aHBn7x
 CgUErNN4Xcvdk2wLF9qnafPlW1kvowsOXDW48NlAXfTy2REWjjzAOOn/U6/bwwnq
 HZtzbWqaeJA=
 =zqAv
 -----END PGP SIGNATURE-----
mergetag object e1e3a0ab69
 type commit
 tag timers-urgent-2026-08-22
 tagger Ingo Molnar <mingo@kernel.org> 1787435571 +0200
 
  - Fix ARM get_cycles() regression causing boot hangs on
    certain ARM configs (Nathan Chancellor)
 
 Signed-off-by: Ingo Molnar <mingo@kernel.org>
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCgAvFiEEBpT5eoXrXCwVQwEKEnMQ0APhK1gFAmqKGqcRHG1pbmdvQGtl
 cm5lbC5vcmcACgkQEnMQ0APhK1hd6BAAgcoVnPqJXKYqPDKExNxftnNINCXz2NSI
 v4zEsaTSjS+eVOBXoO82Fr82ZWPOq/F4pjSX24usWjkESdQ4pc5fqZ1oaUR9o4jM
 zCcCHN0T/bmddgiWpOzrsLkuuORVCMF4p8D/fYX3W4YrQR7KiEchoYRMtgz3rVAX
 EE0CDea3Vvgo4NAqfFIBM1fR17+GHPt8V8U0CENFIOynOTuLUZjqGiA0bQotJeqh
 fcDzCZQTLyhA8c1cOrcApFt6O6SjK2SaXQ21uPRzDNL4zboRsbWJ3zwkAaI1nB4E
 0pkXkcWr9l7l57DMGNP/Kopwtk7GDw5al5QLl54xLY/YGDumV6L+8uwyRRY0tHpT
 89cm3WWg0l9ASMq5HuQfQFdt1SgBGf/yJ+rCiBQbcx9eQYZdfYNZTLQx0yLVSaxf
 eQu4YrSytNe78G0qjAfms3oyNr490qb1yI8e70XJiqzu+uH93IqMoaUcUV/yWu6y
 t7HFH2y2kugebAbylRcJhGuhaWM07wZBt5Kfd1ps73fKJqhqs5OhxM65kj6OAPVf
 QDByVmx/OP9Eyq5uB4lmoU2ODhefk1zY7sXJ6Bky4F1tnfmcpMDySTvLnnOPRf3Q
 gG8Y3+Iy60svIafjMfhrU1HmUSgxlHBimj6XneOJgL3SmzEG/FwHJVKO3ypFYf5c
 zD8gZJoa/74=
 =/gL9
 -----END PGP SIGNATURE-----

Merge tags 'core-urgent-2026-08-22' and 'timers-urgent-2026-08-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fixes from Ingo Molnar:

 - Fix timer debugobjects state corruption on CPU offlining (Thomas
   Gleixner)

 - Fix ARM get_cycles() regression causing boot hangs on certain ARM
   configs (Nathan Chancellor)

* tag 'core-urgent-2026-08-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timer: Keep debugobjects state consistent in migrate_timer_list()

* tag 'timers-urgent-2026-08-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  ARM: Fix get_cycles() after delay_read_timer() conversion
This commit is contained in:
Linus Torvalds 2026-08-22 16:11:56 -07:00
commit 81ed8bd71e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/include/asm/timex.h
View File

@ -13,7 +13,7 @@ typedef unsigned long cycles_t;
// Temporary workaround until timex.h is cleaned up
bool delay_read_timer(unsigned long *t);
#define get_cycles() ({ cycles_t c; delay_read_timer(&c) ? 0 : c; })
#define get_cycles() ({ cycles_t c; delay_read_timer(&c) ? c : 0; })
#define random_get_entropy() (((unsigned long)get_cycles()) ?: random_get_entropy_fallback())
#endif

1
kernel/time/timer.c
View File

@ -2492,6 +2492,7 @@ static void migrate_timer_list(struct timer_base *new_base, struct hlist_head *h
timer = hlist_entry(head->first, struct timer_list, entry);
detach_timer(timer, false);
timer->flags = (timer->flags & ~TIMER_BASEMASK) | cpu;
debug_timer_activate(timer);
internal_add_timer(new_base, timer);
}
}