summaryrefslogtreecommitdiff
path: root/debian/patches/upstreamme0001-ipc-avoid-kmem_alloc.patch
diff options
context:
space:
mode:
authorJustus Winter <4winter@informatik.uni-hamburg.de>2015-07-03 11:48:30 +0200
committerJustus Winter <4winter@informatik.uni-hamburg.de>2015-07-03 11:48:30 +0200
commit5708d7fffcb79200cc9519348c4fa72611fdb693 (patch)
tree72261fed633d73ad56fa82c7e9dbfbe13d8bd0a7 /debian/patches/upstreamme0001-ipc-avoid-kmem_alloc.patch
parent834009572a2f97e29612c0832b05f5bb5f58a702 (diff)
add patch series
Diffstat (limited to 'debian/patches/upstreamme0001-ipc-avoid-kmem_alloc.patch')
-rw-r--r--debian/patches/upstreamme0001-ipc-avoid-kmem_alloc.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/debian/patches/upstreamme0001-ipc-avoid-kmem_alloc.patch b/debian/patches/upstreamme0001-ipc-avoid-kmem_alloc.patch
new file mode 100644
index 0000000..47f0c7a
--- /dev/null
+++ b/debian/patches/upstreamme0001-ipc-avoid-kmem_alloc.patch
@@ -0,0 +1,45 @@
+From 0d1c85b580225d5f5935643e16d410dc1e5d18c6 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 1/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
+