Revert half of "ANDROID: vendor_hooks: Add hooks for memory when debug"
This reverts parts of commit 24149445adaceb3948d5ad5bbb63c62ff2914e83.
The hooks android_vh_alloc_pages_slowpath,
android_vh_print_slabinfo_header, and android_vh_cache_show are not used
by any vendor, so remove them to help with merge issues with future LTS
releases.
If this is needed by any real user, it can easily be reverted to add it
back and then the symbol should be added to the abi list at the same
time to prevent it from being removed again later.
Bug: 182443489
Cc: Liujie Xie <xieliujie@oppo.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I63621110c0c38b7e5d5e5e6f85c513bf00ecc00b
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index e18561a..5b9b465 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4778,7 +4778,7 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
int no_progress_loops;
unsigned int cpuset_mems_cookie;
int reserve_flags;
- unsigned long alloc_start = jiffies;
+
/*
* We also sanity check to catch abuse of atomic reserves being used by
* callers that are not in atomic context.
@@ -5020,7 +5020,6 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
warn_alloc(gfp_mask, ac->nodemask,
"page allocation failure: order:%u", order);
got_pg:
- trace_android_vh_alloc_pages_slowpath(gfp_mask, order, alloc_start);
return page;
}