Skip to content

Commit 7284023

Browse files
ubizjakrafaeljw
authored andcommitted
intel_idle: Update arguments of mwait_idle_with_hints()
Commit a17b37a ("x86/idle: Change arguments of mwait_idle_with_hints() to u32") changed the type of arguments of mwait_idle_with_hints() from unsigned long to u32. Change the type of variables in the call to mwait_idle_with_hints() to unsigned int to follow the change. Signed-off-by: Uros Bizjak <[email protected]> Reviewed-by: Artem Bityutskiy <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent a18d098 commit 7284023

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/idle/intel_idle.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ static __always_inline int __intel_idle(struct cpuidle_device *dev,
152152
int index, bool irqoff)
153153
{
154154
struct cpuidle_state *state = &drv->states[index];
155-
unsigned long eax = flg2MWAIT(state->flags);
156-
unsigned long ecx = 1*irqoff; /* break on interrupt flag */
155+
unsigned int eax = flg2MWAIT(state->flags);
156+
unsigned int ecx = 1*irqoff; /* break on interrupt flag */
157157

158158
mwait_idle_with_hints(eax, ecx);
159159

@@ -226,9 +226,9 @@ static __cpuidle int intel_idle_xstate(struct cpuidle_device *dev,
226226
static __cpuidle int intel_idle_s2idle(struct cpuidle_device *dev,
227227
struct cpuidle_driver *drv, int index)
228228
{
229-
unsigned long ecx = 1; /* break on interrupt flag */
230229
struct cpuidle_state *state = &drv->states[index];
231-
unsigned long eax = flg2MWAIT(state->flags);
230+
unsigned int eax = flg2MWAIT(state->flags);
231+
unsigned int ecx = 1; /* break on interrupt flag */
232232

233233
if (state->flags & CPUIDLE_FLAG_INIT_XSTATE)
234234
fpu_idle_fpregs();

0 commit comments

Comments
 (0)