From 7c26ca229ea5e5d97f8d337514a3e9447d9c78b5 Mon Sep 17 00:00:00 2001 From: Seth Forshee Date: Mon, 29 Jan 2018 08:43:07 -0600 Subject: [PATCH] Revert "UBUNTU: SAUCE: mm: fix memory hotplug in ZONE_HIGHMEM" This patch may no longer be required. Try reverting it to run a kernel through testing to see if the test failures which prompted the patch are fixed. Signed-off-by: Seth Forshee --- arch/x86/mm/init_32.c | 3 --- include/linux/memory_hotplug.h | 4 ---- mm/memory_hotplug.c | 19 +++---------------- 3 files changed, 3 insertions(+), 23 deletions(-) diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index d247f3c43c84..135c9a7898c7 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -758,9 +758,6 @@ void __init mem_init(void) * important here. */ set_highmem_pages_init(); -#ifdef CONFIG_HIGHMEM - set_default_mem_hotplug_zone(ZONE_HIGHMEM); -#endif /* this will put all low memory onto the freelists */ free_all_bootmem(); diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 21cbde4af0db..58e110aee7ab 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -231,8 +231,6 @@ void put_online_mems(void); void mem_hotplug_begin(void); void mem_hotplug_done(void); -void set_default_mem_hotplug_zone(enum zone_type zone); - extern void set_zone_contiguous(struct zone *zone); extern void clear_zone_contiguous(struct zone *zone); @@ -286,8 +284,6 @@ static inline void put_online_mems(void) {} static inline void mem_hotplug_begin(void) {} static inline void mem_hotplug_done(void) {} -static inline void set_default_mem_hotplug_zone(enum zone_type zone) {} - static inline bool movable_node_is_enabled(void) { return false; diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index d397bacc14fd..c52aa05b106c 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -54,8 +54,6 @@ static DEFINE_MUTEX(online_page_callback_lock); DEFINE_STATIC_PERCPU_RWSEM(mem_hotplug_lock); -static int default_kernel_zone = ZONE_NORMAL; - void get_online_mems(void) { percpu_down_read(&mem_hotplug_lock); @@ -835,21 +833,10 @@ void __ref move_pfn_range_to_zone(struct zone *zone, set_zone_contiguous(zone); } -void set_default_mem_hotplug_zone(enum zone_type zone) -{ - default_kernel_zone = zone; -} - -#ifdef CONFIG_HIGHMEM -#define MAX_KERNEL_ZONE ZONE_HIGHMEM -#else -#define MAX_KERNEL_ZONE ZONE_NORMAL -#endif - /* * Returns a default kernel memory zone for the given pfn range. * If no kernel zone covers this pfn range it will automatically go - * to the MAX_KERNEL_ZONE. + * to the ZONE_NORMAL. */ static struct zone *default_kernel_zone_for_pfn(int nid, unsigned long start_pfn, unsigned long nr_pages) @@ -857,14 +844,14 @@ static struct zone *default_kernel_zone_for_pfn(int nid, unsigned long start_pfn struct pglist_data *pgdat = NODE_DATA(nid); int zid; - for (zid = 0; zid <= MAX_KERNEL_ZONE; zid++) { + for (zid = 0; zid <= ZONE_NORMAL; zid++) { struct zone *zone = &pgdat->node_zones[zid]; if (zone_intersects(zone, start_pfn, nr_pages)) return zone; } - return &pgdat->node_zones[default_kernel_zone]; + return &pgdat->node_zones[ZONE_NORMAL]; } static inline struct zone *default_zone_for_pfn(int nid, unsigned long start_pfn, -- 2.39.5