summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJustus Winter <4winter@informatik.uni-hamburg.de>2014-05-01 14:38:11 +0200
committerJustus Winter <4winter@informatik.uni-hamburg.de>2014-05-01 14:38:11 +0200
commit94b6f68c58b765ef915a717ef8856a34f828bef7 (patch)
treeb810171f64e49fa08b69b5af935877c4a9423fa7 /debian
parent0f91d1f0f4eb7213ba49865870a46a7852927517 (diff)
remove all patches merged upstream
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/0001-i386-fix-MACHINE_SERVER_HEADER.patch33
-rw-r--r--debian/patches/0001-vm-make-struct-vm_map-fit-into-a-cache-line.patch36
-rw-r--r--debian/patches/series2
3 files changed, 0 insertions, 71 deletions
diff --git a/debian/patches/0001-i386-fix-MACHINE_SERVER_HEADER.patch b/debian/patches/0001-i386-fix-MACHINE_SERVER_HEADER.patch
deleted file mode 100644
index 3d05246..0000000
--- a/debian/patches/0001-i386-fix-MACHINE_SERVER_HEADER.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4fda696b13d2d9fdb9496b2aeee1b05a6f852836 Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Wed, 30 Apr 2014 17:31:49 +0200
-Subject: [PATCH] i386: fix MACHINE_SERVER_HEADER
-
-Commit b6dab094 introduced a way to include the MIG-generated server
-files for the machine specific interface in ipc_kobject.c.
-
-This broke out-of-tree builds. Here, 'machine' is a symlink to
-'../i386/i386', it points into the source tree. The MIG-generated
-files however are put in the build tree in i386/i386.
-
-* i386/i386/machine_routines.h (MACHINE_SERVER_HEADER): Fix path.
----
- i386/i386/machine_routines.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/i386/i386/machine_routines.h b/i386/i386/machine_routines.h
-index 65315e5..d9dd94b 100644
---- a/i386/i386/machine_routines.h
-+++ b/i386/i386/machine_routines.h
-@@ -31,7 +31,7 @@
- * The i386 has a set of machine-dependent interfaces.
- */
- #define MACHINE_SERVER mach_i386_server
--#define MACHINE_SERVER_HEADER <machine/mach_i386.server.h>
-+#define MACHINE_SERVER_HEADER "i386/i386/mach_i386.server.h"
- #define MACHINE_SERVER_ROUTINE mach_i386_server_routine
-
- #endif /* _I386_MACHINE_ROUTINES_H_ */
---
-1.9.2
-
diff --git a/debian/patches/0001-vm-make-struct-vm_map-fit-into-a-cache-line.patch b/debian/patches/0001-vm-make-struct-vm_map-fit-into-a-cache-line.patch
deleted file mode 100644
index 41a3ca4..0000000
--- a/debian/patches/0001-vm-make-struct-vm_map-fit-into-a-cache-line.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 02f3fe277a80a4f32ffae04b061808a8bdf5bd59 Mon Sep 17 00:00:00 2001
-From: Justus Winter <4winter@informatik.uni-hamburg.de>
-Date: Wed, 30 Apr 2014 15:23:36 +0200
-Subject: [PATCH 1/2] vm: make struct vm_map fit into a cache line
-
-Currently, the size of struct vm_map is 68 bytes. By using a bit
-field for the boolean flags, it can be made fit into a cache line.
-
-* vm/vm_map.h (struct vm_map): Use a bit field for the boolean flags
-wait_for_space and wiring_required.
----
- vm/vm_map.h | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/vm/vm_map.h b/vm/vm_map.h
-index b6bc177..b8103eb 100644
---- a/vm/vm_map.h
-+++ b/vm/vm_map.h
-@@ -175,9 +175,12 @@ struct vm_map {
- vm_map_entry_t hint; /* hint for quick lookups */
- decl_simple_lock_data(, hint_lock) /* lock for hint storage */
- vm_map_entry_t first_free; /* First free space hint */
-- boolean_t wait_for_space; /* Should callers wait
-+
-+ /* Flags */
-+ unsigned int wait_for_space:1, /* Should callers wait
- for space? */
-- boolean_t wiring_required;/* All memory wired? */
-+ /* boolean_t */ wiring_required:1; /* All memory wired? */
-+
- unsigned int timestamp; /* Version number */
- };
-
---
-1.9.2
-
diff --git a/debian/patches/series b/debian/patches/series
index db94536..b040da8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,4 @@
70_dde.patch
protected_payload.patch
-0001-vm-make-struct-vm_map-fit-into-a-cache-line.patch
0002-Add-some-padding-to-make-objects-fit-a-single-cache-.patch
-0001-i386-fix-MACHINE_SERVER_HEADER.patch