From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Martin Schwidefsky <schwidefsky@de•ibm.com>,
Heiko Carstens <heiko.carstens@de•ibm.com>
Subject: linux-next: manual merge of the tip tree with the s390 tree
Date: Mon, 24 Aug 2009 17:01:19 +1000 [thread overview]
Message-ID: <20090824170119.57cf4f59.sfr@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/s390/kernel/time.c between commit
6342887c12d79c5a2c8c1de5be6f483e16a2acdd ("[S390] introduce
get_clock_monotonic") from the s390 tree and commit
23970e389e9cee43c4b41023935e1417271708b2 ("timekeeping: Introduce
read_boot_clock") from the tip tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/s390/kernel/time.c
index 6f0d86f,6bff1a1..0000000
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@@ -183,12 -182,14 +183,14 @@@ static void timing_alert_interrupt(__u1
static void etr_reset(void);
static void stp_reset(void);
- unsigned long read_persistent_clock(void)
+ void read_persistent_clock(struct timespec *ts)
{
- struct timespec ts;
+ tod_to_timeval(get_clock() - TOD_UNIX_EPOCH, ts);
+ }
- tod_to_timeval(get_clock() - TOD_UNIX_EPOCH, &ts);
- return ts.tv_sec;
+ void read_boot_clock(struct timespec *ts)
+ {
- tod_to_timeval(sched_clock_base_cc - TOD_UNIX_EPOCH, ts);
++ tod_to_timeval(sched_clock_base - TOD_UNIX_EPOCH, ts);
}
static cycle_t read_tod_clock(struct clocksource *cs)
next reply other threads:[~2009-08-24 7:01 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-24 7:01 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-03-14 3:46 linux-next: manual merge of the tip tree with the s390 tree Stephen Rothwell
2013-02-07 2:50 Stephen Rothwell
2015-08-20 5:32 Stephen Rothwell
2017-10-11 15:51 Mark Brown
2017-11-13 5:30 ` Stephen Rothwell
2017-11-01 6:04 Stephen Rothwell
2019-05-06 6:58 Stephen Rothwell
2023-02-10 1:00 Stephen Rothwell
2023-02-21 23:03 ` Stephen Rothwell
2023-04-18 13:40 broonie
2025-03-19 4:54 Stephen Rothwell
2025-03-19 19:50 ` Ingo Molnar
2025-03-28 14:16 ` Joel Granados
2025-03-26 1:28 ` Stephen Rothwell
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=20090824170119.57cf4f59.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=heiko.carstens@de$(echo .)ibm.com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=schwidefsky@de$(echo .)ibm.com \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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