From c7afbeb17edfbcb7a9cf3b0058b8bb9b492cbf9e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 31 Aug 2022 11:45:30 +0200 Subject: [PATCH] Revert "ANDROID: mm: export zone_watermark_ok" This reverts commit e909fe79d28d614b390edcef5b13a2f375ec042e. The symbols exported in it were never used by any external modules, so remove the exports as they are not needed. Bug: 203756332 Bug: 140294230 Cc: Sudarshan Rajagopalan Signed-off-by: Greg Kroah-Hartman Change-Id: Ib3315ba129773256398a71ffe4c3acb55075b012 --- mm/mmzone.c | 2 -- mm/page_alloc.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/mm/mmzone.c b/mm/mmzone.c index 1470eea5454a..595400d7dcec 100644 --- a/mm/mmzone.c +++ b/mm/mmzone.c @@ -72,7 +72,6 @@ struct zoneref *__next_zones_zonelist(struct zoneref *z, return z; } -EXPORT_SYMBOL_GPL(__next_zones_zonelist); #ifdef CONFIG_ARCH_HAS_HOLES_MEMORYMODEL bool memmap_valid_within(unsigned long pfn, @@ -133,4 +132,3 @@ enum zone_type gfp_zone(gfp_t flags) VM_BUG_ON((GFP_ZONE_BAD >> bit) & 1); return z; } -EXPORT_SYMBOL_GPL(gfp_zone); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 209f7aef707d..bebdf55d7272 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3999,7 +3999,6 @@ bool zone_watermark_ok(struct zone *z, unsigned int order, unsigned long mark, return __zone_watermark_ok(z, order, mark, highest_zoneidx, alloc_flags, zone_page_state(z, NR_FREE_PAGES)); } -EXPORT_SYMBOL_GPL(zone_watermark_ok); static inline bool zone_watermark_fast(struct zone *z, unsigned int order, unsigned long mark, int highest_zoneidx, @@ -4052,7 +4051,6 @@ bool zone_watermark_ok_safe(struct zone *z, unsigned int order, return __zone_watermark_ok(z, order, mark, highest_zoneidx, 0, free_pages); } -EXPORT_SYMBOL_GPL(zone_watermark_ok_safe); #ifdef CONFIG_NUMA static bool zone_allows_reclaim(struct zone *local_zone, struct zone *zone)