diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-06 22:19:25 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-06 22:19:25 -0500 |
| commit | 8679c424756695edaa00722d8add45bd9887d006 (patch) | |
| tree | 2cdd3d1b45ef3f5aca956fb3ea90916c982fe929 | |
| parent | 773bf86311e778f909dce819b9cdb032402f5722 (diff) | |
| download | rt-patches-8679c424756695edaa00722d8add45bd9887d006.tar.gz | |
refresh x86-kprobes-Fix-missed-preemptions.patchv2.6.33-5164-g9467c4fv2.6.33-5161-g35c2e96v2.6.33-5141-g660f6a3
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | x86-kprobes-Fix-missed-preemptions.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/x86-kprobes-Fix-missed-preemptions.patch b/x86-kprobes-Fix-missed-preemptions.patch index e35cf00..74c20a3 100644 --- a/x86-kprobes-Fix-missed-preemptions.patch +++ b/x86-kprobes-Fix-missed-preemptions.patch @@ -1,4 +1,4 @@ -From dee033c5ba00351075fc6b17e9203670416f499a Mon Sep 17 00:00:00 2001 +From fdf53c05e5e9f7a48bd637fde223565ae472f5fa Mon Sep 17 00:00:00 2001 From: Ingo Molnar <mingo@elte.hu> Date: Fri, 3 Jul 2009 08:29:25 -0500 Subject: [PATCH] x86: kprobes: Fix missed preemptions @@ -14,19 +14,19 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c -index 5b8c750..04bc8c9 100644 +index b43bbae..d973852 100644 --- a/arch/x86/kernel/kprobes.c +++ b/arch/x86/kernel/kprobes.c -@@ -434,7 +434,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs, - /* Boost up -- we can execute copied instructions directly */ - reset_current_kprobe(); +@@ -468,7 +468,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs, + * stepping. + */ regs->ip = (unsigned long)p->ainsn.insn; - preempt_enable_no_resched(); + preempt_enable(); return; } #endif -@@ -543,7 +543,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs) +@@ -587,7 +587,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs) } } /* else: not a kprobe fault; let the kernel handle it */ @@ -35,7 +35,7 @@ index 5b8c750..04bc8c9 100644 return 0; } -@@ -843,7 +843,7 @@ static int __kprobes post_kprobe_handler(struct pt_regs *regs) +@@ -893,7 +893,7 @@ static int __kprobes post_kprobe_handler(struct pt_regs *regs) } reset_current_kprobe(); out: @@ -44,7 +44,7 @@ index 5b8c750..04bc8c9 100644 /* * if somebody else is singlestepping across a probe point, flags -@@ -877,7 +877,7 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr) +@@ -927,7 +927,7 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr) restore_previous_kprobe(kcb); else reset_current_kprobe(); @@ -53,7 +53,7 @@ index 5b8c750..04bc8c9 100644 break; case KPROBE_HIT_ACTIVE: case KPROBE_HIT_SSDONE: -@@ -1024,7 +1024,7 @@ int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs) +@@ -1074,7 +1074,7 @@ int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs) memcpy((kprobe_opcode_t *)(kcb->jprobe_saved_sp), kcb->jprobes_stack, MIN_STACK_SIZE(kcb->jprobe_saved_sp)); |