NVIDIA_kernel-1.0-6629-1155389.diff

   1 diff -ru usr/src/nv/nv-linux.h usr/src/nv.1155389/nv-linux.h
   2 --- usr/src/nv/nv-linux.h       2004-11-03 22:53:00.000000000 +0100
   3 +++ usr/src/nv.1155389/nv-linux.h       2004-11-04 11:47:05.000000000 +0100
   4 @@ -729,12 +729,21 @@
   5          return order;
   6      }
   7
   8 +/* mark memory UC-, rather than UC (don't use _PAGE_PWT) */
   9 +static inline pgprot_t pgprot_noncached_weak(pgprot_t old_prot)
  10 +    {
  11 +        pgprot_t new_prot = old_prot;
  12 +        if (boot_cpu_data.x86 > 3)
  13 +            new_prot = __pgprot(pgprot_val(old_prot) | _PAGE_PCD);
  14 +        return new_prot;
  15 +    }
  16 +
  17  #if !defined (pgprot_noncached)
  18  static inline pgprot_t pgprot_noncached(pgprot_t old_prot)
  19      {
  20          pgprot_t new_prot = old_prot;
  21          if (boot_cpu_data.x86 > 3)
  22 -            new_prot = __pgprot(pgprot_val(old_prot) | _PAGE_PCD);
  23 +            new_prot = __pgprot(pgprot_val(old_prot) | _PAGE_PCD | _PAGE_PWT);
  24          return new_prot;
  25      }
  26  #endif
  27 diff -ru usr/src/nv/nv.c usr/src/nv.1155389/nv.c
  28 --- usr/src/nv/nv.c     2004-11-03 22:53:00.000000000 +0100
  29 +++ usr/src/nv.1155389/nv.c     2004-11-04 11:47:05.000000000 +0100
  30 @@ -1551,7 +1551,7 @@
  31      /* NV fb space */
  32      else if (IS_FB_OFFSET(nv, NV_VMA_OFFSET(vma), vma->vm_end - vma->vm_start))
  33      {
  34 -        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
  35 +        vma->vm_page_prot = pgprot_noncached_weak(vma->vm_page_prot);
  36          if (NV_REMAP_PAGE_RANGE(vma->vm_start,
  37                               NV_VMA_OFFSET(vma),
  38                               vma->vm_end - vma->vm_start,