x86: unexport io_delay_type

[safe/jmp/linux-2.6] / arch / x86 / kernel / kprobes.c

diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
index 53ba6a5..34a5912 100644 (file)
--- a/arch/x86/kernel/kprobes.c
+++ b/arch/x86/kernel/kprobes.c
@@ -410,13 +410,13 @@ static void __kprobes set_current_kprobe(struct kprobe *p, struct pt_regs *regs,
 static void __kprobes clear_btf(void)
 {
        if (test_thread_flag(TIF_DEBUGCTLMSR))
-               wrmsr(MSR_IA32_DEBUGCTLMSR, 0, 0);
+               wrmsrl(MSR_IA32_DEBUGCTLMSR, 0);
 }
 
 static void __kprobes restore_btf(void)
 {
        if (test_thread_flag(TIF_DEBUGCTLMSR))
-               wrmsr(MSR_IA32_DEBUGCTLMSR, current->thread.debugctlmsr, 0);
+               wrmsrl(MSR_IA32_DEBUGCTLMSR, current->thread.debugctlmsr);
 }
 
 static void __kprobes prepare_singlestep(struct kprobe *p, struct pt_regs *regs)
@@ -443,17 +443,6 @@ void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri,
        *sara = (unsigned long) &kretprobe_trampoline;
 }
 
-static void __kprobes recursive_singlestep(struct kprobe *p,
-                                          struct pt_regs *regs,
-                                          struct kprobe_ctlblk *kcb)
-{
-       save_previous_kprobe(kcb);
-       set_current_kprobe(p, regs, kcb);
-       kprobes_inc_nmissed_count(p);
-       prepare_singlestep(p, regs);
-       kcb->kprobe_status = KPROBE_REENTER;
-}
-
 static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,
                                       struct kprobe_ctlblk *kcb)
 {
@@ -492,20 +481,29 @@ static int __kprobes reenter_kprobe(struct kprobe *p, struct pt_regs *regs,
                break;
 #endif
        case KPROBE_HIT_ACTIVE:
-               recursive_singlestep(p, regs, kcb);
+               save_previous_kprobe(kcb);
+               set_current_kprobe(p, regs, kcb);
+               kprobes_inc_nmissed_count(p);
+               prepare_singlestep(p, regs);
+               kcb->kprobe_status = KPROBE_REENTER;
                break;
        case KPROBE_HIT_SS:
-               if (*p->ainsn.insn == BREAKPOINT_INSTRUCTION) {
+               if (p == kprobe_running()) {
                        regs->flags &= ~TF_MASK;
                        regs->flags |= kcb->kprobe_saved_flags;
                        return 0;
                } else {
-                       recursive_singlestep(p, regs, kcb);
+                       /* A probe has been hit in the codepath leading up
+                        * to, or just after, single-stepping of a probed
+                        * instruction. This entire codepath should strictly
+                        * reside in .kprobes.text section. Raise a warning
+                        * to highlight this peculiar case.
+                        */
                }
-               break;
        default:
                /* impossible cases */
                WARN_ON(1);
+               return 0;
        }
 
        return 1;
@@ -583,8 +581,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)
- {
+static void __used __kprobes kretprobe_trampoline_holder(void)
+{
        asm volatile (
                        ".global kretprobe_trampoline\n"
                        "kretprobe_trampoline: \n"
@@ -670,12 +668,12 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
                        "       popf\n"
 #endif
                        "       ret\n");
- }
+}
 
 /*
  * Called from kretprobe_trampoline
  */
-void * __kprobes trampoline_handler(struct pt_regs *regs)
+static __used __kprobes void *trampoline_handler(struct pt_regs *regs)
 {
        struct kretprobe_instance *ri = NULL;
        struct hlist_head *head, empty_rp;
@@ -955,7 +953,7 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr)
 int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
                                       unsigned long val, void *data)
 {
-       struct die_args *args = (struct die_args *)data;
+       struct die_args *args = data;
        int ret = NOTIFY_DONE;
 
        if (args->regs && user_mode_vm(args->regs))