From 6dcfad6ff3312a142eabd1b8b8c586f825f12607 Mon Sep 17 00:00:00 2001
From: Samael Wang <freesamael@gmail.com>
Date: Wed, 9 Sep 2015 01:30:09 +0800
Subject: [PATCH] Enable CONFIG_HIGHMEM to support larger memory size.

Without CONFIG_HIGHMEM, the usable memory is limited to 760 MB for
an ARM image, and 895 MB for a x86 image. For instance, Android TV
AVDs set 2 GB RAM by default, but /proc/meminfo shows only 748964 kB
for ARM, and 900744 kB for x86.

Bug: 33663715
Change-Id: Ibfa7ac80dad6c55ed99c56cdc7b09fa6a6ea7f81
Signed-off-by: Samael Wang <freesamael@gmail.com>
(cherry picked from commit a6ff0746142e082250df0729ab7d26ee46c14d9d)
---
 arch/arm/configs/goldfish_armv7_defconfig | 1 +
 arch/x86/configs/goldfish_defconfig       | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/configs/goldfish_armv7_defconfig b/arch/arm/configs/goldfish_armv7_defconfig
index 0806f45fa100..45142c6f8e6b 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 998a74cdb0a1..b876e00fd537 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
-- 
GitLab