diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2015-08-17 21:33:33 +0200 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2015-08-18 16:45:15 +0200 |
| commit | ecf0b595a31a9e267ed8e67caeaafbeec054a840 (patch) | |
| tree | 24c46de6760a87fa4abc5f3a253e3e8516a625d5 | |
| parent | e6c6e15b03639e98df68df35ba0f639bdbc1dc51 (diff) | |
vm: collapse unreachable branch into assertion
* vm/vm_object.c (vm_object_collapse): Collapse unreachable branch
into assertion.
| -rw-r--r-- | vm/vm_object.c | 31 |
1 files changed, 3 insertions, 28 deletions
diff --git a/vm/vm_object.c b/vm/vm_object.c index deac0c2a..133181f5 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. |