This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch master in repository gnumach.
commit 17963f1d4d2a189e8cad98273dc2bb69ee370457 Author: Samuel Thibault <[email protected]> Date: Mon Jan 2 12:37:20 2017 +0000 Update DDE patches. - 71_dde.patch: Update. - 72_dde.patch: Drop, merged into 71_dde.patch. --- debian/changelog | 2 ++ debian/patches/71_dde.patch | 22 ++++++++++++---------- debian/patches/72_dde.patch | 18 ------------------ debian/patches/series | 1 - 4 files changed, 14 insertions(+), 29 deletions(-) diff --git a/debian/changelog b/debian/changelog index 82dc868..8ec120e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ gnumach (2:1.8+git20170102-1) unstable; urgency=medium * New upstream snapshot. + - 71_dde.patch: Update. + - 72_dde.patch: Drop, merged into 71_dde.patch. -- Samuel Thibault <[email protected]> Mon, 02 Jan 2017 12:25:41 +0000 diff --git a/debian/patches/71_dde.patch b/debian/patches/71_dde.patch index 10ae036..73f7c47 100644 --- a/debian/patches/71_dde.patch +++ b/debian/patches/71_dde.patch @@ -1,14 +1,14 @@ -commit d3b5f56297204bf8b9b7df94ddf72fe81cb4786d +commit 962f153f1ac1e7a2e31970b3de08a483f94a2866 Author: Richard Braun <[email protected]> -Date: Tue Nov 8 17:28:14 2016 +0100 +Date: Sat Dec 24 03:32:42 2016 +0100 - Make experimental_vm_allocate_contiguous cleaner + Fix experimental_vm_allocate_contiguous diff --git a/vm/vm_user.c b/vm/vm_user.c -index 1f68297..597d7a3 100644 +index 47d50b24..d29bbb23 100644 --- a/vm/vm_user.c +++ b/vm/vm_user.c -@@ -457,15 +457,14 @@ kern_return_t experimental_vm_allocate_contiguous(host_priv, map, result_vaddr, +@@ -487,15 +487,14 @@ kern_return_t experimental_vm_allocate_contiguous(host_priv, map, result_vaddr, vm_address_t *result_paddr; vm_size_t size; { @@ -25,7 +25,7 @@ index 1f68297..597d7a3 100644 if (host_priv == HOST_NULL) return KERN_INVALID_HOST; -@@ -473,82 +472,72 @@ kern_return_t experimental_vm_allocate_contiguous(host_priv, map, result_vaddr, +@@ -503,82 +502,74 @@ kern_return_t experimental_vm_allocate_contiguous(host_priv, map, result_vaddr, if (map == VM_MAP_NULL) return KERN_INVALID_TASK; @@ -83,6 +83,7 @@ index 1f68297..597d7a3 100644 + */ + pages[i].busy = FALSE; + vm_page_insert(&pages[i], object, vm_page_ptoa(i)); ++ vm_page_wire(&pages[i]); } -#endif @@ -116,14 +117,15 @@ index 1f68297..597d7a3 100644 - - entry->object.vm_object = object; - entry->offset = 0; - +- - /* We can unlock map now. */ - vm_map_unlock(map); -+ kr = vm_map_pageable(map, vaddr, vaddr + size, -+ VM_PROT_READ | VM_PROT_WRITE); - /* We have physical pages we need and now we need to do the mapping. */ -- ++ kr = vm_map_pageable(map, vaddr, vaddr + size, ++ VM_PROT_READ | VM_PROT_WRITE, ++ TRUE, TRUE); + - pmap_pageable (map->pmap, vaddr, vaddr + size, FALSE); + if (kr != KERN_SUCCESS) { + vm_map_remove(map, vaddr, vaddr + size); diff --git a/debian/patches/72_dde.patch b/debian/patches/72_dde.patch deleted file mode 100644 index e1553b6..0000000 --- a/debian/patches/72_dde.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit 89d914869bb0802d6148fdb4c2bac83ec1fe15c0 -Author: Richard Braun <[email protected]> -Date: Tue Nov 8 17:36:27 2016 +0100 - - Fix experimental_vm_allocate_contiguous to wire down pages early - -diff --git a/vm/vm_user.c b/vm/vm_user.c -index 597d7a3..403c7ee 100644 ---- a/vm/vm_user.c -+++ b/vm/vm_user.c -@@ -509,6 +509,7 @@ kern_return_t experimental_vm_allocate_contiguous(host_priv, map, result_vaddr, - */ - pages[i].busy = FALSE; - vm_page_insert(&pages[i], object, vm_page_ptoa(i)); -+ vm_page_wire(&pages[i]); - } - - vm_page_unlock_queues(); diff --git a/debian/patches/series b/debian/patches/series index ae9523c..a98059b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,4 +4,3 @@ 50_initrd.patch 70_dde.patch 71_dde.patch -72_dde.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hurd/gnumach.git
