diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-03-25 08:50:39 +0100 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-03-25 08:50:39 +0100 |
| commit | 5f97615ac1319bfc94bb61f568aa8866fdd94130 (patch) | |
| tree | 116ac5fea1bf1282bc0093c5dcc0baf79bb33430 | |
| parent | f7a0af0f691ec5ed4dc4ec568893572ead8838ad (diff) | |
rm libpager-deadlock.patch
| -rw-r--r-- | debian/patches/libpager-deadlock.patch | 59 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 60 deletions
diff --git a/debian/patches/libpager-deadlock.patch b/debian/patches/libpager-deadlock.patch deleted file mode 100644 index 2fb85f03..00000000 --- a/debian/patches/libpager-deadlock.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/libpager/pager-attr.c b/libpager/pager-attr.c -index 7629f1d..ad1560e 100644 ---- a/libpager/pager-attr.c -+++ b/libpager/pager-attr.c -@@ -19,9 +19,9 @@ - #include <assert.h> - - /* Change the attributes of the memory object underlying pager P. -- Args MAY_CACHE and COPY_STRATEGY are as for -- memory_object_change_atributes. Wait for the kernel to report completion -- off WAIT is set.*/ -+ Arguments MAY_CACHE and COPY_STRATEGY are as for -+ memory_object_change_atributes. Wait for the kernel to report -+ completion if WAIT is set. */ - void - pager_change_attributes (struct pager *p, - boolean_t may_cache, -@@ -77,11 +77,14 @@ pager_change_attributes (struct pager *p, - } - } - -+ pthread_mutex_unlock (&p->interlock); - memory_object_change_attributes (p->memobjcntl, may_cache, copy_strategy, - wait ? p->port.port_right : MACH_PORT_NULL); - - if (wait) - { -+ pthread_mutex_lock (&p->interlock); -+ - while (ar->attrs_pending) - pthread_cond_wait (&p->wakeup, &p->interlock); - -@@ -92,7 +95,7 @@ pager_change_attributes (struct pager *p, - ar->next->prevp = ar->prevp; - free (ar); - } -+ -+ pthread_mutex_unlock (&p->interlock); - } -- -- pthread_mutex_unlock (&p->interlock); - } -diff --git a/libpager/pager.h b/libpager/pager.h -index 75ff108..d0572af 100644 ---- a/libpager/pager.h -+++ b/libpager/pager.h -@@ -111,9 +111,9 @@ pager_offer_page (struct pager *pager, - vm_address_t buf); - - /* Change the attributes of the memory object underlying pager PAGER. -- Args MAY_CACHE and COPY_STRATEGY are as for -- memory_object_change_atributes. Wait for the kernel to report completion -- off WAIT is set.*/ -+ Arguments MAY_CACHE and COPY_STRATEGY are as for -+ memory_object_change_atributes. Wait for the kernel to report -+ completion if WAIT is set. */ - void - pager_change_attributes (struct pager *pager, - boolean_t may_cache, diff --git a/debian/patches/series b/debian/patches/series index f782f7bc..f2af8b72 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -47,5 +47,4 @@ xkb-compat.patch xxx-fix-build.patch mach-defpager-fix-receiver-lookups.patch mach-defpager-protected-payload.patch -libpager-deadlock.patch ext2fs-skip-unallocated-blocks.patch |