diff --git a/include/linux/android_pmem.h b/include/linux/android_pmem.h index f42d74b6127..91f8f1b2409 100644 --- a/include/linux/android_pmem.h +++ b/include/linux/android_pmem.h @@ -151,8 +151,6 @@ struct android_pmem_platform_data unsigned cached; /* The MSM7k has bits to enable a write buffer in the bus controller*/ unsigned buffered; - /* This PMEM is on memory that may be powered off */ - unsigned unstable; /* which memory type (i.e. SMI, EBI1) this PMEM device is backed by */ unsigned memory_type; }; diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index b4e4296e80a..4a737443f84 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -993,22 +993,6 @@ int remove_memory(u64 start, u64 size) return offline_pages(start_pfn, end_pfn, 120 * HZ); } -void reserve_hotplug_pages(unsigned long start_pfn, unsigned long nr_pages) -{ - nr_pages = ((nr_pages + pageblock_nr_pages - 1) >> pageblock_order) - << pageblock_order; - offline_isolated_pages(start_pfn, start_pfn + nr_pages); -} - -void unreserve_hotplug_pages(unsigned long start_pfn, unsigned long nr_pages) -{ - unsigned long onlined_pages = 0; - - nr_pages = ((nr_pages + pageblock_nr_pages - 1) >> pageblock_order) - << pageblock_order; - online_pages_range(start_pfn, nr_pages, &onlined_pages); -} - #else int remove_memory(u64 start, u64 size) {