UBUNTU: [Config] CONFIG_UNWINDER_FRAME_POINTER=y for amd64

During the rebase to 4.15 UNWINDER_ORC was chosen as the stack
unwinder as it promises a 5-10% performance improvement over
using UNWINDER_FRAME_POINTER. However it turns out to have a
couple of downsides. It adds a new requierment for building dkms
modules, and it does not produce the reliable stack traces
required for livepatch. Switch back to UNWINDER_FRAME_POINTER.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 28dc6da81692f89b95f8d26d96f349d876b49a95..7dfe3033f16bfbbba7585163bc25f35916d10bc9 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -479,7 +479,6 @@ CONFIG_UIO_PRUSS=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_ULTRIX_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
-# CONFIG_UNWINDER_FRAME_POINTER is not set
 CONFIG_USB_DWC2_PCI=m
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_GADGET=m

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 355d6ca6cc15666ce94f15dbe76c2c632076c45f..af478ad21c469ffa242af9c7c37bf1411aba39ba 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3428,6 +3428,7 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_PROC_CPU=y
 CONFIG_HAVE_RCU_TABLE_FREE=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_RELIABLE_STACKTRACE=y
 CONFIG_HAVE_S3C2410_I2C=y
 CONFIG_HAVE_S3C2410_WATCHDOG=y
 CONFIG_HAVE_S3C_RTC=y
@@ -9392,8 +9393,9 @@ CONFIG_UNIX=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX_DIAG=m
 CONFIG_UNUSED_SYMBOLS=y
+CONFIG_UNWINDER_FRAME_POINTER=y
 # CONFIG_UNWINDER_GUESS is not set
-CONFIG_UNWINDER_ORC=y
+# CONFIG_UNWINDER_ORC is not set
 CONFIG_UPROBES=y
 CONFIG_UPROBE_EVENTS=y
 CONFIG_US5182D=m

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 0d950f3a88d5beac415978cad79ab9eca06b4cae..cd5a7508f3f2545458ba1b6cdebfa5f07cfb7e21 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -471,7 +471,6 @@ CONFIG_UIO_PRUSS=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_ULTRIX_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
-CONFIG_UNWINDER_FRAME_POINTER=y
 CONFIG_USB_DWC2_PCI=m
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_GADGET=m