Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

treewide: Fix wrong singular form of jiffies in comments

There are several comments all over the place, which uses a wrong singular
form of jiffies.

Replace 'jiffie' by 'jiffy'. No functional change.

Signed-off-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> # m68k
Link: https://lore.kernel.org/all/20240904-devel-anna-maria-b4-timers-flseep-v1-3-e98760256370@linutronix.de

authored by

Anna-Maria Behnsen and committed by
Thomas Gleixner
bd7c8ff9 662a1bfb

+31 -31
+1 -1
Documentation/admin-guide/media/vivid.rst
··· 328 328 detail below. 329 329 330 330 Special attention has been given to the rate at which new frames become 331 - available. The jitter will be around 1 jiffie (that depends on the HZ 331 + available. The jitter will be around 1 jiffy (that depends on the HZ 332 332 configuration of your kernel, so usually 1/100, 1/250 or 1/1000 of a second), 333 333 but the long-term behavior is exactly following the framerate. So a 334 334 framerate of 59.94 Hz is really different from 60 Hz. If the framerate
+1 -1
Documentation/timers/timers-howto.rst
··· 19 19 20 20 ATOMIC CONTEXT: 21 21 You must use the `*delay` family of functions. These 22 - functions use the jiffie estimation of clock speed 22 + functions use the jiffy estimation of clock speed 23 23 and will busy wait for enough loop cycles to achieve 24 24 the desired delay: 25 25
+1 -1
Documentation/translations/sp_SP/scheduler/sched-design-CFS.rst
··· 109 109 ================================== 110 110 111 111 CFS usa una granularidad de nanosegundos y no depende de ningún 112 - jiffie o detalles como HZ. De este modo, el gestor de tareas CFS no tiene 112 + jiffy o detalles como HZ. De este modo, el gestor de tareas CFS no tiene 113 113 noción de "ventanas de tiempo" de la forma en que tenía el gestor de 114 114 tareas previo, y tampoco tiene heurísticos. Únicamente hay un parámetro 115 115 central ajustable (se ha de cambiar en CONFIG_SCHED_DEBUG):
+1 -1
arch/arm/mach-versatile/spc.c
··· 73 73 74 74 /* 75 75 * Even though the SPC takes max 3-5 ms to complete any OPP/COMMS 76 - * operation, the operation could start just before jiffie is about 76 + * operation, the operation could start just before jiffy is about 77 77 * to be incremented. So setting timeout value of 20ms = 2jiffies@100Hz 78 78 */ 79 79 #define TIMEOUT_US 20000
+1 -1
arch/m68k/q40/q40ints.c
··· 106 106 * this stuff doesn't really belong here.. 107 107 */ 108 108 109 - int ql_ticks; /* 200Hz ticks since last jiffie */ 109 + int ql_ticks; /* 200Hz ticks since last jiffy */ 110 110 static int sound_ticks; 111 111 112 112 #define SVOL 45
+1 -1
arch/x86/kernel/cpu/mce/dev-mcelog.c
··· 314 314 315 315 /* 316 316 * Need to give user space some time to set everything up, 317 - * so do it a jiffie or two later everywhere. 317 + * so do it a jiffy or two later everywhere. 318 318 */ 319 319 schedule_timeout(2); 320 320
+1 -1
drivers/char/ipmi/ipmi_ssif.c
··· 980 980 ipmi_ssif_unlock_cond(ssif_info, flags); 981 981 start_get(ssif_info); 982 982 } else { 983 - /* Wait a jiffie then request the next message */ 983 + /* Wait a jiffy then request the next message */ 984 984 ssif_info->waiting_alert = true; 985 985 ssif_info->retries_left = SSIF_RECV_RETRIES; 986 986 if (!ssif_info->stopping)
+1 -1
drivers/dma-buf/st-dma-fence.c
··· 402 402 403 403 if (dma_fence_wait_timeout(wt.f, false, 2) == -ETIME) { 404 404 if (timer_pending(&wt.timer)) { 405 - pr_notice("Timer did not fire within the jiffie!\n"); 405 + pr_notice("Timer did not fire within the jiffy!\n"); 406 406 err = 0; /* not our fault! */ 407 407 } else { 408 408 pr_err("Wait reported incomplete after timeout\n");
+1 -1
drivers/gpu/drm/i915/gem/i915_gem_wait.c
··· 266 266 if (ret == -ETIME && !nsecs_to_jiffies(args->timeout_ns)) 267 267 args->timeout_ns = 0; 268 268 269 - /* Asked to wait beyond the jiffie/scheduler precision? */ 269 + /* Asked to wait beyond the jiffy/scheduler precision? */ 270 270 if (ret == -ETIME && args->timeout_ns) 271 271 ret = -EAGAIN; 272 272 }
+2 -2
drivers/gpu/drm/i915/gt/selftest_execlists.c
··· 93 93 return -EINVAL; 94 94 } 95 95 96 - /* Give the request a jiffie to complete after flushing the worker */ 96 + /* Give the request a jiffy to complete after flushing the worker */ 97 97 if (i915_request_wait(rq, 0, 98 98 max(0l, (long)(timeout - jiffies)) + 1) < 0) { 99 99 pr_err("%s: hanging request %llx:%lld did not complete\n", ··· 3426 3426 cpu_relax(); 3427 3427 3428 3428 saved_timeout = engine->props.preempt_timeout_ms; 3429 - engine->props.preempt_timeout_ms = 1; /* in ms, -> 1 jiffie */ 3429 + engine->props.preempt_timeout_ms = 1; /* in ms, -> 1 jiffy */ 3430 3430 3431 3431 i915_request_get(rq); 3432 3432 i915_request_add(rq);
+1 -1
drivers/gpu/drm/i915/i915_utils.c
··· 110 110 * Paranoia to make sure the compiler computes the timeout before 111 111 * loading 'jiffies' as jiffies is volatile and may be updated in 112 112 * the background by a timer tick. All to reduce the complexity 113 - * of the addition and reduce the risk of losing a jiffie. 113 + * of the addition and reduce the risk of losing a jiffy. 114 114 */ 115 115 barrier(); 116 116
+1 -1
drivers/gpu/drm/v3d/v3d_bo.c
··· 279 279 else 280 280 args->timeout_ns = 0; 281 281 282 - /* Asked to wait beyond the jiffie/scheduler precision? */ 282 + /* Asked to wait beyond the jiffy/scheduler precision? */ 283 283 if (ret == -ETIME && args->timeout_ns) 284 284 ret = -EAGAIN; 285 285
+1 -1
drivers/isdn/mISDN/dsp_cmx.c
··· 82 82 * - has multiple clocks. 83 83 * - has no usable clock due to jitter or packet loss (VoIP). 84 84 * In this case the system's clock is used. The clock resolution depends on 85 - * the jiffie resolution. 85 + * the jiffy resolution. 86 86 * 87 87 * If a member joins a conference: 88 88 *
+1 -1
drivers/net/ethernet/marvell/mvmdio.c
··· 104 104 return 0; 105 105 } else { 106 106 /* wait_event_timeout does not guarantee a delay of at 107 - * least one whole jiffie, so timeout must be no less 107 + * least one whole jiffy, so timeout must be no less 108 108 * than two. 109 109 */ 110 110 timeout = max(usecs_to_jiffies(MVMDIO_SMI_TIMEOUT), 2);
+1 -1
fs/xfs/xfs_buf.h
··· 210 210 * success the write is considered to be failed permanently and the 211 211 * iodone handler will take appropriate action. 212 212 * 213 - * For retry timeouts, we record the jiffie of the first failure. This 213 + * For retry timeouts, we record the jiffy of the first failure. This 214 214 * means that we can change the retry timeout for buffers already under 215 215 * I/O and thus avoid getting stuck in a retry loop with a long timeout. 216 216 *
+1 -1
include/linux/jiffies.h
··· 418 418 #define NSEC_CONVERSION ((unsigned long)((((u64)1 << NSEC_JIFFIE_SC) +\ 419 419 TICK_NSEC -1) / (u64)TICK_NSEC)) 420 420 /* 421 - * The maximum jiffie value is (MAX_INT >> 1). Here we translate that 421 + * The maximum jiffy value is (MAX_INT >> 1). Here we translate that 422 422 * into seconds. The 64-bit case will overflow if we are not careful, 423 423 * so use the messy SH_DIV macro to do it. Still all constants. 424 424 */
+1 -1
include/linux/timekeeper_internal.h
··· 73 73 * @overflow_seen: Overflow warning flag (DEBUG_TIMEKEEPING) 74 74 * 75 75 * Note: For timespec(64) based interfaces wall_to_monotonic is what 76 - * we need to add to xtime (or xtime corrected for sub jiffie times) 76 + * we need to add to xtime (or xtime corrected for sub jiffy times) 77 77 * to get to monotonic time. Monotonic is pegged at zero at system 78 78 * boot time, so wall_to_monotonic will be negative, however, we will 79 79 * ALWAYS keep the tv_nsec part positive so we can use the usual
+1 -1
kernel/time/alarmtimer.c
··· 493 493 * promised in the context of posix_timer_fn() never 494 494 * materialized, but someone should really work on it. 495 495 * 496 - * To prevent DOS fake @now to be 1 jiffie out which keeps 496 + * To prevent DOS fake @now to be 1 jiffy out which keeps 497 497 * the overrun accounting correct but creates an 498 498 * inconsistency vs. timer_gettime(2). 499 499 */
+1 -1
kernel/time/clockevents.c
··· 190 190 191 191 #ifdef CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST 192 192 193 - /* Limit min_delta to a jiffie */ 193 + /* Limit min_delta to a jiffy */ 194 194 #define MIN_DELTA_LIMIT (NSEC_PER_SEC / HZ) 195 195 196 196 /**
+1 -1
kernel/time/hrtimer.c
··· 1177 1177 /* 1178 1178 * CONFIG_TIME_LOW_RES indicates that the system has no way to return 1179 1179 * granular time values. For relative timers we add hrtimer_resolution 1180 - * (i.e. one jiffie) to prevent short timeouts. 1180 + * (i.e. one jiffy) to prevent short timeouts. 1181 1181 */ 1182 1182 timer->is_rel = mode & HRTIMER_MODE_REL; 1183 1183 if (timer->is_rel)
+2 -2
kernel/time/posix-timers.c
··· 339 339 * change to the signal handling code. 340 340 * 341 341 * For now let timers with an interval less than a 342 - * jiffie expire every jiffie and recheck for a 342 + * jiffy expire every jiffy and recheck for a 343 343 * valid signal handler. 344 344 * 345 345 * This avoids interrupt starvation in case of a 346 346 * very small interval, which would expire the 347 347 * timer immediately again. 348 348 * 349 - * Moving now ahead of time by one jiffie tricks 349 + * Moving now ahead of time by one jiffy tricks 350 350 * hrtimer_forward() to expire the timer later, 351 351 * while it still maintains the overrun accuracy 352 352 * for the price of a slight inconsistency in the
+6 -6
kernel/time/timer.c
··· 365 365 rem = j % HZ; 366 366 367 367 /* 368 - * If the target jiffie is just after a whole second (which can happen 368 + * If the target jiffy is just after a whole second (which can happen 369 369 * due to delays of the timer irq, long irq off times etc etc) then 370 370 * we should round down to the whole second, not up. Use 1/4th second 371 371 * as cutoff for this rounding as an extreme upper bound for this. ··· 1930 1930 * bits are zero, we look at the next level as is. If not we 1931 1931 * need to advance it by one because that's going to be the 1932 1932 * next expiring bucket in that level. base->clk is the next 1933 - * expiring jiffie. So in case of: 1933 + * expiring jiffy. So in case of: 1934 1934 * 1935 1935 * LVL5 LVL4 LVL3 LVL2 LVL1 LVL0 1936 1936 * 0 0 0 0 0 0 ··· 1995 1995 return basem; 1996 1996 1997 1997 /* 1998 - * Round up to the next jiffie. High resolution timers are 1998 + * Round up to the next jiffy. High resolution timers are 1999 1999 * off, so the hrtimers are expired in the tick and we need to 2000 2000 * make sure that this tick really expires the timer to avoid 2001 2001 * a ping pong of the nohz stop code. ··· 2254 2254 base_global, &tevt); 2255 2255 2256 2256 /* 2257 - * If the next event is only one jiffie ahead there is no need to call 2257 + * If the next event is only one jiffy ahead there is no need to call 2258 2258 * timer migration hierarchy related functions. The value for the next 2259 2259 * global timer in @tevt struct equals then KTIME_MAX. This is also 2260 2260 * true, when the timer base is idle. ··· 2486 2486 * updated. When this update is missed, this isn't a 2487 2487 * problem, as an IPI is executed nevertheless when the CPU 2488 2488 * was idle before. When the CPU wasn't idle but the update 2489 - * is missed, then the timer would expire one jiffie late - 2489 + * is missed, then the timer would expire one jiffy late - 2490 2490 * bad luck. 2491 2491 * 2492 2492 * Those unlikely corner cases where the worst outcome is only a 2493 - * one jiffie delay or a superfluous raise of the softirq are 2493 + * one jiffy delay or a superfluous raise of the softirq are 2494 2494 * not that expensive as doing the check always while holding 2495 2495 * the lock. 2496 2496 *
+1 -1
lib/Kconfig.debug
··· 97 97 using "boot_delay=N". 98 98 99 99 It is likely that you would also need to use "lpj=M" to preset 100 - the "loops per jiffie" value. 100 + the "loops per jiffy" value. 101 101 See a previous boot log for the "lpj" value to use for your 102 102 system, and then set "lpj=M" before setting "boot_delay=N". 103 103 NOTE: Using this option may adversely affect SMP systems.
+1 -1
net/batman-adv/types.h
··· 287 287 /** @lock: lock to protect the list of fragments */ 288 288 spinlock_t lock; 289 289 290 - /** @timestamp: time (jiffie) of last received fragment */ 290 + /** @timestamp: time (jiffy) of last received fragment */ 291 291 unsigned long timestamp; 292 292 293 293 /** @seqno: sequence number of the fragments in the list */