--- arch/x86/Makefile.orig	2016-07-27 15:42:34 UTC
+++ arch/x86/Makefile
@@ -2,7 +2,7 @@
 
 # select defconfig based on actual architecture
 ifeq ($(ARCH),x86)
-  ifeq ($(shell uname -m),x86_64)
+  ifeq ($(shell uname -m),amd64)
         KBUILD_DEFCONFIG := x86_64_defconfig
   else
         KBUILD_DEFCONFIG := i386_defconfig