mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: tip-bot for Paul Mundt <lethal@linux-sh.org>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
	schwidefsky@de.ibm.com, lethal@linux-sh.org, tglx@linutronix.de,
	mingo@elte.hu
Subject: [tip:timers/core] timekeeping: Fix up read_persistent_clock() breakage on sh
Date: Tue, 25 Aug 2009 07:13:27 GMT	[thread overview]
Message-ID: <tip-0ceb4c3e3f1ccaf121851e33c3ea269b8ad0f219@git.kernel.org> (raw)
In-Reply-To: <20090824223239.GB20832@linux-sh.org>

Commit-ID:  0ceb4c3e3f1ccaf121851e33c3ea269b8ad0f219
Gitweb:     http://git.kernel.org/tip/0ceb4c3e3f1ccaf121851e33c3ea269b8ad0f219
Author:     Paul Mundt <lethal@linux-sh.org>
AuthorDate: Tue, 25 Aug 2009 07:32:39 +0900
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Tue, 25 Aug 2009 08:46:16 +0200

timekeeping: Fix up read_persistent_clock() breakage on sh

The recent commit "timekeeping: Increase granularity of
read_persistent_clock()" introduced read_persistent_clock()
rework which inadvertently broke the sh conversion:

	arch/sh/kernel/time.c:45: error: passing argument 1 of 'rtc_sh_get_time' from incompatible pointer type
	distcc[13470] ERROR: compile arch/sh/kernel/time.c on sprygo/32 failed
	make[2]: *** [arch/sh/kernel/time.o] Error 1

This trivial fix gets it working again.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
LKML-Reference: <20090824223239.GB20832@linux-sh.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>


---
 arch/sh/kernel/time.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c
index 3f4706a..0e0e858 100644
--- a/arch/sh/kernel/time.c
+++ b/arch/sh/kernel/time.c
@@ -41,7 +41,7 @@ int (*rtc_sh_set_time)(const time_t) = null_rtc_set_time;
 #ifdef CONFIG_GENERIC_CMOS_UPDATE
 void read_persistent_clock(struct timespec *ts)
 {
-	rtc_sh_get_time(&ts);
+	rtc_sh_get_time(ts);
 }
 
 int update_persistent_clock(struct timespec now)

      parent reply	other threads:[~2009-08-25  7:13 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-24 22:32 [PATCH -tip] " Paul Mundt
2009-08-25  6:44 ` Ingo Molnar
2009-08-25  6:52   ` Paul Mundt
2009-08-25  7:07     ` Ingo Molnar
2009-08-25  7:13 ` tip-bot for Paul Mundt [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-0ceb4c3e3f1ccaf121851e33c3ea269b8ad0f219@git.kernel.org \
    --to=lethal@linux-sh.org \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=mingo@redhat.com \
    --cc=schwidefsky@de.ibm.com \
    --cc=tglx@linutronix.de \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®