Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ddc76df authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer type cleanups from Thomas Gleixner:
 "This series does a tree wide cleanup of types related to
  timers/timekeeping.

   - Get rid of cycles_t and use a plain u64. The type is not really
     helpful and caused more confusion than clarity

   - Get rid of the ktime union. The union has become useless as we use
     the scalar nanoseconds storage unconditionally now. The 32bit
     timespec alike storage got removed due to the Y2038 limitations
     some time ago.

     That leaves the odd union access around for no reason. Clean it up.

  Both changes have been done with coccinelle and a small amount of
  manual mopping up"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  ktime: Get rid of ktime_equal()
  ktime: Cleanup ktime_set() usage
  ktime: Get rid of the union
  clocksource: Use a plain u64 instead of cycle_t
parents b272f732 1f3a8e49

arch/alpha/kernel/time.c

+2 −2
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ init_rtc_clockevent(void) 
 * The QEMU clock as a clocksource primitive.

 */



static cycle_t

static u64

qemu_cs_read(struct clocksource *cs)

{

	return qemu_get_vmtime();
@@ -260,7 +260,7 @@ common_init_rtc(void) 
 * use this method when WTINT is in use.

 */



static cycle_t read_rpcc(struct clocksource *cs)

static u64 read_rpcc(struct clocksource *cs)

{

	return rpcc();

}

arch/arm/mach-davinci/time.c

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ static void __init timer_init(void) 
/*

 * clocksource

 */

static cycle_t read_cycles(struct clocksource *cs)

static u64 read_cycles(struct clocksource *cs)

{

	struct timer_s *t = &timers[TID_CLOCKSOURCE];

arch/arm/mach-ep93xx/timer-ep93xx.c

+2 −2
Original line number Diff line number Diff line
@@ -59,13 +59,13 @@ static u64 notrace ep93xx_read_sched_clock(void) 
	return ret;

}



cycle_t ep93xx_clocksource_read(struct clocksource *c)

u64 ep93xx_clocksource_read(struct clocksource *c)

{

	u64 ret;



	ret = readl(EP93XX_TIMER4_VALUE_LOW);

	ret |= ((u64) (readl(EP93XX_TIMER4_VALUE_HIGH) & 0xff) << 32);

	return (cycle_t) ret;

	return (u64) ret;

}



static int ep93xx_clkevt_set_next_event(unsigned long next,

arch/arm/mach-footbridge/dc21285-timer.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


#include "common.h"



static cycle_t cksrc_dc21285_read(struct clocksource *cs)

static u64 cksrc_dc21285_read(struct clocksource *cs)

{

	return cs->mask - *CSR_TIMER2_VALUE;

}

arch/arm/mach-ixp4xx/common.c

+1 −1
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ static u64 notrace ixp4xx_read_sched_clock(void) 
 * clocksource

 */



static cycle_t ixp4xx_clocksource_read(struct clocksource *c)

static u64 ixp4xx_clocksource_read(struct clocksource *c)

{

	return *IXP4XX_OSTS;

}