summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-03-15 17:16:48 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-15 17:16:48 (GMT)
commitfa53c4893994da439c6a74a03a13572cf7e1b41a (patch)
tree1e4a7f11ea66fc80c0f0f0e72990d46985fd8fd1
parent42576bee6eacda29a3193e97961ab3583a324850 (diff)
parent8b30a8b3c636a155bab9176ad209964c9c22252d (diff)
downloadlinux-fa53c4893994da439c6a74a03a13572cf7e1b41a.tar.xz
Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 build update from Ingo Molnar: "A single adjustment of a defconfig value" * 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/defconfigs/32: Set CONFIG_FRAME_WARN to the Kconfig default
-rw-r--r--arch/x86/configs/i386_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig
index 028be48..e25a163 100644
--- a/arch/x86/configs/i386_defconfig
+++ b/arch/x86/configs/i386_defconfig
@@ -288,7 +288,7 @@ CONFIG_NLS_ISO8859_1=y
CONFIG_NLS_UTF8=y
CONFIG_PRINTK_TIME=y
# CONFIG_ENABLE_WARN_DEPRECATED is not set
-CONFIG_FRAME_WARN=2048
+CONFIG_FRAME_WARN=1024
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
CONFIG_DEBUG_KERNEL=y