The patch titled SLUB: Use correct flags to check for DMA cache has been added to the -mm tree. Its filename is slub-use-correct-flags-to-check-for-dma-cache.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: SLUB: Use correct flags to check for DMA cache From: Christoph Lameter <clameter@xxxxxxx> We use a GFP mask to check the SLAB flags if this is a DMA cache. Fix this by using the correct SLAB mask and then use the SLUB_DMA for the ORing of flags. If the system does not support DMA then we will OR zero which will hopefully get the compiler to drop the useless if statement as well. Signed-off-by: Christoph Lameter <clameter@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/slub.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN mm/slub.c~slub-use-correct-flags-to-check-for-dma-cache mm/slub.c --- a/mm/slub.c~slub-use-correct-flags-to-check-for-dma-cache +++ a/mm/slub.c @@ -678,8 +678,8 @@ static struct page *allocate_slab(struct if (s->order) flags |= __GFP_COMP; - if (s->flags & SLUB_DMA) - flags |= GFP_DMA; + if (s->flags & SLAB_CACHE_DMA) + flags |= SLUB_DMA; if (node == -1) page = alloc_pages(flags, s->order); _ Patches currently in -mm which might be from clameter@xxxxxxx are slab-introduce-krealloc.patch slab-introduce-krealloc-fix.patch safer-nr_node_ids-and-nr_node_ids-determination-and-initial.patch use-zvc-counters-to-establish-exact-size-of-dirtyable-pages.patch slab-ensure-cache_alloc_refill-terminates.patch smaps-extract-pmd-walker-from-smaps-code.patch smaps-add-pages-referenced-count-to-smaps.patch smaps-add-clear_refs-file-to-clear-reference.patch smaps-add-clear_refs-file-to-clear-reference-fix.patch smaps-add-clear_refs-file-to-clear-reference-fix-fix.patch slab-use-num_possible_cpus-in-enable_cpucache.patch slub-core.patch slub-fix-numa-bootstrap.patch slub-use-correct-flags-to-check-for-dma-cache.patch slub-add-slabinfo-tool.patch extend-print_symbol-capability-fix.patch slab-shutdown-cache_reaper-when-cpu-goes-down.patch mm-implement-swap-prefetching.patch readahead-state-based-method-aging-accounting.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