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 'stable/for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb

Pull swiotlb fix from Konrad Rzeszutek Wilk:
"A tiny fix to make sure that page-sized mappings are page-aligned (and
not say straddle two pages). This is important for some drivers (such
as NVME)"

* 'stable/for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
swiotlb: ensure that page-sized mappings are page-aligned

Linus Torvalds 203f80f1 7e84b303

+3 -3
+3 -3
lib/swiotlb.c
··· 483 483 : 1UL << (BITS_PER_LONG - IO_TLB_SHIFT); 484 484 485 485 /* 486 - * For mappings greater than a page, we limit the stride (and 487 - * hence alignment) to a page size. 486 + * For mappings greater than or equal to a page, we limit the stride 487 + * (and hence alignment) to a page size. 488 488 */ 489 489 nslots = ALIGN(size, 1 << IO_TLB_SHIFT) >> IO_TLB_SHIFT; 490 - if (size > PAGE_SIZE) 490 + if (size >= PAGE_SIZE) 491 491 stride = (1 << (PAGE_SHIFT - IO_TLB_SHIFT)); 492 492 else 493 493 stride = 1;