diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2015-07-12 13:04:05 +0200 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2015-07-12 13:04:05 +0200 |
| commit | 5c19e8000c285fcaf10763498edae328415c9be7 (patch) | |
| tree | c0608f9ed27eaae0fe737c9276e1fc8dcdea5d44 /debian | |
| parent | 60a5cfeaadda84682ae799dd213e23a937e4f2bc (diff) | |
add patch series
Diffstat (limited to 'debian')
3 files changed, 78 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series index e532dda..1dba59f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -13,3 +13,5 @@ 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 new file mode 100644 index 0000000..ab1994b --- /dev/null +++ b/debian/patches/upstreamme0001-vm-really-fix-traversing-the-list-of-inactive-pages.patch @@ -0,0 +1,31 @@ +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 new file mode 100644 index 0000000..b14b7ca --- /dev/null +++ b/debian/patches/upstreamme0002-ipc-avoid-kmem_alloc.patch @@ -0,0 +1,45 @@ +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 + |