mm/memory_hotplug: allow arch_remove_memory() without CONFIG_MEMORY_HOTREMOVE

[mirror_ubuntu-hirsute-kernel.git] / arch / arm64 / mm / mmu.c

diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index 3645f29bd814705cf2356de7186c64f3dd16f570..750a69dde39bdd76a425b4f7e4d59a093936c5b6 100644 (file)
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -362,7 +362,7 @@ static void __create_pgd_mapping(pgd_t *pgdir, phys_addr_t phys,
 
 static phys_addr_t __pgd_pgtable_alloc(int shift)
 {
-       void *ptr = (void *)__get_free_page(PGALLOC_GFP);
+       void *ptr = (void *)__get_free_page(GFP_PGTABLE_KERNEL);
        BUG_ON(!ptr);
 
        /* Ensure the zeroed page is visible to the page table walker */
@@ -942,6 +942,11 @@ void *__init fixmap_remap_fdt(phys_addr_t dt_phys)
        return dt_virt;
 }
 
+int __init arch_ioremap_p4d_supported(void)
+{
+       return 0;
+}
+
 int __init arch_ioremap_pud_supported(void)
 {
        /*
@@ -1069,4 +1074,21 @@ int arch_add_memory(int nid, u64 start, u64 size,
        return __add_pages(nid, start >> PAGE_SHIFT, size >> PAGE_SHIFT,
                           restrictions);
 }
+void arch_remove_memory(int nid, u64 start, u64 size,
+                       struct vmem_altmap *altmap)
+{
+       unsigned long start_pfn = start >> PAGE_SHIFT;
+       unsigned long nr_pages = size >> PAGE_SHIFT;
+       struct zone *zone;
+
+       /*
+        * FIXME: Cleanup page tables (also in arch_add_memory() in case
+        * adding fails). Until then, this function should only be used
+        * during memory hotplug (adding memory), not for memory
+        * unplug. ARCH_ENABLE_MEMORY_HOTREMOVE must not be
+        * unlocked yet.
+        */
+       zone = page_zone(pfn_to_page(start_pfn));
+       __remove_pages(zone, start_pfn, nr_pages, altmap);
+}
 #endif