Merge branch 'x86/bugs' into x86/core, to pick up pending changes before dependent...

[thirdparty/kernel/linux.git] / arch / x86 / Makefile

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index ba046afb850e518ad2fbe707210f551e5d4cde0e..c54f835fc062c0c36755ffe4829e48acc9226e4f 100644 (file)
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -112,13 +112,13 @@ ifeq ($(CONFIG_X86_32),y)
         # temporary until string.h is fixed
         KBUILD_CFLAGS += -ffreestanding
 
-       ifeq ($(CONFIG_STACKPROTECTOR),y)
-               ifeq ($(CONFIG_SMP),y)
+        ifeq ($(CONFIG_STACKPROTECTOR),y)
+                ifeq ($(CONFIG_SMP),y)
                        KBUILD_CFLAGS += -mstack-protector-guard-reg=fs -mstack-protector-guard-symbol=__stack_chk_guard
-               else
+                else
                        KBUILD_CFLAGS += -mstack-protector-guard=global
-               endif
-       endif
+                endif
+        endif
 else
         BITS := 64
         UTS_MACHINE := x86_64