diff --git a/Makefile b/Makefile
index f3a1172cc..ceb060adb 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ endif
 ifeq ($(shell echo $(ARCH) | sed -e 's/arm.*/arm/'),arm)
 	ARMV         := $(shell echo $(ARCH) | sed -nr 's/armv([[:digit:]]).*/\1/p; t; i7')
 	SRCARCH      := arm
-	DEFINES      := -DCONFIG_ARM -DCONFIG_ARMV$(ARMV)
+	DEFINES      := -DCONFIG_ARMV$(ARMV)
 
 	ifeq ($(ARMV),6)
 		CFLAGS += -march=armv6
diff --git a/arch/x86/include/asm/types.h b/arch/x86/include/asm/types.h
index 97a15134c..b0e541111 100644
--- a/arch/x86/include/asm/types.h
+++ b/arch/x86/include/asm/types.h
@@ -126,11 +126,7 @@ typedef u64 auxv_t;
 
 #define CORE_ENTRY__MARCH CORE_ENTRY__MARCH__X86_64
 
-#if defined(CONFIG_X86_64)
-# define AT_VECTOR_SIZE 44
-#elif defined(CONFIG_ARM)
-# define AT_VECTOR_SIZE 22             /* Not needed at moment */
-#endif
+#define AT_VECTOR_SIZE 44
 
 #define CORE_THREAD_ARCH_INFO(core) core->thread_info