Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 86034
b: refs/heads/master
c: 66200ea
h: refs/heads/master
v: v3
  • Loading branch information
Ananth N Mavinakayanahalli authored and Paul Mackerras committed Feb 20, 2008
1 parent 7f54c17 commit 1d68963
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 13dbf42210565418e925f883e9217b9eda5244a2
refs/heads/master: 66200ea2228da6aaf317d21e67b1157aae7168e7
9 changes: 5 additions & 4 deletions trunk/arch/powerpc/kernel/kprobes.c
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
* - When the probed function returns, this probe
* causes the handlers to fire
*/
void kretprobe_trampoline_holder(void)
static void __used kretprobe_trampoline_holder(void)
{
asm volatile(".global kretprobe_trampoline\n"
"kretprobe_trampoline:\n"
Expand All @@ -284,7 +284,8 @@ void kretprobe_trampoline_holder(void)
/*
* Called when the probe at kretprobe trampoline is hit
*/
int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
static int __kprobes trampoline_probe_handler(struct kprobe *p,
struct pt_regs *regs)
{
struct kretprobe_instance *ri = NULL;
struct hlist_head *head, empty_rp;
Expand Down Expand Up @@ -517,12 +518,12 @@ int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
return 1;
}

void __kprobes jprobe_return(void)
void __used __kprobes jprobe_return(void)
{
asm volatile("trap" ::: "memory");
}

void __kprobes jprobe_return_end(void)
static void __used __kprobes jprobe_return_end(void)
{
};

Expand Down

0 comments on commit 1d68963

Please sign in to comment.