From 54afb0ed500295bb79a045a0fbde60ca5c0771b1 Mon Sep 17 00:00:00 2001 From: Vyacheslav Cherkashin Date: Fri, 28 Aug 2015 16:30:47 +0300 Subject: [PATCH] [FIX] Remove masking oops_in_progress Change-Id: Ida57330dde3e3601a7992cff63e7b8cd55735855 Signed-off-by: Vyacheslav Cherkashin --- kprobe/arch/arm/swap-asm/swap_kprobes.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/kprobe/arch/arm/swap-asm/swap_kprobes.c b/kprobe/arch/arm/swap-asm/swap_kprobes.c index d129af3..b76aba5 100644 --- a/kprobe/arch/arm/swap-asm/swap_kprobes.c +++ b/kprobe/arch/arm/swap-asm/swap_kprobes.c @@ -52,7 +52,6 @@ #include #include -#define SUPRESS_BUG_MESSAGES /**< Debug-off definition */ #define sign_extend(x, signbit) ((x) | (0 - ((x) & (1 << (signbit))))) #define branch_displacement(insn) sign_extend(((insn) & 0xffffff) << 2, 25) @@ -459,24 +458,12 @@ int kprobe_trap_handler(struct pt_regs *regs, unsigned int instr) int ret; unsigned long flags; -#ifdef SUPRESS_BUG_MESSAGES - int swap_oops_in_progress; - /* oops_in_progress used to avoid BUG() messages - * that slow down kprobe_handler() execution */ - swap_oops_in_progress = oops_in_progress; - oops_in_progress = 1; -#endif - local_irq_save(flags); preempt_disable(); ret = kprobe_handler(regs); swap_preempt_enable_no_resched(); local_irq_restore(flags); -#ifdef SUPRESS_BUG_MESSAGES - oops_in_progress = swap_oops_in_progress; -#endif - return ret; } -- 2.7.4