diff options
| author | Vyacheslav Cherkashin <v.cherkashin@samsung.com> | 2015-08-28 16:30:47 +0300 |
|---|---|---|
| committer | Dmitry Kovalenko <d.kovalenko@samsung.com> | 2015-09-03 03:12:41 -0700 |
| commit | 54afb0ed500295bb79a045a0fbde60ca5c0771b1 (patch) | |
| tree | 05653cf3fcd066b5ca0f33ab0ef3f2eb0b391576 | |
| parent | bf2fb6b4630e93faccdb108026080ee9441fa363 (diff) | |
| download | swap-modules-54afb0ed500295bb79a045a0fbde60ca5c0771b1.tar.gz swap-modules-54afb0ed500295bb79a045a0fbde60ca5c0771b1.tar.bz2 swap-modules-54afb0ed500295bb79a045a0fbde60ca5c0771b1.zip | |
[FIX] Remove masking oops_in_progress
Change-Id: Ida57330dde3e3601a7992cff63e7b8cd55735855
Signed-off-by: Vyacheslav Cherkashin <v.cherkashin@samsung.com>
| -rw-r--r-- | kprobe/arch/arm/swap-asm/swap_kprobes.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/kprobe/arch/arm/swap-asm/swap_kprobes.c b/kprobe/arch/arm/swap-asm/swap_kprobes.c index d129af36..b76aba5b 100644 --- a/kprobe/arch/arm/swap-asm/swap_kprobes.c +++ b/kprobe/arch/arm/swap-asm/swap_kprobes.c @@ -52,7 +52,6 @@ #include <linux/list.h> #include <linux/hash.h> -#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; } |