浏览代码

ARM: picoxcell: fix sched_clock() cleanup fallout

Commit 2f0778afa (ARM: 7205/2: sched_clock: allow sched_clock to be
selected at runtime) replaced the picoxcell specific sched_clock() with
a generic runtime selectable version but replaced "unsigned long long
notrace sched_clock(void)" with "unsigned u32 notrace
picoxcell_read_sched_clock(void)" fix this up to return a u32 as
expected.

Cc: Marc Zyngier <Marc.Zyngier@arm.com>
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Jamie Iles 13 年之前
父节点
当前提交
6b2a05584c
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      arch/arm/mach-picoxcell/time.c

+ 1 - 1
arch/arm/mach-picoxcell/time.c

@@ -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);
 }
 }