>> The alloc and free pointers within "struct dma_map_ops" receive a >> pointer to dma_attrs that was not present in the generic swiotlb >> functions. For this reason, a few files had a local wrapper for the >> free function that just removes the attrs argument before calling the >> generic function. >> >> This patch adds the extra argument to generic functions and removes >> such wrappers when they are no more needed. This also fixes a >> compiler warning for sta2x11-fixup.c, that would have required yet >> another wrapper. > So .. what is this based on? Current linux-next. But it has been like this for a while. I had the warning in sta2x11-fixup.c pending for a while, and yesterday I raised the issue. > I see in mainline alloc_coherent and free_coherent > which are obviously changed here. Do you refer to the swiotlb methods (I confirm they are changed, like all their users) or something else? I'm only changing the two methods in swiotlb, nothing else is affected. Actually, I wanted to call them alloc and free, like the field they are assigned to, but swiotlb_free is already there, to do something else. > Don't you also need to change these two files: > > arch/x86/xen/pci-swiotlb-xen.c > drivers/xen/swiotlb-xen.c No, because xen implements the dma_map_ops with the proper prototypes. I grepped for all users, and found these are not related. Thank your for checking /alessandro
