[GIT PULL] x86/build fix for v4.6

Ingo Molnar
2016-03-14T13:10:46Z

Linus,

Please pull the latest x86-build-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-build-for-linus

# HEAD: 8b30a8b3c636a155bab9176ad209964c9c22252d x86/defconfigs/32: Set CONFIG_FRAME_WARN to the Kconfig default

A single adjustment of a defconfig value.

Thanks,

Ingo

------------------>
Borislav Petkov (1):
x86/defconfigs/32: Set CONFIG_FRAME_WARN to the Kconfig default

arch/x86/configs/i386_defconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig
index 028be48c8839..e25a1630320c 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