Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
b734dd5b
Commit
b734dd5b
authored
Oct 15, 2009
by
Benjamin Herrenschmidt
Browse files
Options
Browse Files
Download
Plain Diff
Merge commit 'ftrace/ppc' into merge
parents
0f6023d5
be10ab10
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
arch/powerpc/kernel/entry_64.S
arch/powerpc/kernel/entry_64.S
+1
-2
arch/powerpc/kernel/process.c
arch/powerpc/kernel/process.c
+7
-3
No files found.
arch/powerpc/kernel/entry_64.S
View file @
b734dd5b
...
...
@@ -1038,8 +1038,7 @@ _GLOBAL(mod_return_to_handler)
*
We
are
in
a
module
using
the
module
's TOC.
*
Switch
to
our
TOC
to
run
inside
the
core
kernel
.
*/
LOAD_REG_IMMEDIATE
(
r4
,
ftrace_return_to_handler
)
ld
r2
,
8
(
r4
)
ld
r2
,
PACATOC
(
r13
)
bl
.
ftrace_return_to_handler
nop
...
...
arch/powerpc/kernel/process.c
View file @
b734dd5b
...
...
@@ -1016,9 +1016,13 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
int
curr_frame
=
current
->
curr_ret_stack
;
extern
void
return_to_handler
(
void
);
unsigned
long
addr
=
(
unsigned
long
)
return_to_handler
;
unsigned
long
rth
=
(
unsigned
long
)
return_to_handler
;
unsigned
long
mrth
=
-
1
;
#ifdef CONFIG_PPC64
addr
=
*
(
unsigned
long
*
)
addr
;
extern
void
mod_return_to_handler
(
void
);
rth
=
*
(
unsigned
long
*
)
rth
;
mrth
=
(
unsigned
long
)
mod_return_to_handler
;
mrth
=
*
(
unsigned
long
*
)
mrth
;
#endif
#endif
...
...
@@ -1044,7 +1048,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
if
(
!
firstframe
||
ip
!=
lr
)
{
printk
(
"["
REG
"] ["
REG
"] %pS"
,
sp
,
ip
,
(
void
*
)
ip
);
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
if
(
ip
==
addr
&&
curr_frame
>=
0
)
{
if
(
(
ip
==
rth
||
ip
==
mrth
)
&&
curr_frame
>=
0
)
{
printk
(
" (%pS)"
,
(
void
*
)
current
->
ret_stack
[
curr_frame
].
ret
);
curr_frame
--
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment