mirror of
https://github.com/FEX-Emu/linux.git
synced 2025-02-01 00:23:00 +00:00
Merge branch 'picoxcell-fixes' of git://github.com/jamieiles/linux-2.6-ji into fixes
* 'picoxcell-fixes' of git://github.com/jamieiles/linux-2.6-ji: ARM: picoxcell: fix sched_clock() cleanup fallout
This commit is contained in:
commit
bbc390a6f2
@ -67,7 +67,7 @@ static void picoxcell_add_clocksource(struct device_node *source_timer)
|
|||||||
|
|
||||||
static void __iomem *sched_io_base;
|
static void __iomem *sched_io_base;
|
||||||
|
|
||||||
unsigned u32 notrace picoxcell_read_sched_clock(void)
|
static u32 picoxcell_read_sched_clock(void)
|
||||||
{
|
{
|
||||||
return __raw_readl(sched_io_base);
|
return __raw_readl(sched_io_base);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user