diff options
| author | Kirill Tkhai <tkhai@yandex.ru> | 2013-09-14 14:02:11 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-11-14 23:57:21 +0100 |
| commit | 812cb83a56a908729c453a7db3fb2c262119bc9d (patch) | |
| tree | 3fdf3df047276db7de85558ff6caff006c3b1cc4 /arch/sparc/kernel/kprobes.c | |
| parent | sparc64: Add self-IPI support for smp_send_reschedule() (diff) | |
| download | linux-812cb83a56a908729c453a7db3fb2c262119bc9d.tar.xz linux-812cb83a56a908729c453a7db3fb2c262119bc9d.zip | |
sparc64: Implement HAVE_CONTEXT_TRACKING
Mark the places when the system are in user or are in kernel.
This is used to make full dynticks system (tickless) --
CONFIG_NO_HZ_FULL dependence.
Signed-off-by: Kirill Tkhai <tkhai@yandex.ru>
CC: David Miller <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/kprobes.c')
| -rw-r--r-- | arch/sparc/kernel/kprobes.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/sparc/kernel/kprobes.c b/arch/sparc/kernel/kprobes.c index e72212148d2a..5a09fd315e5f 100644 --- a/arch/sparc/kernel/kprobes.c +++ b/arch/sparc/kernel/kprobes.c @@ -8,6 +8,7 @@ #include <linux/module.h> #include <linux/kdebug.h> #include <linux/slab.h> +#include <linux/context_tracking.h> #include <asm/signal.h> #include <asm/cacheflush.h> #include <asm/uaccess.h> @@ -418,12 +419,14 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self, asmlinkage void __kprobes kprobe_trap(unsigned long trap_level, struct pt_regs *regs) { + enum ctx_state prev_state = exception_enter(); + BUG_ON(trap_level != 0x170 && trap_level != 0x171); if (user_mode(regs)) { local_irq_enable(); bad_trap(regs, trap_level); - return; + goto out; } /* trap_level == 0x170 --> ta 0x70 @@ -433,6 +436,8 @@ asmlinkage void __kprobes kprobe_trap(unsigned long trap_level, (trap_level == 0x170) ? "debug" : "debug_2", regs, 0, trap_level, SIGTRAP) != NOTIFY_STOP) bad_trap(regs, trap_level); +out: + exception_exit(prev_state); } /* Jprobes support. */ |