From: Jamie Iles Date: Mon, 9 Jan 2012 18:10:56 +0000 (+0000) Subject: ARM: picoxcell: fix sched_clock() cleanup fallout X-Git-Tag: v3.3-rc1~18^2~3^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b2a05584c5939eba24d22037dcb4cc71e5345e5;p=pandora-kernel.git 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 Signed-off-by: Jamie Iles --- Reading git-diff-tree failed