summaryrefslogtreecommitdiffstats
path: root/arch/Kconfig
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-12-21 15:44:34 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-12-21 15:44:34 +0900
commit4b4f887fb2780e39383c1f202b72f5a2780b2d4c (patch)
treee790d89c2612d2464ac00063dac677653f4ac9cb /arch/Kconfig
parent6424db52e24e8cdf89917fa3c10395116440160e (diff)
parent76e7461a21dfe13565b2a323b53c8cc963541126 (diff)
downloadop-kernel-dev-4b4f887fb2780e39383c1f202b72f5a2780b2d4c.zip
op-kernel-dev-4b4f887fb2780e39383c1f202b72f5a2780b2d4c.tar.gz
Merge branch 'master' into sh/hw-breakpoints
Diffstat (limited to 'arch/Kconfig')
-rw-r--r--arch/Kconfig13
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/Kconfig b/arch/Kconfig
index eef3bbb..9d055b4 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -83,6 +83,13 @@ config KRETPROBES
def_bool y
depends on KPROBES && HAVE_KRETPROBES
+config USER_RETURN_NOTIFIER
+ bool
+ depends on HAVE_USER_RETURN_NOTIFIER
+ help
+ Provide a kernel-internal notification when a cpu is about to
+ switch to user mode.
+
config HAVE_IOREMAP_PROT
bool
@@ -128,9 +135,9 @@ config HAVE_DEFAULT_NO_SPIN_MUTEXES
config HAVE_HW_BREAKPOINT
bool
- depends on HAVE_PERF_EVENTS
- select ANON_INODES
- select PERF_EVENTS
+ depends on PERF_EVENTS
+config HAVE_USER_RETURN_NOTIFIER
+ bool
source "kernel/gcov/Kconfig"
OpenPOWER on IntegriCloud