summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2016-04-14 14:29:48 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2016-04-14 14:29:48 -0400
commit12ae10f97adc355e33b504bedb9eebf6e4733d2e (patch)
tree4a47295ac3606add747dc40d816b59dbd6c4fc48
parent016754b0133a41da3a762cf5dcb2131adb65e181 (diff)
downloadkernel-12ae10f97adc355e33b504bedb9eebf6e4733d2e.tar.gz
kernel-12ae10f97adc355e33b504bedb9eebf6e4733d2e.tar.xz
kernel-12ae10f97adc355e33b504bedb9eebf6e4733d2e.zip
Disable oprofile driver as userspace oprofile only uses perf (rhbz 1326944)
-rw-r--r--config-generic3
-rw-r--r--kernel.spec3
2 files changed, 4 insertions, 2 deletions
diff --git a/config-generic b/config-generic
index c2b205edc..fa1a84da7 100644
--- a/config-generic
+++ b/config-generic
@@ -4838,8 +4838,7 @@ CONFIG_NLS_ASCII=y
# Profiling support
#
CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-CONFIG_OPROFILE_EVENT_MULTIPLEX=y
+# CONFIG_OPROFILE is not set
#
# Kernel hacking
diff --git a/kernel.spec b/kernel.spec
index c278077f7..324ad177a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2139,6 +2139,9 @@ fi
#
#
%changelog
+* Thu Apr 14 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- Disable oprofile driver as userspace oprofile only uses perf (rhbz 1326944)
+
* Thu Apr 14 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc3.git1.1
- Linux v4.6-rc3-57-g90de6800c240
- Reenable debugging options.