ARM: 7699/1: sched_clock: Add more notrace to prevent recursion
authorStephen Boyd <[email protected]>
Thu, 18 Apr 2013 16:33:40 +0000 (17:33 +0100)
committerRussell King <[email protected]>
Fri, 19 Apr 2013 21:23:55 +0000 (22:23 +0100)
commitcea15092f098b7018e89f64a5a14bb71955965d5
treefb52d959aaed9031b4d773a10db557aa103e35dc
parentcb2d8b342aa084d1f3ac29966245dec9163677fb
ARM: 7699/1: sched_clock: Add more notrace to prevent recursion

cyc_to_sched_clock() is called by sched_clock() and cyc_to_ns()
is called by cyc_to_sched_clock(). I suspect that some compilers
inline both of these functions into sched_clock() and so we've
been getting away without having a notrace marking. It seems that
my compiler isn't inlining cyc_to_sched_clock() though, so I'm
hitting a recursion bug when I enable the function graph tracer,
causing my system to crash. Marking these functions notrace fixes
it. Technically cyc_to_ns() doesn't need the notrace because it's
already marked inline, but let's just add it so that if we ever
remove inline from that function it doesn't blow up.

Signed-off-by: Stephen Boyd <[email protected]>
Signed-off-by: Russell King <[email protected]>
arch/arm/kernel/sched_clock.c