linux-kernel - linux-next: manual merge of the tip tree with the s390 tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20090824170119.57cf4f59.sfr@canb.auug.org.au>
Date:	Mon, 24 Aug 2009 17:01:19 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Martin Schwidefsky <schwidefsky@...ibm.com>,
	Heiko Carstens <heiko.carstens@...ibm.com>
Subject: linux-next: manual merge of the tip tree with the s390 tree

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@...b.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)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/