diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-12 08:18:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-12 08:18:41 -0800 |
| commit | 067d14f0dde8c7d7c41064e7eb021db7477c9aac (patch) | |
| tree | f44f763488cd7a64e01a96762e8c7b8722958820 /arch/sparc/include/asm/ttable.h | |
| parent | ce38aa9cbed3d109355b0169b520362c409c0541 (diff) | |
| parent | 541cc39433a81d581f2738f59f7bd310ff1d512a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc updates from David Miller:
"Just a bunch of small cleanups and fixes here, and support for user
probes from Allen Pais"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc: fix a building error reported by kbuild
sparc64: fix typo in pgd_clear()
sparc64: restore irq in error paths in iommu
sparc: leon: Fix a retry loop in leon_init_timers()
sparc64: make string buffers large enough
sparc64: move dereference after check for NULL
sparc: kernel: use builtin_platform_driver
sparc64:Support User Probes for sparc
Diffstat (limited to 'arch/sparc/include/asm/ttable.h')
| -rw-r--r-- | arch/sparc/include/asm/ttable.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/ttable.h b/arch/sparc/include/asm/ttable.h index 781b9f1dbdc2..82e7df296abc 100644 --- a/arch/sparc/include/asm/ttable.h +++ b/arch/sparc/include/asm/ttable.h @@ -186,6 +186,12 @@ #define KPROBES_TRAP(lvl) TRAP_ARG(bad_trap, lvl) #endif +#ifdef CONFIG_UPROBES +#define UPROBES_TRAP(lvl) TRAP_ARG(uprobe_trap, lvl) +#else +#define UPROBES_TRAP(lvl) TRAP_ARG(bad_trap, lvl) +#endif + #ifdef CONFIG_KGDB #define KGDB_TRAP(lvl) TRAP_IRQ(kgdb_trap, lvl) #else |