diff options
3 files changed, 0 insertions, 78 deletions
diff --git a/debian/patches/series b/debian/patches/series index 1dba59f..e532dda 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -13,5 +13,3 @@ vm-cache-policy0001-VM-cache-policy-change.patch vm-cache-policy0002-vm-keep-track-of-clean-pages.patch vm-cache-policy0003-vm-evict-clean-pages-first.patch -upstreamme0001-vm-really-fix-traversing-the-list-of-inactive-pages.patch -upstreamme0002-ipc-avoid-kmem_alloc.patch diff --git a/debian/patches/upstreamme0001-vm-really-fix-traversing-the-list-of-inactive-pages.patch b/debian/patches/upstreamme0001-vm-really-fix-traversing-the-list-of-inactive-pages.patch deleted file mode 100644 index ab1994b..0000000 --- a/debian/patches/upstreamme0001-vm-really-fix-traversing-the-list-of-inactive-pages.patch +++ /dev/null @@ -1,31 +0,0 @@ -From c40798e0fda94a1b4178b7e620a0777bb86927be Mon Sep 17 00:00:00 2001 -From: Justus Winter <4winter@informatik.uni-hamburg.de> -Date: Sun, 12 Jul 2015 13:00:07 +0200 -Subject: [PATCH gnumach 1/2] vm: really fix traversing the list of inactive - pages - -Previously, the pageout code traversed the list of pages in an object -instead of the list of inactive pages. - -* vm/vm_pageout.c (vm_pageout_scan): Fix traversing the list of -inactive pages. ---- - vm/vm_pageout.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vm/vm_pageout.c b/vm/vm_pageout.c -index b13128a..51a6a0d 100644 ---- a/vm/vm_pageout.c -+++ b/vm/vm_pageout.c -@@ -693,7 +693,7 @@ void vm_pageout_scan(void) - if (want_pages || m->external) - break; - -- m = (vm_page_t) queue_next (&m->listq); -+ m = (vm_page_t) queue_next (&m->pageq); - if (!m) - goto pause; - } --- -2.1.4 - diff --git a/debian/patches/upstreamme0002-ipc-avoid-kmem_alloc.patch b/debian/patches/upstreamme0002-ipc-avoid-kmem_alloc.patch deleted file mode 100644 index b14b7ca..0000000 --- a/debian/patches/upstreamme0002-ipc-avoid-kmem_alloc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 8760a60438d4f06b0a65b7fe2719bc39ad02c50d Mon Sep 17 00:00:00 2001 -From: Justus Winter <4winter@informatik.uni-hamburg.de> -Date: Thu, 2 Jul 2015 16:14:18 +0200 -Subject: [PATCH gnumach 2/2] ipc: avoid kmem_alloc - -* ipc/ipc_table.c (ipc_table_alloc): Unconditionally use `kalloc'. -(ipc_table_free): Unconditionally use `kfree'. ---- - ipc/ipc_table.c | 15 ++------------- - 1 file changed, 2 insertions(+), 13 deletions(-) - -diff --git a/ipc/ipc_table.c b/ipc/ipc_table.c -index 1a89d81..0f8592a 100644 ---- a/ipc/ipc_table.c -+++ b/ipc/ipc_table.c -@@ -114,15 +114,7 @@ vm_offset_t - ipc_table_alloc( - vm_size_t size) - { -- vm_offset_t table; -- -- if (size < PAGE_SIZE) -- table = kalloc(size); -- else -- if (kmem_alloc(kmem_map, &table, size) != KERN_SUCCESS) -- table = 0; -- -- return table; -+ return kalloc(size); - } - - /* -@@ -139,8 +131,5 @@ ipc_table_free( - vm_size_t size, - vm_offset_t table) - { -- if (size < PAGE_SIZE) -- kfree(table, size); -- else -- kmem_free(kmem_map, table, size); -+ kfree(table, size); - } --- -2.1.4 - |