Home Home > GIT Browse > stable-xen
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2017-08-16 08:09:52 -0400
committerJeff Mahoney <jeffm@suse.com>2017-08-16 08:09:52 -0400
commit40ae810f881c39b15583b7209cb56237d21719d5 (patch)
treefa786516071b9e6816330327ddf0268c6dc9dbf2
parent1c8934b123f89c824eb72a3bb9bde3f3c64ac93f (diff)
parentae18928fe0fd78bbb683f99aae82e115b454372c (diff)
Merge remote-tracking branch 'origin/users/msuchanek/master/for-next'
-rw-r--r--config/i386/default1
-rw-r--r--config/i386/vanilla2
-rw-r--r--config/x86_64/vanilla3
3 files changed, 2 insertions, 4 deletions
diff --git a/config/i386/default b/config/i386/default
index dfe8bf4e5a..5aca54feef 100644
--- a/config/i386/default
+++ b/config/i386/default
@@ -146,7 +146,6 @@ CONFIG_M586TSC=y
# CONFIG_MAX5821 is not set
# CONFIG_MDA_CONSOLE is not set
CONFIG_MDIO_BCM_UNIMAC=m
-CONFIG_MDIO_BUS=m
CONFIG_MDIO_BUS_MUX=m
# CONFIG_MDIO_BUS_MUX_GPIO is not set
CONFIG_MDIO_BUS_MUX_MMIOREG=m
diff --git a/config/i386/vanilla b/config/i386/vanilla
index 5812a3ffcd..a06c3ffc7d 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -1,6 +1,6 @@
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
CONFIG_FRAME_POINTER=y
CONFIG_LOCALVERSION="-vanilla"
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
CONFIG_MODULES=y
# CONFIG_MODULE_SIG is not set
CONFIG_EFI_STUB=y
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 2ae274b4f6..a06c3ffc7d 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -1,7 +1,6 @@
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
CONFIG_FRAME_POINTER=y
-CONFIG_HAVE_RELIABLE_STACKTRACE=y
CONFIG_LOCALVERSION="-vanilla"
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
CONFIG_MODULES=y
# CONFIG_MODULE_SIG is not set
CONFIG_EFI_STUB=y