diff options
| author | Sachin Nikam <snikam@nvidia.com> | 2013-03-06 19:12:15 +0530 |
|---|---|---|
| committer | Sachin Nikam <snikam@nvidia.com> | 2013-03-06 19:31:07 +0530 |
| commit | d3dd6b4227fe3e59df0a55f679ec196e4ccb1e3a (patch) | |
| tree | 0137a07ecab729a19cea68b671c88def5bf83a2d /arch/mips/kernel/kgdb.c | |
| parent | bb36790494c382ec26250f351c8cea76613f0f02 (diff) | |
| parent | 2713e2797a78a0fdda765bc5ad7fed41e94818ba (diff) | |
Merge branch 'linux-3.4.35' into rel-17
Bug 1243631
Change-Id: I915826047b2e20f0ad0a7d75df295c6cbf6e5b0a
Diffstat (limited to 'arch/mips/kernel/kgdb.c')
| -rw-r--r-- | arch/mips/kernel/kgdb.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/mips/kernel/kgdb.c b/arch/mips/kernel/kgdb.c index f4546e97c60d..23817a6e32b6 100644 --- a/arch/mips/kernel/kgdb.c +++ b/arch/mips/kernel/kgdb.c @@ -283,6 +283,15 @@ static int kgdb_mips_notify(struct notifier_block *self, unsigned long cmd, struct pt_regs *regs = args->regs; int trap = (regs->cp0_cause & 0x7c) >> 2; +#ifdef CONFIG_KPROBES + /* + * Return immediately if the kprobes fault notifier has set + * DIE_PAGE_FAULT. + */ + if (cmd == DIE_PAGE_FAULT) + return NOTIFY_DONE; +#endif /* CONFIG_KPROBES */ + /* Userspace events, ignore. */ if (user_mode(regs)) return NOTIFY_DONE; |