OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge 4.9.120 into android-4.9
[android-x86/kernel.git]
/
arch
/
Kconfig
diff --git
a/arch/Kconfig
b/arch/Kconfig
index
0847b5d
..
2fa953f
100644
(file)
--- a/
arch/Kconfig
+++ b/
arch/Kconfig
@@
-5,6
+5,9
@@
config KEXEC_CORE
bool
+config HOTPLUG_SMT
+ bool
+
config OPROFILE
tristate "OProfile system profiling"
depends on PROFILING