Commit 639118d1 authored by Kefeng Wang's avatar Kefeng Wang Committed by Andrew Morton
Browse files

mm: kill is_memblock_offlined() 

Directly check state of struct memory_block, no need a single function.

Link: https://lkml.kernel.org/r/20220827112043.187028-1-wangkefeng.wang@huawei.com


Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarOscar Salvador <osalvador@suse.de>
Reviewed-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 48658d85

drivers/base/memory.c

+0 −6
Original line number Diff line number Diff line
@@ -869,12 +869,6 @@ void remove_memory_block_devices(unsigned long start, unsigned long size) 
	}

}



/* return true if the memory block is offlined, otherwise, return false */

bool is_memblock_offlined(struct memory_block *mem)

{

	return mem->state == MEM_OFFLINE;

}



static struct attribute *memory_root_attrs[] = {

#ifdef CONFIG_ARCH_MEMORY_PROBE

	&dev_attr_probe.attr,

include/linux/memory_hotplug.h

+0 −2
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ struct page; 
struct zone;

struct pglist_data;

struct mem_section;

struct memory_block;

struct memory_group;

struct resource;

struct vmem_altmap;
@@ -333,7 +332,6 @@ extern void move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn, 
extern void remove_pfn_range_from_zone(struct zone *zone,

				       unsigned long start_pfn,

				       unsigned long nr_pages);

extern bool is_memblock_offlined(struct memory_block *mem);

extern int sparse_add_section(int nid, unsigned long pfn,

		unsigned long nr_pages, struct vmem_altmap *altmap,

		struct dev_pagemap *pgmap);

mm/memory_hotplug.c

+1 −2
Original line number Diff line number Diff line
@@ -1969,11 +1969,10 @@ int __ref offline_pages(unsigned long start_pfn, unsigned long nr_pages, 


static int check_memblock_offlined_cb(struct memory_block *mem, void *arg)

{

	int ret = !is_memblock_offlined(mem);

	int *nid = arg;



	*nid = mem->nid;

	if (unlikely(ret)) {

	if (unlikely(mem->state != MEM_OFFLINE)) {

		phys_addr_t beginpa, endpa;



		beginpa = PFN_PHYS(section_nr_to_pfn(mem->start_section_nr));