diff --git a/arch/arm/configs/goldfish_armv7_defconfig b/arch/arm/configs/goldfish_armv7_defconfig
index 0806f45fa100ff6b39f550739cc6e04c9dd56c7b..45142c6f8e6b9179d1caa0035f6c4189b4af22a9 100644
--- a/arch/arm/configs/goldfish_armv7_defconfig
+++ b/arch/arm/configs/goldfish_armv7_defconfig
@@ -27,6 +27,7 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
+CONFIG_HIGHMEM=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
diff --git a/arch/x86/configs/goldfish_defconfig b/arch/x86/configs/goldfish_defconfig
index 998a74cdb0a1618667b2d21de093e673e2e1f58c..b876e00fd537dc8fa0af40b2f5ffee48946f36a3 100644
--- a/arch/x86/configs/goldfish_defconfig
+++ b/arch/x86/configs/goldfish_defconfig
@@ -47,7 +47,6 @@ CONFIG_PREEMPT=y
 CONFIG_X86_REBOOTFIXUPS=y
 CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
-CONFIG_NOHIGHMEM=y
 # CONFIG_MTRR_SANITIZER is not set
 CONFIG_HZ_100=y
 CONFIG_PHYSICAL_START=0x100000