Re: linux-next: Tree for Aug 14 (mm/memory_hotplug.c and drivers/base/memory.c)

[Andrew Morton <akpm@linux-foundation.org>]

On Thu, 14 Aug 2014 08:02:22 -0700 Randy Dunlap <rdunlap@infradead.org> wrote:

> On 08/13/14 22:27, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Please do not add code intended for v3.18 until after v3.17-rc1 is
> > released.
> > 
> > Changes since 20140813:
> > 
> 
> on x86_64:
> 
> drivers/built-in.o: In function `show_zones_online_to':
> memory.c:(.text+0x13f306): undefined reference to `test_pages_in_a_zone'
> 
> in drivers/base/memory.c
> 
> when CONFIG_MEMORY_HOTREMOVE is not enabled.
> 
> The function implementation in mm/memory_hotplug.c is only built if
> CONFIG_MEMORY_HOTREMOVE is enabled.

Thanks.   This way, I suppose.

--- a/drivers/base/memory.c~memory-hotplug-add-sysfs-zones_online_to-attribute-fix-2
+++ a/drivers/base/memory.c
@@ -373,6 +373,7 @@ static ssize_t show_phys_device(struct d
 	return sprintf(buf, "%d\n", mem->phys_device);
 }
 
+#ifdef CONFIG_MEMORY_HOTREMOVE
 static int __zones_online_to(unsigned long end_pfn,
 				struct page *first_page, unsigned long nr_pages)
 {
@@ -432,12 +433,13 @@ static ssize_t show_zones_online_to(stru
 
 	return sprintf(buf, "%s\n", zone->name);
 }
+static DEVICE_ATTR(zones_online_to, 0444, show_zones_online_to, NULL);
+#endif
 
 static DEVICE_ATTR(phys_index, 0444, show_mem_start_phys_index, NULL);
 static DEVICE_ATTR(state, 0644, show_mem_state, store_mem_state);
 static DEVICE_ATTR(phys_device, 0444, show_phys_device, NULL);
 static DEVICE_ATTR(removable, 0444, show_mem_removable, NULL);
-static DEVICE_ATTR(zones_online_to, 0444, show_zones_online_to, NULL);
 
 /*
  * Block size attribute stuff
@@ -584,7 +586,9 @@ static struct attribute *memory_memblk_a
 	&dev_attr_state.attr,
 	&dev_attr_phys_device.attr,
 	&dev_attr_removable.attr,
+#ifdef CONFIG_MEMORY_HOTREMOVE
 	&dev_attr_zones_online_to.attr,
+#endif
 	NULL
 };
 

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>