Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 80238
b: refs/heads/master
c: 1017579
h: refs/heads/master
v: v3
  • Loading branch information
Harvey Harrison authored and Ingo Molnar committed Jan 30, 2008
1 parent b5d7ecb commit 0b31551
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 1379a5ce3ffc549a7ff3daffc49c5e1c372717a3
refs/heads/master: 1017579a8c6ad6f32154e41ddfdf96d1efbb21b4
6 changes: 3 additions & 3 deletions trunk/arch/x86/kernel/kprobes.c
Original file line number Diff line number Diff line change
Expand Up @@ -583,8 +583,8 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
* When a retprobed function returns, this code saves registers and
* calls trampoline_handler() runs, which calls the kretprobe's handler.
*/
void __kprobes kretprobe_trampoline_holder(void)
{
void __kprobes kretprobe_trampoline_holder(void)
{
asm volatile (
".global kretprobe_trampoline\n"
"kretprobe_trampoline: \n"
Expand Down Expand Up @@ -670,7 +670,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
" popf\n"
#endif
" ret\n");
}
}

/*
* Called from kretprobe_trampoline
Expand Down

0 comments on commit 0b31551

Please sign in to comment.