Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 652476
Collapse All | Expand All

(-)a/kernel/common/inc/nv-linux.h (-1 / +5 lines)
Lines 175-181 static inline uid_t __kuid_val(kuid_t uid) Link Here
175
175
176
#if defined(NV_VM_INSERT_PAGE_PRESENT)
176
#if defined(NV_VM_INSERT_PAGE_PRESENT)
177
#include <linux/pagemap.h>
177
#include <linux/pagemap.h>
178
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
178
#include <linux/dma-mapping.h>
179
#include <linux/dma-mapping.h>
180
#else
181
#include <linux/dma-direct.h>
182
#endif
179
#endif
183
#endif
180
184
181
#if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
185
#if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
Lines 1209-1215 static inline NvU32 nv_alloc_init_flags(int cached, int contiguous, int zeroed) Link Here
1209
static inline NvBool nv_dma_maps_swiotlb(struct pci_dev *dev)
1213
static inline NvBool nv_dma_maps_swiotlb(struct pci_dev *dev)
1210
{
1214
{
1211
    NvBool swiotlb_in_use = NV_FALSE;
1215
    NvBool swiotlb_in_use = NV_FALSE;
1212
#if defined(CONFIG_SWIOTLB)
1216
#if defined(CONFIG_SWIOTLB) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
1213
  #if defined(NV_DMA_OPS_PRESENT) || defined(NV_GET_DMA_OPS_PRESENT)
1217
  #if defined(NV_DMA_OPS_PRESENT) || defined(NV_GET_DMA_OPS_PRESENT)
1214
    /*
1218
    /*
1215
     * We only use the 'dma_ops' symbol on older x86_64 kernels; later kernels,
1219
     * We only use the 'dma_ops' symbol on older x86_64 kernels; later kernels,
(-)a/kernel/conftest.sh (+5 lines)
Lines 1906-1912 compile_test() { Link Here
1906
            # Determine if the phys_to_dma function is present.
1906
            # Determine if the phys_to_dma function is present.
1907
            #
1907
            #
1908
            CODE="
1908
            CODE="
1909
            #include <linux/version.h>
1910
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
1909
            #include <linux/dma-mapping.h>
1911
            #include <linux/dma-mapping.h>
1912
#else
1913
            #include <linux/dma-direct.h>
1914
#endif
1910
            void conftest_phys_to_dma(void) {
1915
            void conftest_phys_to_dma(void) {
1911
                phys_to_dma();
1916
                phys_to_dma();
1912
            }"
1917
            }"

Return to bug 652476