* [merged mm-stable] mm-kill-is_memblock_offlined.patch removed from -mm tree
@ 2022-09-12 3:30 Andrew Morton
0 siblings, 0 replies; only message in thread
From: Andrew Morton @ 2022-09-12 3:30 UTC (permalink / raw)
To: mm-commits, osalvador, david, anshuman.khandual, wangkefeng.wang,
akpm
The quilt patch titled
Subject: mm: kill is_memblock_offlined()
has been removed from the -mm tree. Its filename was
mm-kill-is_memblock_offlined.patch
This patch was dropped because it was merged into the mm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Kefeng Wang <wangkefeng.wang@huawei.com>
Subject: mm: kill is_memblock_offlined()
Date: Sat, 27 Aug 2022 19:20:43 +0800
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: Kefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Oscar Salvador <osalvador@suse.de>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/base/memory.c | 6 ------
include/linux/memory_hotplug.h | 2 --
mm/memory_hotplug.c | 3 +--
3 files changed, 1 insertion(+), 10 deletions(-)
--- a/drivers/base/memory.c~mm-kill-is_memblock_offlined
+++ a/drivers/base/memory.c
@@ -869,12 +869,6 @@ void remove_memory_block_devices(unsigne
}
}
-/* 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,
--- a/include/linux/memory_hotplug.h~mm-kill-is_memblock_offlined
+++ a/include/linux/memory_hotplug.h
@@ -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(struc
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);
--- a/mm/memory_hotplug.c~mm-kill-is_memblock_offlined
+++ a/mm/memory_hotplug.c
@@ -1969,11 +1969,10 @@ failed_removal:
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));
_
Patches currently in -mm which might be from wangkefeng.wang@huawei.com are
mm-reuse-pageblock_start-end_pfn-macro.patch
mm-add-pageblock_align-macro.patch
mm-add-pageblock_aligned-macro.patch
memblock-tests-add-new-pageblock-related-macro.patch
kernel-exit-cleanup-release_thread.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-09-12 3:34 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-12 3:30 [merged mm-stable] mm-kill-is_memblock_offlined.patch removed from -mm tree Andrew Morton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.