The patch titled hugetlb: offload per node attribute registrations fix has been removed from the -mm tree. Its filename was hugetlb-offload-per-node-attribute-registrations-fix.patch This patch was dropped because it was folded into hugetlb-offload-per-node-attribute-registrations.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: hugetlb: offload per node attribute registrations fix From: Lee Schermerhorn <Lee.Schermerhorn@xxxxxx> Fix build failure when MEMORY_HOTPLUG_SPARSE and !HUGETLBFS: drivers/base/node.c:484: error: implicit declaration of function 'init_node_hugetlb_work' drivers/base/node.c:582: error: 'node_memory_callback' undeclared (first use in this function) Reported-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Signed-off-by: Lee Schermerhorn <lee.schermerhorn@xxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- diff -puN drivers/base/node.c~hugetlb-offload-per-node-attribute-registrations-fix drivers/base/node.c --- a/drivers/base/node.c~hugetlb-offload-per-node-attribute-registrations-fix +++ a/drivers/base/node.c @@ -445,8 +445,12 @@ static int node_memory_callback(struct n } #endif /* CONFIG_HUGETLBFS */ #else /* !CONFIG_MEMORY_HOTPLUG_SPARSE */ + static int link_mem_sections(int nid) { return 0; } +#endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */ +#if !defined(CONFIG_MEMORY_HOTPLUG_SPARSE) || \ + !defined(CONFIG_HUGETLBFS) static inline int node_memory_callback(struct notifier_block *self, unsigned long action, void *arg) { @@ -455,7 +459,7 @@ static inline int node_memory_callback(s static void init_node_hugetlb_work(int nid) { } -#endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */ +#endif int register_one_node(int nid) { _ Patches currently in -mm which might be from Lee.Schermerhorn@xxxxxx are hugetlb-offload-per-node-attribute-registrations.patch hugetlb-offload-per-node-attribute-registrations-fix.patch swap-rework-map_swap_page-again.patch mm-define-page_mapping_flags.patch mm-mlocking-in-try_to_unmap_one.patch mm-mlocking-in-try_to_unmap_one-fix.patch mm-mlocking-in-try_to_unmap_one-fix-fix.patch mm-config_mmu-for-pg_mlocked.patch mm-pass-address-down-to-rmap-ones.patch mm-stop-ptlock-enlarging-struct-page.patch mm-sigbus-instead-of-abusing-oom.patch mm-remove-unevictable_migrate_page-function.patch mlock-replace-stale-comments-in-munlock_vma_page.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html