Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 173135
b: refs/heads/master
c: e3a4fab
h: refs/heads/master
i:
  173133: d71c7b4
  173131: aebbb71
  173127: a4b65d3
  173119: ec6fb4d
v: v3
  • Loading branch information
Thomas Gleixner committed Nov 13, 2009
1 parent 0005858 commit b87a432
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 37 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7d2f944a2b836c69a9d260a0a5f0d1720d57fdff
refs/heads/master: e3a4fab0c0c30e21e104712f4e9cb39f175d0f21
14 changes: 11 additions & 3 deletions trunk/arch/mips/include/asm/time.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,16 @@ static inline int init_mips_clocksource(void)
#endif
}

extern void clocksource_set_clock(struct clocksource *cs, unsigned int clock);
extern void clockevent_set_clock(struct clock_event_device *cd,
unsigned int clock);
static inline void clocksource_set_clock(struct clocksource *cs,
unsigned int clock)
{
clocksource_calc_mult_shift(cs, clock, 4);
}

static inline void clockevent_set_clock(struct clock_event_device *cd,
unsigned int clock)
{
clockevents_calc_mult_shift(cd, clock, 4);
}

#endif /* _ASM_TIME_H */
33 changes: 0 additions & 33 deletions trunk/arch/mips/kernel/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,39 +71,6 @@ EXPORT_SYMBOL(perf_irq);

unsigned int mips_hpt_frequency;

void __init clocksource_set_clock(struct clocksource *cs, unsigned int clock)
{
u64 temp;
u32 shift;

/* Find a shift value */
for (shift = 32; shift > 0; shift--) {
temp = (u64) NSEC_PER_SEC << shift;
do_div(temp, clock);
if ((temp >> 32) == 0)
break;
}
cs->shift = shift;
cs->mult = (u32) temp;
}

void __cpuinit clockevent_set_clock(struct clock_event_device *cd,
unsigned int clock)
{
u64 temp;
u32 shift;

/* Find a shift value */
for (shift = 32; shift > 0; shift--) {
temp = (u64) clock << shift;
do_div(temp, NSEC_PER_SEC);
if ((temp >> 32) == 0)
break;
}
cd->shift = shift;
cd->mult = (u32) temp;
}

/*
* This function exists in order to cause an error due to a duplicate
* definition if platform code should have its own implementation. The hook
Expand Down

0 comments on commit b87a432

Please sign in to comment.