diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2015-08-18 16:48:48 +0200 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2015-08-18 16:48:48 +0200 |
| commit | 32cee4938cef0766b22d3e799393c78c997d72a7 (patch) | |
| tree | d650c33ecef8bce81fe4f049f6b42fc975c481ef /debian/patches/fix-locking0001-vm-collapse-unreachable-branch-into-assertion.patch | |
| parent | 8bbccb93cc9d854c199c2033051c63597949cfa6 (diff) | |
add patch series
Diffstat (limited to 'debian/patches/fix-locking0001-vm-collapse-unreachable-branch-into-assertion.patch')
| -rw-r--r-- | debian/patches/fix-locking0001-vm-collapse-unreachable-branch-into-assertion.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/debian/patches/fix-locking0001-vm-collapse-unreachable-branch-into-assertion.patch b/debian/patches/fix-locking0001-vm-collapse-unreachable-branch-into-assertion.patch new file mode 100644 index 0000000..de441e8 --- /dev/null +++ b/debian/patches/fix-locking0001-vm-collapse-unreachable-branch-into-assertion.patch @@ -0,0 +1,56 @@ +From ecf0b595a31a9e267ed8e67caeaafbeec054a840 Mon Sep 17 00:00:00 2001 +From: Justus Winter <4winter@informatik.uni-hamburg.de> +Date: Mon, 17 Aug 2015 21:33:33 +0200 +Subject: [PATCH gnumach 1/3] vm: collapse unreachable branch into assertion + +* vm/vm_object.c (vm_object_collapse): Collapse unreachable branch +into assertion. +--- + vm/vm_object.c | 31 +++---------------------------- + 1 file changed, 3 insertions(+), 28 deletions(-) + +diff --git a/vm/vm_object.c b/vm/vm_object.c +index deac0c2..133181f 100644 +--- a/vm/vm_object.c ++++ b/vm/vm_object.c +@@ -2465,34 +2465,9 @@ void vm_object_collapse( + VM_PAGE_FREE(p); + } + else { +- if (pp != VM_PAGE_NULL) { +- /* +- * Parent has an absent page... +- * it's not being paged in, so +- * it must really be missing from +- * the parent. +- * +- * Throw out the absent page... +- * any faults looking for that +- * page will restart with the new +- * one. +- */ +- +- /* +- * This should never happen -- the +- * parent cannot have ever had an +- * external memory object, and thus +- * cannot have absent pages. +- */ +- panic("vm_object_collapse: bad case"); +- +- VM_PAGE_FREE(pp); +- +- /* +- * Fall through to move the backing +- * object's page up. +- */ +- } ++ assert(pp == VM_PAGE_NULL || ! ++ "vm_object_collapse: bad case"); ++ + /* + * Parent now has no page. + * Move the backing object's page up. +-- +2.1.4 + |