Blame SOURCES/patch-i686-altmap.patch
|
|
e293be |
diff -up ./arch/x86/mm/init_32.c.altmap ./arch/x86/mm/init_32.c
|
|
|
e293be |
--- ./arch/x86/mm/init_32.c.altmap 2018-10-31 19:01:52.000000000 +0900
|
|
|
e293be |
+++ ./arch/x86/mm/init_32.c 2018-10-31 19:03:08.000000000 +0900
|
|
|
e293be |
@@ -844,14 +844,14 @@ void __init mem_init(void)
|
|
|
e293be |
}
|
|
|
e293be |
|
|
|
e293be |
#ifdef CONFIG_MEMORY_HOTPLUG
|
|
|
e293be |
-int arch_add_memory(int nid, u64 start, u64 size, bool for_device)
|
|
|
e293be |
+int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap, bool for_device)
|
|
|
e293be |
{
|
|
|
e293be |
struct pglist_data *pgdata = NODE_DATA(nid);
|
|
|
e293be |
struct zone *zone = pgdata->node_zones + ZONE_HIGHMEM;
|
|
|
e293be |
unsigned long start_pfn = start >> PAGE_SHIFT;
|
|
|
e293be |
unsigned long nr_pages = size >> PAGE_SHIFT;
|
|
|
e293be |
|
|
|
e293be |
- return __add_pages(nid, zone, start_pfn, nr_pages);
|
|
|
e293be |
+ return __add_pages(nid, zone, start_pfn, nr_pages, altmap);
|
|
|
e293be |
}
|
|
|
e293be |
|
|
|
e293be |
#ifdef CONFIG_MEMORY_HOTREMOVE
|