UBUNTU: [Config] Enable KPROBES on arm64

BugLink: http://bugs.launchpad.net/bugs/1634271
Signed-off-by: dann frazier <dann.frazier@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 38109731ce2767008c050b86b45f37e04b3e20e8..1ff84a6c18feb4ac86f02fe7a8612be4129f19bd 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -268,7 +268,6 @@ CONFIG_KALLSYMS_ALL=y
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_XZ is not set
 CONFIG_KEXEC=y
-CONFIG_KPROBES=y
 CONFIG_KVM=m
 CONFIG_LDM_PARTITION=y
 CONFIG_LIBNVDIMM=y
@@ -465,7 +464,6 @@ CONFIG_PPS=m
 CONFIG_PPS_CLIENT_GPIO=m
 CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PRINT_QUOTA_WARNING is not set
-CONFIG_PROBE_EVENTS=y
 CONFIG_PSTORE=y
 # CONFIG_PSTORE_CONSOLE is not set
 CONFIG_PSTORE_RAM=m

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index a7b1cb98b23712bf69d694e0bf62daa0c68547c2..50d125510fb0d2ecc59fe070723b9f036f8452a2 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -7683,7 +7683,7 @@ CONFIG_SLUB_CPU_PARTIAL                         policy<{'amd64': 'y', 'arm64': '
 CONFIG_PROFILING                                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_OPROFILE                                 policy<{'amd64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_OPROFILE_EVENT_MULTIPLEX                 policy<{'amd64': 'n', 'i386': 'n'}>
-CONFIG_KPROBES                                  policy<{'amd64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
+CONFIG_KPROBES                                  policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_JUMP_LABEL                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'n', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_STATIC_KEYS_SELFTEST                     policy<{'amd64': 'n', 'arm64': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 #
@@ -8077,7 +8077,7 @@ CONFIG_RCU_TORTURE_TEST                         policy<{'amd64': 'n', 'arm64': '
 # Menu: Kernel hacking >> Runtime Testing
 CONFIG_LKDTM                                    policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_TEST_LIST_SORT                           policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
-CONFIG_KPROBES_SANITY_TEST                      policy<{'amd64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
+CONFIG_KPROBES_SANITY_TEST                      policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_BACKTRACE_SELF_TEST                      policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_RBTREE_TEST                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_INTERVAL_TREE_TEST                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
@@ -8109,7 +8109,7 @@ CONFIG_TRACER_SNAPSHOT                          policy<{'amd64': 'y', 'arm64': '
 CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP             policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_STACK_TRACER                             policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_BLK_DEV_IO_TRACE                         policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_KPROBE_EVENT                             policy<{'amd64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
+CONFIG_KPROBE_EVENT                             policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_UPROBE_EVENT                             policy<{'amd64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_FTRACE_STARTUP_TEST                      policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_MMIOTRACE                                policy<{'amd64': 'y', 'i386': 'y'}>
@@ -8809,7 +8809,7 @@ CONFIG_NFT_REDIR_IPV6                           policy<{'amd64': 'm', 'arm64': '
 
 # Menu: Networking support >> Networking options >> Network testing
 CONFIG_NET_PKTGEN                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
-CONFIG_NET_TCPPROBE                             policy<{'amd64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
+CONFIG_NET_TCPPROBE                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NET_DROP_MONITOR                         policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 
 # Menu: Networking support >> Networking options >> QoS and/or fair queueing

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 348958efe5de862dd446bbb7abf74de2946f2bf8..8829b9364b4f5a3bcd801ffcb2f08805a00c1fa8 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -298,7 +298,6 @@ CONFIG_JUMP_LABEL=y
 CONFIG_KALLSYMS_ALL=y
 # CONFIG_KEXEC is not set
 # CONFIG_KEYBOARD_SH_KEYSC is not set
-# CONFIG_KPROBES is not set
 CONFIG_KVM=y
 CONFIG_LDM_PARTITION=y
 CONFIG_LIBNVDIMM=y
@@ -405,6 +404,7 @@ CONFIG_NET_CADENCE=y
 CONFIG_NET_MPLS_GSO=m
 CONFIG_NET_PACKET_ENGINE=y
 CONFIG_NET_SWITCHDEV=y
+CONFIG_NET_TCPPROBE=m
 CONFIG_NET_VENDOR_3COM=y
 CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_NET_VENDOR_AGERE=y
@@ -505,7 +505,6 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PREEMPT is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_PROBE_EVENTS is not set
 CONFIG_PSTORE=y
 # CONFIG_PSTORE_CONSOLE is not set
 CONFIG_PSTORE_RAM=m

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index a4ff1054ab899929f64d0c4686e7564d90a9286b..47b5c55c0c14db1ef44ca9f4a6229016274f5196 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -282,7 +282,6 @@ CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_XZ is not set
 CONFIG_KEXEC=y
 CONFIG_KEYBOARD_SH_KEYSC=m
-CONFIG_KPROBES=y
 CONFIG_KVM=y
 CONFIG_LDM_PARTITION=y
 CONFIG_LIBNVDIMM=y
@@ -484,7 +483,6 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PREEMPT is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
-CONFIG_PROBE_EVENTS=y
 CONFIG_PSTORE=y
 CONFIG_PSTORE_CONSOLE=y
 CONFIG_PSTORE_RAM=y

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index b69a6d82c67e018782f420754fe2ec96b8d07628..b4c9aa0aecece897129c2a49659790ded9a71845 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4192,6 +4192,7 @@ CONFIG_KGDB_SERIAL_CONSOLE=y
 # CONFIG_KGDB_TESTS is not set
 CONFIG_KINGSUN_DONGLE=m
 CONFIG_KMX61=m
+CONFIG_KPROBES=y
 CONFIG_KPROBES_ON_FTRACE=y
 # CONFIG_KPROBES_SANITY_TEST is not set
 CONFIG_KPROBE_EVENT=y
@@ -6253,6 +6254,7 @@ CONFIG_PRINTK_TIME=y
 CONFIG_PRINT_STACK_DEPTH=64
 CONFIG_PRISM2_USB=m
 # CONFIG_PRISM54 is not set
+CONFIG_PROBE_EVENTS=y
 CONFIG_PROCESSOR_SELECT=y
 CONFIG_PROC_CHILDREN=y
 CONFIG_PROC_EVENTS=y

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index a553307ae70ac5783a769226436f7bc14ff3a527..e22c3a5c7405fc146b0967f4190b72e4b278f19f 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -265,7 +265,6 @@ CONFIG_KALLSYMS_ALL=y
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_XZ is not set
 CONFIG_KEXEC=y
-CONFIG_KPROBES=y
 CONFIG_KVM=m
 CONFIG_LDM_PARTITION=y
 CONFIG_LIBNVDIMM=y
@@ -457,7 +456,6 @@ CONFIG_PPS=m
 CONFIG_PPS_CLIENT_GPIO=m
 CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PRINT_QUOTA_WARNING is not set
-CONFIG_PROBE_EVENTS=y
 CONFIG_PSTORE=y
 # CONFIG_PSTORE_CONSOLE is not set
 CONFIG_PSTORE_RAM=m

diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 028f91f7a674b7e19d093b9d564a5b353dac9f88..d71a381115912153ccd9daf7bb9ea9e9279c9548 100644 (file)
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -243,7 +243,6 @@ CONFIG_JUMP_LABEL=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_XZ is not set
-CONFIG_KPROBES=y
 CONFIG_KVM=y
 CONFIG_LDM_PARTITION=y
 CONFIG_LIBNVDIMM=y
@@ -442,7 +441,6 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PREEMPT is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
-CONFIG_PROBE_EVENTS=y
 CONFIG_PSTORE=y
 # CONFIG_PSTORE_CONSOLE is not set
 CONFIG_PSTORE_RAM=m

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 29e3ea182cb0a516a8ac50b9fc30a287a6fc4ab0..afbfaf229e3a1e90b61c2b58453d70b22d690761 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -275,7 +275,6 @@ CONFIG_KERNEL_GZIP=y
 CONFIG_KERNEL_START=0xc000000000000000
 # CONFIG_KERNEL_XZ is not set
 CONFIG_KEXEC=y
-CONFIG_KPROBES=y
 CONFIG_KVM=y
 CONFIG_LDM_PARTITION=y
 CONFIG_LIBNVDIMM=y
@@ -504,7 +503,6 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PREEMPT is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
-CONFIG_PROBE_EVENTS=y
 CONFIG_PSTORE=y
 # CONFIG_PSTORE_CONSOLE is not set
 CONFIG_PSTORE_RAM=m

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 2988bb44a95f9e7ff99d723398fc650350b5a041..0fdba15ba0e50185a76052fc2eb1b282e5a292b2 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -233,7 +233,6 @@ CONFIG_JUMP_LABEL=y
 # CONFIG_KERNEL_GZIP is not set
 CONFIG_KERNEL_XZ=y
 CONFIG_KEXEC=y
-CONFIG_KPROBES=y
 CONFIG_KVM=m
 # CONFIG_LDM_PARTITION is not set
 # CONFIG_LIBNVDIMM is not set
@@ -406,7 +405,6 @@ CONFIG_PPS=m
 # CONFIG_PREEMPT is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PRINT_QUOTA_WARNING=y
-CONFIG_PROBE_EVENTS=y
 # CONFIG_PSTORE is not set
 CONFIG_PTP_1588_CLOCK=m
 # CONFIG_PWM is not set