]> git.karo-electronics.de Git - karo-tx-linux.git/commit
ARM: 7699/1: sched_clock: Add more notrace to prevent recursion
authorStephen Boyd <sboyd@codeaurora.org>
Thu, 18 Apr 2013 16:33:40 +0000 (17:33 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 1 May 2013 16:46:20 +0000 (09:46 -0700)
commit84237e8d1b43b896a86e14928993901993ede254
tree627d9c734e2044f3c2527635eaf3c64b7b1b5580
parent19ffe4c3896698b6d565d293a37bde5567d4e1aa
ARM: 7699/1: sched_clock: Add more notrace to prevent recursion

commit cea15092f098b7018e89f64a5a14bb71955965d5 upstream.

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 <sboyd@codeaurora.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm/kernel/sched_clock.c