Changeset
a08261650b8a lost a set of parens for likely:
- if (likely((pci_addr & ~to_pci_dev(dev)->dma_mask) == 0)) {
+ if (likely(pci_addr & ~to_pci_dev(dev)->dma_mask) == 0 &&
+ !range_straddles_page_boundary(addr, size)) {
These could go back around the original test or surrouding both.
To facilitate the fast path, I think it makes sense to include both.
Signed-off-by: Aron Griffis <aron@hp.com>
/*
** Check if the PCI device can DMA to ptr... if so, just return ptr
*/
- if (likely(pci_addr & ~to_pci_dev(dev)->dma_mask) == 0 &&
- !range_straddles_page_boundary(__pa(addr), size)) {
+ if (likely((pci_addr & ~to_pci_dev(dev)->dma_mask) == 0 &&
+ !range_straddles_page_boundary(__pa(addr), size))) {
/*
** Device is bit capable of DMA'ing to the buffer...
** just return the PCI address of ptr