Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efefc977 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

jiffies: Introduce USER_TICK_USEC and redefine TICK_USEC 



Since the subsequent changes will need a TICK_USEC definition
analogous to TICK_NSEC, rename the existing TICK_USEC as
USER_TICK_USEC, update its users and redefine TICK_USEC
accordingly.

Suggested-by: default avatarPeter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarFrederic Weisbecker <frederic@kernel.org>
parent ed98c349

drivers/net/ethernet/sfc/mcdi.c

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ static int efx_mcdi_poll(struct efx_nic *efx) 
	 * because generally mcdi responses are fast. After that, back off

	 * and poll once a jiffy (approximately)

	 */

	spins = TICK_USEC;

	spins = USER_TICK_USEC;

	finish = jiffies + MCDI_RPC_TIMEOUT;



	while (1) {

include/linux/jiffies.h

+5 −2
Original line number Diff line number Diff line
@@ -62,8 +62,11 @@ extern int register_refined_jiffies(long clock_tick_rate); 
/* TICK_NSEC is the time between ticks in nsec assuming SHIFTED_HZ */

#define TICK_NSEC ((NSEC_PER_SEC+HZ/2)/HZ)



/* TICK_USEC is the time between ticks in usec assuming fake USER_HZ */

#define TICK_USEC ((1000000UL + USER_HZ/2) / USER_HZ)

/* TICK_USEC is the time between ticks in usec assuming SHIFTED_HZ */

#define TICK_USEC ((USEC_PER_SEC + HZ/2) / HZ)



/* USER_TICK_USEC is the time between ticks in usec assuming fake USER_HZ */

#define USER_TICK_USEC ((1000000UL + USER_HZ/2) / USER_HZ)



#ifndef __jiffy_arch_data

#define __jiffy_arch_data

kernel/time/ntp.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 




/* USER_HZ period (usecs): */

unsigned long			tick_usec = TICK_USEC;

unsigned long			tick_usec = USER_TICK_USEC;



/* SHIFTED_HZ period (nsecs): */

unsigned long			tick_nsec;