Commit 7ea5092f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'timers_urgent_for_v6.18_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer fix from Borislav Petkov:

 - Do not create more than eight (max supported) AUX clocks sysfs
   hierarchies

* tag 'timers_urgent_for_v6.18_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timekeeping: Fix aux clocks sysfs initialization loop bound
parents 72761a7e 39a9ed0f

kernel/time/timekeeping.c

+1 −1
Original line number Diff line number Diff line
@@ -3070,7 +3070,7 @@ static int __init tk_aux_sysfs_init(void) 
		return -ENOMEM;

	}



	for (int i = 0; i <= MAX_AUX_CLOCKS; i++) {

	for (int i = 0; i < MAX_AUX_CLOCKS; i++) {

		char id[2] = { [0] = '0' + i, };

		struct kobject *clk = kobject_create_and_add(id, auxo);