diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-11 12:04:22 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-11 12:04:22 +0100 |
commit | 020644b613452cc7ab48474b463e4a9d1088d8a3 (patch) | |
tree | b1e2ae353ab1f58e0513bf5cef15ea87eacba1ff /testing/libdrm/git_fixes.diff | |
parent | 9268c5eeb9d68cd786f5a7beaed3b5672adb5287 (diff) | |
parent | 9d1489b877a1fa7c2674cf1f744804db42d93bfc (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/librep/PKGBUILD
extra/pixman/PKGBUILD
Diffstat (limited to 'testing/libdrm/git_fixes.diff')
-rw-r--r-- | testing/libdrm/git_fixes.diff | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/testing/libdrm/git_fixes.diff b/testing/libdrm/git_fixes.diff deleted file mode 100644 index dc80155f2..000000000 --- a/testing/libdrm/git_fixes.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c -index 19441f3..eb9dd32 100644 ---- a/intel/intel_bufmgr_gem.c -+++ b/intel/intel_bufmgr_gem.c -@@ -958,7 +958,7 @@ static void drm_intel_gem_bo_purge_vma_cache(drm_intel_bufmgr_gem *bufmgr_gem) - bufmgr_gem->vma_cache.next, - vma_list); - assert(bo_gem->map_count == 0); -- DRMLISTDEL(&bo_gem->vma_list); -+ DRMLISTDELINIT(&bo_gem->vma_list); - - if (bo_gem->mem_virtual) { - munmap(bo_gem->mem_virtual, bo_gem->bo.size); |