diff options
| author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-04-19 17:31:52 -0400 |
|---|---|---|
| committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-04-19 17:31:52 -0400 |
| commit | f70a290e8a889caa905ab7650c696f2bb299be1a (patch) | |
| tree | 56f0886d839499e9f522f189999024b3e86f9be2 /arch/x86/Kconfig | |
| parent | fcc9d2e5a6c89d22b8b773a64fb4ad21ac318446 (diff) | |
| parent | 7ef4a793a624c6e66c16ca1051847f75161f5bec (diff) | |
Merge branch 'wip-nested-locking' into tegra-nested-lockingwip-nested-locking
Conflicts:
Makefile
include/linux/fs.h
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index b8cd5448b0e..4ff921c9f84 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -2151,3 +2151,11 @@ source "crypto/Kconfig" | |||
| 2151 | source "arch/x86/kvm/Kconfig" | 2151 | source "arch/x86/kvm/Kconfig" |
| 2152 | 2152 | ||
| 2153 | source "lib/Kconfig" | 2153 | source "lib/Kconfig" |
| 2154 | |||
| 2155 | config ARCH_HAS_FEATHER_TRACE | ||
| 2156 | def_bool y | ||
| 2157 | |||
| 2158 | config ARCH_HAS_SEND_PULL_TIMERS | ||
| 2159 | def_bool y | ||
| 2160 | |||
| 2161 | source "litmus/Kconfig" | ||