Messages in this thread | | | Date | Wed, 19 Dec 2007 00:43:11 -0500 | From | Masami Hiramatsu <> | Subject | Re: [PATCH] x86: __kprobes annotations |
| |
Harvey Harrison wrote: > __always_inline on some static functions was to ensure they ended > up in the .kprobes.text section. Mark this explicitly.
It is good to me. Thanks!
> > Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
> --- > arch/x86/kernel/kprobes.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c > index c7a26be..521a469 100644 > --- a/arch/x86/kernel/kprobes.c > +++ b/arch/x86/kernel/kprobes.c > @@ -159,7 +159,7 @@ struct kretprobe_blackpoint kretprobe_blacklist[] = { > const int kretprobe_blacklist_size = ARRAY_SIZE(kretprobe_blacklist); > > /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/ > -static void set_jmp_op(void *from, void *to) > +static void __kprobes set_jmp_op(void *from, void *to) > { > struct __arch_jmp_op { > char op; > @@ -174,7 +174,7 @@ static void set_jmp_op(void *from, void *to) > * Returns non-zero if opcode is boostable. > * RIP relative instructions are adjusted at copying time in 64 bits mode > */ > -static int can_boost(kprobe_opcode_t *opcodes) > +static int __kprobes can_boost(kprobe_opcode_t *opcodes) > { > kprobe_opcode_t opcode; > kprobe_opcode_t *orig_opcodes = opcodes; > @@ -392,13 +392,13 @@ static void __kprobes set_current_kprobe(struct kprobe *p, struct pt_regs *regs, > kcb->kprobe_saved_flags &= ~X86_EFLAGS_IF; > } > > -static void clear_btf(void) > +static void __kprobes clear_btf(void) > { > if (test_thread_flag(TIF_DEBUGCTLMSR)) > wrmsr(MSR_IA32_DEBUGCTLMSR, 0, 0); > } > > -static void restore_btf(void) > +static void __kprobes restore_btf(void) > { > if (test_thread_flag(TIF_DEBUGCTLMSR)) > wrmsr(MSR_IA32_DEBUGCTLMSR, current->thread.debugctlmsr, 0);
-- Masami Hiramatsu
Software Engineer Hitachi Computer Products (America) Inc. Software Solutions Division
e-mail: mhiramat@redhat.com, masami.hiramatsu.pt@hitachi.com
| |