Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ee8b58c authored by Suren Baghdasaryan's avatar Suren Baghdasaryan Committed by Greg Kroah-Hartman
Browse files

ANDROID: GKI: add fields required to enable CONFIG_TRANSPARENT_HUGEPAGE 



Devices with plenty of RAM might benefit from THP usage. Added fields
would allow to enable CONFIG_TRANSPARENT_HUGEPAGE without affecting ABI.

Bug: 168269341
Signed-off-by: default avatarSuren Baghdasaryan <surenb@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ieb644a8da5377383d514197ee02d7bfd6f1d346d
parent 0ce2100b

arch/arm64/configs/gki_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -94,6 +94,7 @@ CONFIG_MODVERSIONS=y 
CONFIG_BLK_INLINE_ENCRYPTION=y

CONFIG_BLK_INLINE_ENCRYPTION=y

CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y

CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y

CONFIG_GKI_HACKS_TO_FIX=y

CONFIG_GKI_HACKS_TO_FIX=y

CONFIG_GKI_OPT_FEATURES=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_MISC=y

CONFIG_BINFMT_MISC=y

CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTPLUG=y

arch/x86/configs/gki_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -70,6 +70,7 @@ CONFIG_MODVERSIONS=y 
CONFIG_BLK_INLINE_ENCRYPTION=y

CONFIG_BLK_INLINE_ENCRYPTION=y

CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y

CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y

CONFIG_GKI_HACKS_TO_FIX=y

CONFIG_GKI_HACKS_TO_FIX=y

CONFIG_GKI_OPT_FEATURES=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_MISC=y

CONFIG_BINFMT_MISC=y

CONFIG_CLEANCACHE=y

CONFIG_CLEANCACHE=y

include/linux/huge_mm.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -309,6 +309,7 @@ static inline bool transhuge_vma_suitable(struct vm_area_struct *vma, 
}

}





static inline void prep_transhuge_page(struct page *page) {}

static inline void prep_transhuge_page(struct page *page) {}

static inline void free_transhuge_page(struct page *page) {}





#define transparent_hugepage_flags 0UL

#define transparent_hugepage_flags 0UL

include/linux/memcontrol.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -330,7 +330,7 @@ struct mem_cgroup { 
	struct list_head event_list;

	struct list_head event_list;

	spinlock_t event_list_lock;

	spinlock_t event_list_lock;





#ifdef CONFIG_TRANSPARENT_HUGEPAGE

#if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_GKI_OPT_FEATURES)

	struct deferred_split deferred_split_queue;

	struct deferred_split deferred_split_queue;

#endif

#endif

include/linux/mm.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -799,7 +799,7 @@ enum compound_dtor_id { 
#ifdef CONFIG_HUGETLB_PAGE

#ifdef CONFIG_HUGETLB_PAGE

	HUGETLB_PAGE_DTOR,

	HUGETLB_PAGE_DTOR,

#endif

#endif

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

#if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_GKI_OPT_FEATURES)

	TRANSHUGE_PAGE_DTOR,

	TRANSHUGE_PAGE_DTOR,

#endif

#endif

	NR_COMPOUND_DTORS,

	NR_COMPOUND_DTORS,