Commit 5b855aa3 authored May 16, 2023 by Kefeng Wang Committed by Andrew Morton Jun 09, 2023

mm: page_alloc: squash page_is_consistent()

Squash the page_is_consistent() into bad_range() as there is only one
caller.

Link: https://lkml.kernel.org/r/20230516063821.121844-6-wangkefeng.wang@huawei.com

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: Mike Rapoport (IBM) <rppt@kernel.org>
Cc: David Hildenbrand <david@redhat.com>
Cc: "Huang, Ying" <ying.huang@intel.com>
Cc: Iurii Zaikin <yzaikin@google.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Len Brown <len.brown@intel.com>
Cc: Luis Chamberlain <mcgrof@kernel.org>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Rafael J. Wysocki <rafael@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

parent e9aae170

mm/page_alloc.c

+1 −8

Original line number	Diff line number	Diff line
		@@ -517,13 +517,6 @@ static int page_outside_zone_boundaries(struct zone zone, struct page page)
		return ret;
		}

		static int page_is_consistent(struct zone zone, struct page page)
		{
		if (zone != page_zone(page))
		return 0;

		return 1;
		}
		/*
		* Temporary debugging check for pages not lying within a given zone.
		*/
		@@ -531,7 +524,7 @@ static int __maybe_unused bad_range(struct zone zone, struct page page)
		{
		if (page_outside_zone_boundaries(zone, page))
		return 1;
		if (!page_is_consistent(zone, page))
		if (zone != page_zone(page))
		return 1;

		return 0;