tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'fixes_for_v3.15' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

Pull dma-mapping fix from Marek Szyprowski:
"A small fix for dma-mapping subsystem for ARM"

* 'fixes_for_v3.15' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
arm: dma-mapping: Fix mapping size value

Linus Torvalds 92891ed6 fdd324aa

+1 -1
+1 -1
arch/arm/mm/dma-mapping.c
··· 1963 1963 mapping->nr_bitmaps = 1; 1964 1964 mapping->extensions = extensions; 1965 1965 mapping->base = base; 1966 - mapping->size = bitmap_size << PAGE_SHIFT; 1967 1966 mapping->bits = BITS_PER_BYTE * bitmap_size; 1967 + mapping->size = mapping->bits << PAGE_SHIFT; 1968 1968 1969 1969 spin_lock_init(&mapping->lock); 1970 1970