add fix-libpager-notify-lookups.patch

2 files changed, 85 insertions, 0 deletions

diff --git a/debian/patches/fix-libpager-notify-lookups.patch b/debian/patches/fix-libpager-notify-lookups.patch
new file mode 100644
index 00000000..da7a97f3
--- /dev/null
+++ b/debian/patches/fix-libpager-notify-lookups.patch
@@ -0,0 +1,84 @@
+diff --git a/libpager/mig-mutate.h b/libpager/mig-mutate.h
+index 54f7de8..9e9065f 100644
+--- a/libpager/mig-mutate.h
++++ b/libpager/mig-mutate.h
+@@ -20,3 +20,10 @@
+ #define MEMORY_OBJECT_INTRAN pager_t begin_using_pager (memory_object_t)
+ #define MEMORY_OBJECT_DESTRUCTOR end_using_pager (pager_t)
+ #define MEMORY_OBJECT_IMPORTS import "mig-decls.h";
++
++#define NOTIFY_INTRAN						\
++  port_info_t begin_using_port_info_port (mach_port_t)
++#define NOTIFY_DESTRUCTOR					\
++  end_using_port_info (port_info_t)
++#define NOTIFY_IMPORTS						\
++  import "libports/mig-decls.h";
+diff --git a/libpager/notify-stubs.c b/libpager/notify-stubs.c
+index 2d791aa..ba13882 100644
+--- a/libpager/notify-stubs.c
++++ b/libpager/notify-stubs.c
+@@ -23,54 +23,54 @@
+ #include <errno.h>
+ 
+ error_t
+-_pager_do_seqnos_mach_notify_port_deleted (mach_port_t notify,
++_pager_do_seqnos_mach_notify_port_deleted (struct port_info *pi,
+ 					   mach_port_seqno_t seqno,
+ 					   mach_port_t name
+ 					   __attribute__ ((unused)))
+ {
+-  _pager_update_seqno (notify, seqno);
++  _pager_update_seqno_p ((struct pager *) pi, seqno);
+ 
+   return 0;
+ }
+ 
+ error_t
+-_pager_do_seqnos_mach_notify_msg_accepted (mach_port_t notify,
++_pager_do_seqnos_mach_notify_msg_accepted (struct port_info *pi,
+ 					   mach_port_seqno_t seqno,
+ 					   mach_port_t name
+ 					     __attribute__ ((unused)))
+ {
+-  _pager_update_seqno (notify, seqno);
++  _pager_update_seqno_p ((struct pager *) pi, seqno);
+ 
+   return 0;
+ }
+ 
+ error_t
+-_pager_do_seqnos_mach_notify_port_destroyed (mach_port_t notify,
++_pager_do_seqnos_mach_notify_port_destroyed (struct port_info *pi,
+ 					     mach_port_seqno_t seqno,
+ 					     mach_port_t name
+ 					       __attribute__ ((unused)))
+ {
+-  _pager_update_seqno (notify, seqno);
++  _pager_update_seqno_p ((struct pager *) pi, seqno);
+ 
+   return 0;
+ }
+ 
+ error_t
+-_pager_do_seqnos_mach_notify_send_once (mach_port_t notify,
++_pager_do_seqnos_mach_notify_send_once (struct port_info *pi,
+ 					mach_port_seqno_t seqno)
+ {
+-  _pager_update_seqno (notify, seqno);
++  _pager_update_seqno_p ((struct pager *) pi, seqno);
+ 
+   return 0;
+ }
+ 
+ error_t
+-_pager_do_seqnos_mach_notify_dead_name (mach_port_t notify,
++_pager_do_seqnos_mach_notify_dead_name (struct port_info *pi,
+ 					mach_port_seqno_t seqno,
+ 					mach_port_t name
+ 					  __attribute__ ((unused)))
+ {
+-  _pager_update_seqno (notify, seqno);
++  _pager_update_seqno_p ((struct pager *) pi, seqno);
+ 
+   return 0;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 48570cab..248ebaaf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -43,3 +43,4 @@ xxx-fix-build.patch
 mach-defpager-protected-payload.patch
 #ext2fs-skip-unallocated-blocks.patch
 
+fix-libpager-notify-lookups.patch