The patch titled slb-drop-kmem-cache-argument-from-constructor-fix has been removed from the -mm tree. Its filename was slb-drop-kmem-cache-argument-from-constructor-fix.patch This patch was dropped because it was folded into slb-drop-kmem-cache-argument-from-constructor.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: slb-drop-kmem-cache-argument-from-constructor-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: Alexey Dobriyan <adobriyan@xxxxxxxxx> Cc: Christoph Lameter <cl@xxxxxxxxxxxxxxxxxxxx> Cc: Jon Tollefson <kniht@xxxxxxxxxxxxxxxxxx> Cc: Pekka Enberg <penberg@xxxxxxxxxxxxxx> Cc: Nick Piggin <nickpiggin@xxxxxxxxxxxx> Cc: Matt Mackall <mpm@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/powerpc/mm/hugetlbpage.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff -puN arch/powerpc/mm/hugetlbpage.c~slb-drop-kmem-cache-argument-from-constructor-fix arch/powerpc/mm/hugetlbpage.c --- a/arch/powerpc/mm/hugetlbpage.c~slb-drop-kmem-cache-argument-from-constructor-fix +++ a/arch/powerpc/mm/hugetlbpage.c @@ -113,7 +113,7 @@ static inline pte_t *hugepte_offset(huge static int __hugepte_alloc(struct mm_struct *mm, hugepd_t *hpdp, unsigned long address, unsigned int psize) { - pte_t *new = kmem_cache_alloc(huge_pgtable_cache(psize), + pte_t *new = kmem_cache_zalloc(huge_pgtable_cache(psize), GFP_KERNEL|__GFP_REPEAT); if (! new) @@ -730,11 +730,6 @@ static int __init hugepage_setup_sz(char } __setup("hugepagesz=", hugepage_setup_sz); -static void zero_ctor(void *addr) -{ - memset(addr, 0, HUGEPTE_TABLE_SIZE); -} - static int __init hugetlbpage_init(void) { unsigned int psize; @@ -756,7 +751,7 @@ static int __init hugetlbpage_init(void) HUGEPTE_TABLE_SIZE(psize), HUGEPTE_TABLE_SIZE(psize), 0, - zero_ctor); + NULL); if (!huge_pgtable_cache(psize)) panic("hugetlbpage_init(): could not create %s"\ "\n", HUGEPTE_CACHE_NAME(psize)); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch uninline-arch_pick_mmap_layout.patch dma-mapping-add-the-device-argument-to-dma_mapping_error.patch x86-calgary-fix-handling-of-devices-that-arent-behind-the-calgary.patch tpm-increase-size-of-internal-tpm-response-buffers.patch memstick-allow-set_param-method-to-return-an-error-code.patch memstick-use-fully-asynchronous-request-processing.patch full-conversion-to-early_initcall-interface-remove-old-interface.patch mm-introduce-get_user_pages_fast.patch x86-lockless-get_user_pages_fast.patch mm-speculative-page-references.patch slb-drop-kmem-cache-argument-from-constructor.patch slb-drop-kmem-cache-argument-from-constructor-fix.patch slb-drop-kmem-cache-argument-from-constructor-fix-fix.patch slb-drop-kmem-cache-argument-from-constructor-ubifs.patch video-console-sticonrec-make-code-static-checkpatch-fixes.patch reiser4.patch reiser4-tree_lock-fixes.patch reiser4-tree_lock-fixes-fix.patch reiser4-semaphore-fix.patch slb-drop-kmem-cache-argument-from-constructor-reiser4.patch reiser4-suid.patch page-owner-tracking-leak-detector.patch nr_blockdev_pages-in_interrupt-warning.patch slab-leaks3-default-y.patch put_bh-debug.patch shrink_slab-handle-bad-shrinkers.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch undeprecate-pci_find_device.patch notify_change-callers-must-hold-i_mutex.patch profile-likely-unlikely-macros.patch drivers-net-bonding-bond_sysfsc-suppress-uninitialized-var-warning.patch w1-build-fix.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