git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: Fix build warning in arch/arm/mm/alignment.c
[pandora-kernel.git]
/
arch
/
arm
/
mach-mmp
/
time.c
diff --git
a/arch/arm/mach-mmp/time.c
b/arch/arm/mach-mmp/time.c
index
4e91ee6
..
71fc4ee
100644
(file)
--- a/
arch/arm/mach-mmp/time.c
+++ b/
arch/arm/mach-mmp/time.c
@@
-25,7
+25,6
@@
#include <linux/io.h>
#include <linux/irq.h>
#include <linux/io.h>
#include <linux/irq.h>
-#include <linux/sched.h>
#include <asm/sched_clock.h>
#include <mach/addr-map.h>
#include <asm/sched_clock.h>
#include <mach/addr-map.h>
@@
-42,8
+41,6
@@
#define MAX_DELTA (0xfffffffe)
#define MIN_DELTA (16)
#define MAX_DELTA (0xfffffffe)
#define MIN_DELTA (16)
-static DEFINE_CLOCK_DATA(cd);
-
/*
* FIXME: the timer needs some delay to stablize the counter capture
*/
/*
* FIXME: the timer needs some delay to stablize the counter capture
*/
@@
-59,16
+56,9
@@
static inline uint32_t timer_read(void)
return __raw_readl(TIMERS_VIRT_BASE + TMR_CVWR(1));
}
return __raw_readl(TIMERS_VIRT_BASE + TMR_CVWR(1));
}
-
unsigned long long notrace
sched_clock(void)
+
static u32 notrace mmp_read_
sched_clock(void)
{
{
- u32 cyc = timer_read();
- return cyc_to_sched_clock(&cd, cyc, (u32)~0);
-}
-
-static void notrace mmp_update_sched_clock(void)
-{
- u32 cyc = timer_read();
- update_sched_clock(&cd, cyc, (u32)~0);
+ return timer_read();
}
static irqreturn_t timer_interrupt(int irq, void *dev_id)
}
static irqreturn_t timer_interrupt(int irq, void *dev_id)
@@
-201,7
+191,7
@@
void __init timer_init(int irq)
{
timer_config();
{
timer_config();
-
init_sched_clock(&cd, mmp_update
_sched_clock, 32, CLOCK_TICK_RATE);
+
setup_sched_clock(mmp_read
_sched_clock, 32, CLOCK_TICK_RATE);
ckevt.mult = div_sc(CLOCK_TICK_RATE, NSEC_PER_SEC, ckevt.shift);
ckevt.max_delta_ns = clockevent_delta2ns(MAX_DELTA, &ckevt);
ckevt.mult = div_sc(CLOCK_TICK_RATE, NSEC_PER_SEC, ckevt.shift);
ckevt.max_delta_ns = clockevent_delta2ns(MAX_DELTA, &ckevt);