From c3dfb0adbf5d1cc8ab823c2be2d1b1c237af9f77 Mon Sep 17 00:00:00 2001 From: Keith Mannthey Date: Sat, 30 Sep 2006 23:27:08 -0700 Subject: [PATCH] --- yaml --- r: 37606 b: refs/heads/master c: 53947027ad90542ddb2bb746e3175827c270610a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/base/Makefile | 2 +- trunk/include/linux/memory.h | 4 ++-- trunk/mm/memory_hotplug.c | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a046f8e2337b..ed337a55353f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c2676a5870ab15cbeea9f826266bc946fe3cc26 +refs/heads/master: 53947027ad90542ddb2bb746e3175827c270610a diff --git a/trunk/drivers/base/Makefile b/trunk/drivers/base/Makefile index b539e5e75b56..7bbb9eeda235 100644 --- a/trunk/drivers/base/Makefile +++ b/trunk/drivers/base/Makefile @@ -8,7 +8,7 @@ obj-y += power/ obj-$(CONFIG_ISA) += isa.o obj-$(CONFIG_FW_LOADER) += firmware_class.o obj-$(CONFIG_NUMA) += node.o -obj-$(CONFIG_MEMORY_HOTPLUG) += memory.o +obj-$(CONFIG_MEMORY_HOTPLUG_SPARSE) += memory.o obj-$(CONFIG_SMP) += topology.o obj-$(CONFIG_SYS_HYPERVISOR) += hypervisor.o diff --git a/trunk/include/linux/memory.h b/trunk/include/linux/memory.h index 8f04143ca363..654ef5544878 100644 --- a/trunk/include/linux/memory.h +++ b/trunk/include/linux/memory.h @@ -57,7 +57,7 @@ struct memory_block { struct notifier_block; struct mem_section; -#ifndef CONFIG_MEMORY_HOTPLUG +#ifndef CONFIG_MEMORY_HOTPLUG_SPARSE static inline int memory_dev_init(void) { return 0; @@ -78,7 +78,7 @@ extern int remove_memory_block(unsigned long, struct mem_section *, int); #define CONFIG_MEM_BLOCK_SIZE (PAGES_PER_SECTION< +#ifdef CONFIG_MEMORY_HOTPLUG_SPARSE static int __add_zone(struct zone *zone, unsigned long phys_start_pfn) { struct pglist_data *pgdat = zone->zone_pgdat; @@ -192,6 +193,7 @@ int online_pages(unsigned long pfn, unsigned long nr_pages) writeback_set_ratelimit(); return 0; } +#endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */ static pg_data_t *hotadd_new_pgdat(int nid, u64 start) {