Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 937445 | Differences between
and this patch

Collapse All | Expand All

(-)virtualbox-6.1.50.orig/vboxdrv/r0drv/linux/memobj-r0drv-linux.c (+8 lines)
Lines 114-119 Link Here
114 
# define LNX_MM_UP_WRITE(a_pMm)       up_write(&(a_pMm)->mmap_sem)
 114 
# define LNX_MM_UP_WRITE(a_pMm)       up_write(&(a_pMm)->mmap_sem)
115 
#endif
 115 
#endif
116 

          116
          

        

            

              
              
              117
              
/*

            

            

              118
              
 * p.._large alias for p.._leaf is gone in 6.9

            

            

              119
              
 */

            

            

              120
              
#if RTLNX_VER_MIN(6,9,0)

            

            

              121
              
# define p4d_large p4d_leaf

            

            

              122
              
# define pmd_large pmd_leaf

            

            

              123
              
# define pud_large pud_leaf

            

            

              124
              
#endif

            

        

          117
          

          125
          

        

        

          118
          
/*********************************************************************************************************************************

          126
          
/*********************************************************************************************************************************

        

        

          119
          
*   Structures and Typedefs                                                                                                      *

          127
          
*   Structures and Typedefs                                                                                                      *

        



(-)virtualbox-6.1.50.orig/vboxnetflt/linux/VBoxNetFlt-linux.c
      (-2 / +8 lines)




  

    
      
            Lines 926-932
          static void vboxNetFltLinuxSkBufToSG(PVB
      
      
        Link Here
      
    
  

        

          926
          
    for (i = 0; i < skb_shinfo(pBuf)->nr_frags; i++)

          926
          
    for (i = 0; i < skb_shinfo(pBuf)->nr_frags; i++)

        

        

          927
          
    {

          927
          
    {

        

        

          928
          
        skb_frag_t *pFrag = &skb_shinfo(pBuf)->frags[i];

          928
          
        skb_frag_t *pFrag = &skb_shinfo(pBuf)->frags[i];

        

          
            

              929
              
# if RTLNX_VER_MIN(5,4,0) || RTLNX_SUSE_MAJ_PREREQ(15, 2)


              929
              
# if RTLNX_VER_MIN(6,9,0)

            

            

              
              

              930
              
        pSG->aSegs[iSeg].cb = pFrag->len;

            

            


              931
              
        pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->offset;

            

            


              932
              
# elif RTLNX_VER_MIN(5,4,0) || RTLNX_SUSE_MAJ_PREREQ(15, 2)

            

        

          930
          
        pSG->aSegs[iSeg].cb = pFrag->bv_len;

          933
          
        pSG->aSegs[iSeg].cb = pFrag->bv_len;

        

        

          931
          
        pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset;

          934
          
        pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset;

        

        

          932
          
# else /* < KERNEL_VERSION(5, 4, 0) */

          935
          
# else /* < KERNEL_VERSION(5, 4, 0) */

        

  

    
      
            Lines 947-953
          static void vboxNetFltLinuxSkBufToSG(PVB
      
      
        Link Here
      
    
  

        

          947
          
        for (i = 0; i < skb_shinfo(pFragBuf)->nr_frags; i++)

          950
          
        for (i = 0; i < skb_shinfo(pFragBuf)->nr_frags; i++)

        

        

          948
          
        {

          951
          
        {

        

        

          949
          
            skb_frag_t *pFrag = &skb_shinfo(pFragBuf)->frags[i];

          952
          
            skb_frag_t *pFrag = &skb_shinfo(pFragBuf)->frags[i];

        

          
            

              950
              
# if RTLNX_VER_MIN(5,4,0) || RTLNX_SUSE_MAJ_PREREQ(15, 2)


              953
              
# if RTLNX_VER_MIN(6,9,0)

            

            

              
              

              954
              
            pSG->aSegs[iSeg].cb = pFrag->len;

            

            


              955
              
            pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->offset;

            

            


              956
              
# elif RTLNX_VER_MIN(5,4,0) || RTLNX_SUSE_MAJ_PREREQ(15, 2)

            

        

          951
          
            pSG->aSegs[iSeg].cb = pFrag->bv_len;

          957
          
            pSG->aSegs[iSeg].cb = pFrag->bv_len;

        

        

          952
          
            pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset;

          958
          
            pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset;

        

        

          953
          
# else /* < KERNEL_VERSION(5, 4, 0) */

          959
          
# else /* < KERNEL_VERSION(5, 4, 0) */

        






  

  Return to bug 937445