The patch titled Subject: MM: Support more pagesizes for MAP_HUGETLB/SHM_HUGETLB v7 fix fix fix has been removed from the -mm tree. Its filename was mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7-fix-fix-fix.patch This patch was dropped because it was folded into mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7.patch ------------------------------------------------------ From: David Rientjes <rientjes@xxxxxxxxxx> Subject: MM: Support more pagesizes for MAP_HUGETLB/SHM_HUGETLB v7 fix fix fix On Fri, 9 Nov 2012, Randy Dunlap wrote: > on x86_64: > > In file included from mm/mprotect.c:13:0: > include/linux/shm.h:57:20: error: redefinition of 'do_shmat' > include/linux/shm.h:57:20: note: previous definition of 'do_shmat' was here > include/linux/shm.h:63:19: error: redefinition of 'is_file_shm_hugepages' > include/linux/shm.h:63:19: note: previous definition of 'is_file_shm_hugepages' was here > include/linux/shm.h:67:20: error: redefinition of 'exit_shm' > include/linux/shm.h:67:20: note: previous definition of 'exit_shm' was here > > In file included from include/linux/hugetlb.h:16:0, > from mm/mmap.c:23: > include/linux/shm.h:57:20: error: redefinition of 'do_shmat' > include/linux/shm.h:57:20: note: previous definition of 'do_shmat' was here > include/linux/shm.h:63:19: error: redefinition of 'is_file_shm_hugepages' > include/linux/shm.h:63:19: note: previous definition of 'is_file_shm_hugepages' was here > include/linux/shm.h:67:20: error: redefinition of 'exit_shm' > include/linux/shm.h:67:20: note: previous definition of 'exit_shm' was here > make[2]: *** [mm/mprotect.o] Error 1 > This is an elusive one, I couldn't reproduce it with master. This appears to only happen on the akpm branch, correct? It happens because of e37c64a9751a ("mm: support more pagesizes for MAP_HUGETLB/SHM_HUGETLB") adds a spurious "#endif" to include/linux/shm.h and gets reverted in master by 359078d82a20 ("Revert "mm: support more pagesizes for MAP_HUGETLB/SHM_HUGETLB"") because of another build failure that Stephen reports on November 8: mm/mmap.c: In function 'SYSC_mmap_pgoff': mm/mmap.c:1271:15: error: 'MAP_HUGE_SHIFT' undeclared (first use in this function) mm/mmap.c:1271:15: note: each undeclared identifier is reported only once for each function it appears in mm/mmap.c:1271:33: error: 'MAP_HUGE_MASK' undeclared (first use in this function) I think the best bet would be to merge the following in -mm and then let Stephen revert it in master again if his build error persists for powerpc: mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7-fix-fix-fix Fix the build: include/linux/shm.h:57:20: error: redefinition of 'do_shmat' include/linux/shm.h:57:20: note: previous definition of 'do_shmat' was here include/linux/shm.h:63:19: error: redefinition of 'is_file_shm_hugepages' include/linux/shm.h:63:19: note: previous definition of 'is_file_shm_hugepages' was here include/linux/shm.h:67:20: error: redefinition of 'exit_shm' include/linux/shm.h:67:20: note: previous definition of 'exit_shm' was here Signed-off-by: David Rientjes <rientjes@xxxxxxxxxx> Cc: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Cc: Andi Kleen <ak@xxxxxxxxxxxxxxx> Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/shm.h | 4 ---- 1 file changed, 4 deletions(-) diff -puN include/linux/shm.h~mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7-fix-fix-fix include/linux/shm.h --- a/include/linux/shm.h~mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7-fix-fix-fix +++ a/include/linux/shm.h @@ -23,8 +23,6 @@ struct shmid_kernel /* private to the ke struct task_struct *shm_creator; }; -#endif - /* shm_mode upper byte flags */ #define SHM_DEST 01000 /* segment will be destroyed on last detach */ #define SHM_LOCKED 02000 /* segment will not be swapped */ @@ -46,8 +44,6 @@ struct shmid_kernel /* private to the ke #define SHM_HUGE_2MB (21 << SHM_HUGE_SHIFT) #define SHM_HUGE_1GB (30 << SHM_HUGE_SHIFT) -#ifdef __KERNEL__ - #ifdef CONFIG_SYSVIPC long do_shmat(int shmid, char __user *shmaddr, int shmflg, unsigned long *addr, unsigned long shmlba); _ Patches currently in -mm which might be from rientjes@xxxxxxxxxx are mm-memcg-make-mem_cgroup_out_of_memory-static.patch mm-use-is_enabledconfig_numa-instead-of-numa_build.patch mm-use-is_enabledconfig_compaction-instead-of-compaction_build.patch thp-clean-up-__collapse_huge_page_isolate.patch memory-hotplug-suppress-device-memoryx-does-not-have-a-release-function-warning.patch memory-hotplug-skip-hwpoisoned-page-when-offlining-pages.patch memory-hotplug-update-mce_bad_pages-when-removing-the-memory.patch memory-hotplug-auto-offline-page_cgroup-when-onlining-memory-block-failed.patch memory-hotplug-fix-nr_free_pages-mismatch.patch numa-convert-static-memory-to-dynamically-allocated-memory-for-per-node-device.patch memory-hotplug-suppress-device-nodex-does-not-have-a-release-function-warning.patch memory-hotplug-mm-sparsec-clear-the-memory-to-store-struct-page.patch memory-hotplug-allocate-zones-pcp-before-onlining-pages.patch memory_hotplug-fix-possible-incorrect-node_states.patch slub-hotplug-ignore-unrelated-nodes-hot-adding-and-hot-removing.patch mm-oom-allow-exiting-threads-to-have-access-to-memory-reserves.patch mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7.patch mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7-fix-fix-fix-fix.patch mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7-fix-fix-fix-fix-checkpatch-fixes.patch mm-introduce-a-common-interface-for-balloon-pages-mobility-fix.patch mm-mempolicy-remove-duplicate-code.patch mm-cleanup-register_node.patch mm-oom-change-type-of-oom_score_adj-to-short.patch mm-oom-fix-race-when-specifying-a-thread-as-the-oom-origin.patch drivers-base-nodec-cleanup-node_state_attr.patch mm-memory-hotplug-dynamic-configure-movable-memory-and-portion-memory.patch memory_hotplug-handle-empty-zone-when-online_movable-online_kernel.patch memory_hotplug-ensure-every-online-node-has-normal-memory.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