A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-06 03:45:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

LUR: Revert "BACKPORT: mm/swap.c: don't pass "enum lru_list" to trace_mm_lru_insertion()"

Browse source 
The LRU function is not compatible with GKI,
causing GKI to fail to start, so revert.

This reverts commit 819585d2b096f203fabe95cef72a6accd1ef28df.

Change-Id: I739c6ebcc0d2ece0470c37fc942815eeeb5f4c42
Reviewed-on: https://gerrit.mot.com/2609769
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
xiewen3 2023-05-16 22:57:10 +08:00 • committed by Xiaojun Ji
commit efefa59fcb
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
include/trace/events/pagemap.h
View file

@ -27,21 +27,24 @@
TRACE_EVENT(mm_lru_insertion,
TP_PROTO(struct page *page),
TP_PROTO(
struct page *page,
int lru
),
TP_ARGS(page),
TP_ARGS(page, lru),
TP_STRUCT__entry(
__field(struct page *, page )
__field(unsigned long, pfn )
__field(enum lru_list, lru )
__field(int, lru )
__field(unsigned long, flags )
),
TP_fast_assign(
__entry->page = page;
__entry->pfn = page_to_pfn(page);
__entry->lru = page_lru(page);
__entry->lru = lru;
__entry->flags = trace_pagemap_flags(page);
),

5
mm/swap.c
View file

@ -901,6 +901,7 @@ void lru_add_page_tail(struct page *page, struct page *page_tail,
static void __pagevec_lru_add_fn(struct page *page, struct lruvec *lruvec,
void *arg)
{
enum lru_list lru;
int was_unevictable = TestClearPageUnevictable(page);
VM_BUG_ON_PAGE(PageLRU(page), page);
@ -935,11 +936,13 @@ static void __pagevec_lru_add_fn(struct page *page, struct lruvec *lruvec,
smp_mb();
if (page_evictable(page)) {
lru = page_lru(page);
update_page_reclaim_stat(lruvec, page_is_file_cache(page),
PageActive(page));
if (was_unevictable)
count_vm_event(UNEVICTABLE_PGRESCUED);
} else {
lru = LRU_UNEVICTABLE;
ClearPageActive(page);
SetPageUnevictable(page);
if (!was_unevictable)
@ -947,7 +950,7 @@ static void __pagevec_lru_add_fn(struct page *page, struct lruvec *lruvec,
}
add_page_to_lru_list(page, lruvec);
trace_mm_lru_insertion(page);
trace_mm_lru_insertion(page, lru);
}
/*