linux-next: build failure after merge of the tip tree

[Stephen Rothwell]

Hi all,

After merging the tip tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

io_uring/rw.c: In function 'io_hybrid_iopoll_delay':
io_uring/rw.c:1179:9: error: implicit declaration of function 'hrtimer_init_sleeper_on_stack'; did you mean 'hrtimer_setup_sleeper_on_stack'? [-Wimplicit-function-declaration]
 1179 |         hrtimer_init_sleeper_on_stack(&timer, CLOCK_MONOTONIC, mode);
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |         hrtimer_setup_sleeper_on_stack

Caused by commit

  f3bef7aaa6c8 ("hrtimers: Delete hrtimer_init_sleeper_on_stack()")

interacting with commit

  01ee194d1aba ("io_uring: add support for hybrid IOPOLL")

from the block tree.

I have applied the following merge fix patch.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 8 Nov 2024 14:06:37 +1100
Subject: [PATCH] fix up for "hrtimers: Delete hrtimer_init_sleeper_on_stack()"

interacting with commit

  01ee194d1aba ("io_uring: add support for hybrid IOPOLL")

from the block tree.

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 io_uring/rw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/io_uring/rw.c b/io_uring/rw.c
index 93526a64ccd6..c792af8c4476 100644
--- a/io_uring/rw.c
+++ b/io_uring/rw.c
@@ -1176,7 +1176,7 @@ static u64 io_hybrid_iopoll_delay(struct io_ring_ctx *ctx, struct io_kiocb *req)
 	req->flags |= REQ_F_IOPOLL_STATE;
 
 	mode = HRTIMER_MODE_REL;
-	hrtimer_init_sleeper_on_stack(&timer, CLOCK_MONOTONIC, mode);
+	hrtimer_setup_sleeper_on_stack(&timer, CLOCK_MONOTONIC, mode);
 	hrtimer_set_expires(&timer.timer, kt);
 	set_current_state(TASK_INTERRUPTIBLE);
 	hrtimer_sleeper_start_expires(&timer, mode);
-- 
2.45.2

-- 
Cheers,
Stephen Rothwell

Attachment: pgpp5dD2c_3y0.pgp
Description: OpenPGP digital signature