linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: tip-bot for Stephen Rothwell <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: mingo@kernel.org, sfr@canb.auug.org.au,
	linux-kernel@vger.kernel.org, tglx@linutronix.de, hpa@zytor.com
Subject: [tip:timers/core] staging/android/vsoc:: Fix typo in hrtimer_init_sleeper_on_stack() conversion
Date: Thu, 1 Aug 2019 00:40:20 -0700	[thread overview]
Message-ID: <tip-a688d2a57b78eed3ff38cc9bbb111603bf22a1f4@git.kernel.org> (raw)
In-Reply-To: <20190801133841.64e69541@canb.auug.org.au>

Commit-ID:  a688d2a57b78eed3ff38cc9bbb111603bf22a1f4
Gitweb:     https://git.kernel.org/tip/a688d2a57b78eed3ff38cc9bbb111603bf22a1f4
Author:     Stephen Rothwell <sfr@canb.auug.org.au>
AuthorDate: Thu, 1 Aug 2019 13:38:41 +1000
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Thu, 1 Aug 2019 09:00:40 +0200

staging/android/vsoc:: Fix typo in hrtimer_init_sleeper_on_stack() conversion

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

drivers/staging/android/vsoc.c: In function 'handle_vsoc_cond_wait':
drivers/staging/android/vsoc.c:440:33: error: passing argument 1 of 'hrtimer_init_sleeper_on_stack'
				       from incompatible pointer type [-Werror=incompatible-pointer-types]
   hrtimer_init_sleeper_on_stack(&to, CLOCK_MONOTONIC,
                                 ^~~
In file included from include/linux/pm.h:16,
                 from include/linux/device.h:23,
                 from include/linux/dma-mapping.h:7,
                 from drivers/staging/android/vsoc.c:19:
include/linux/hrtimer.h:381:67: note: expected 'struct hrtimer_sleeper *
				' but argument is of type 'struct hrtimer_sleeper **'
 extern void hrtimer_init_sleeper_on_stack(struct hrtimer_sleeper *sl,
                                          ~~~~~~~~~~~~~~~~~~~~~~~~^~

Fixes: 82e18bace3dd ("hrtimer: Consolidate hrtimer_init() + hrtimer_init_sleeper() calls")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20190801133841.64e69541@canb.auug.org.au

---
 drivers/staging/android/vsoc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/android/vsoc.c b/drivers/staging/android/vsoc.c
index 4f7e6c1dce42..1240bb0317d9 100644
--- a/drivers/staging/android/vsoc.c
+++ b/drivers/staging/android/vsoc.c
@@ -437,7 +437,7 @@ static int handle_vsoc_cond_wait(struct file *filp, struct vsoc_cond_wait *arg)
 			return -EINVAL;
 		wake_time = ktime_set(arg->wake_time_sec, arg->wake_time_nsec);
 
-		hrtimer_init_sleeper_on_stack(&to, CLOCK_MONOTONIC,
+		hrtimer_init_sleeper_on_stack(to, CLOCK_MONOTONIC,
 					      HRTIMER_MODE_ABS);
 		hrtimer_set_expires_range_ns(&to->timer, wake_time,
 					     current->timer_slack_ns);

      reply	other threads:[~2019-08-01  7:40 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-01  3:38 linux-next: build failure after merge of the tip tree Stephen Rothwell
2019-08-01  7:40 ` tip-bot for Stephen Rothwell [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-a688d2a57b78eed3ff38cc9bbb111603bf22a1f4@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=tglx@linutronix.de \
    --subject='Re: [tip:timers/core] staging/android/vsoc:: Fix typo in hrtimer_init_sleeper_on_stack() conversion' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).