summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJustus Winter <4winter@informatik.uni-hamburg.de>2014-06-08 13:22:19 +0200
committerJustus Winter <4winter@informatik.uni-hamburg.de>2014-06-08 13:22:19 +0200
commit844cba0578fba1a430ee70beb2081684e836877c (patch)
treeff5d333f7790afc83d1ab280df794387425c7376 /debian
parent2c2f632ab6a87bdac1e8ecbbfe7a86c35d549879 (diff)
update pp patchset
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/protected_payload.patch52
1 files changed, 33 insertions, 19 deletions
diff --git a/debian/patches/protected_payload.patch b/debian/patches/protected_payload.patch
index 513274b..7c92c7c 100644
--- a/debian/patches/protected_payload.patch
+++ b/debian/patches/protected_payload.patch
@@ -1,12 +1,12 @@
diff --git a/doc/mach.texi b/doc/mach.texi
-index d089224..6167b4b 100644
+index 49c0d67..351b21c 100644
--- a/doc/mach.texi
+++ b/doc/mach.texi
@@ -1330,6 +1330,15 @@ which is conventionally used as a reply port by the recipient of the
message. The field must carry a send right, a send-once right,
@code{MACH_PORT_NULL}, or @code{MACH_PORT_DEAD}.
-+@item mach_port_t msgh_protected_payload
++@item unsigned long msgh_protected_payload
+The @code{msgh_protected_payload} field carries a payload that is set
+by the kernel during message delivery. The payload is an opaque
+identifier that can be used by the receiver to lookup the associated
@@ -106,6 +106,20 @@ index d089224..6167b4b 100644
@node Port Sets
@subsection Port Sets
+diff --git a/include/device/device_types.defs b/include/device/device_types.defs
+index ff6cff6..49cc271 100644
+--- a/include/device/device_types.defs
++++ b/include/device/device_types.defs
+@@ -63,6 +63,9 @@ type device_t = mach_port_t
+ #ifdef DEVICE_INTRAN
+ intran: DEVICE_INTRAN
+ #endif
++#ifdef DEVICE_INTRAN_PAYLOAD
++ intranpayload: DEVICE_INTRAN_PAYLOAD
++#endif
+ #ifdef DEVICE_OUTTRAN
+ outtran: DEVICE_OUTTRAN
+ #endif
diff --git a/include/mach/mach_port.defs b/include/mach/mach_port.defs
index 769d892..c7e8526 100644
--- a/include/mach/mach_port.defs
@@ -147,7 +161,7 @@ index bfce6cb..85ad653 100644
outtran: MEMORY_OBJECT_OUTTRAN
#endif
diff --git a/include/mach/memory_object.defs b/include/mach/memory_object.defs
-index 0ed8dbc..c6c1921 100644
+index 1ae36aa..6372ded 100644
--- a/include/mach/memory_object.defs
+++ b/include/mach/memory_object.defs
@@ -93,6 +93,10 @@ simpleroutine memory_object_terminate(
@@ -158,39 +172,39 @@ index 0ed8dbc..c6c1921 100644
+ intranpayload:
+ MEMORY_OBJECT_INTRAN_PAYLOAD
+#endif
- ;
- #if SEQNOS
- msgseqno seqno : mach_port_seqno_t;
-@@ -233,6 +237,9 @@ simpleroutine memory_object_lock_completed(
+ #ifdef MEMORY_OBJECT_DESTRUCTOR
+ destructor: MEMORY_OBJECT_DESTRUCTOR
+ #endif
+@@ -236,6 +240,9 @@ simpleroutine memory_object_lock_completed(
#ifdef MEMORY_OBJECT_INTRAN
intran: MEMORY_OBJECT_INTRAN
#endif
+#ifdef MEMORY_OBJECT_INTRAN_PAYLOAD
+ intranpayload: MEMORY_OBJECT_INTRAN_PAYLOAD
+#endif
- ;
- #if SEQNOS
- msgseqno seqno : mach_port_seqno_t;
-@@ -268,6 +275,9 @@ simpleroutine memory_object_supply_completed(
+ #ifdef MEMORY_OBJECT_DESTRUCTOR
+ destructor: MEMORY_OBJECT_DESTRUCTOR
+ #endif
+@@ -274,6 +281,9 @@ simpleroutine memory_object_supply_completed(
#ifdef MEMORY_OBJECT_INTRAN
intran: MEMORY_OBJECT_INTRAN
#endif
+#ifdef MEMORY_OBJECT_INTRAN_PAYLOAD
+ intranpayload: MEMORY_OBJECT_INTRAN_PAYLOAD
+#endif
- ;
- #if SEQNOS
- msgseqno seqno : mach_port_seqno_t;
-@@ -318,6 +328,9 @@ simpleroutine memory_object_change_completed(
+ #ifdef MEMORY_OBJECT_DESTRUCTOR
+ destructor: MEMORY_OBJECT_DESTRUCTOR
+ #endif
+@@ -327,6 +337,9 @@ simpleroutine memory_object_change_completed(
#ifdef MEMORY_OBJECT_INTRAN
intran: MEMORY_OBJECT_INTRAN
#endif
+#ifdef MEMORY_OBJECT_INTRAN_PAYLOAD
+ intranpayload: MEMORY_OBJECT_INTRAN_PAYLOAD
+#endif
- ;
- #if SEQNOS
- msgseqno seqno : mach_port_seqno_t;
+ #ifdef MEMORY_OBJECT_DESTRUCTOR
+ destructor: MEMORY_OBJECT_DESTRUCTOR
+ #endif
diff --git a/include/mach/message.h b/include/mach/message.h
index f78e978..0a7297e 100644
--- a/include/mach/message.h
@@ -219,7 +233,7 @@ index f78e978..0a7297e 100644
/*
* A dummy value. Mostly used to indicate that the actual value
diff --git a/include/mach/notify.defs b/include/mach/notify.defs
-index fdf35e9..37229a4 100644
+index 5e59d39..6ba4cde 100644
--- a/include/mach/notify.defs
+++ b/include/mach/notify.defs
@@ -45,6 +45,9 @@ type notify_port_t = MACH_MSG_TYPE_MOVE_SEND_ONCE