Updated openais debdiff to include XVM's patch

[invirt/third/openais.git] / openais_1.1.1-1~hardy1~invirt2.debdiff

diff --git a/openais_1.1.1-1~hardy1~invirt2.debdiff b/openais_1.1.1-1~hardy1~invirt2.debdiff
index 7b3186b..2540073 100644 (file)
--- a/openais_1.1.1-1~hardy1~invirt2.debdiff
+++ b/openais_1.1.1-1~hardy1~invirt2.debdiff
@@ -81,12 +81,13 @@ only in patch2:
 unchanged:
 --- openais-1.1.1.orig/debian/patches/series
 +++ openais-1.1.1/debian/patches/series
 unchanged:
 --- openais-1.1.1.orig/debian/patches/series
 +++ openais-1.1.1/debian/patches/series

-@@ -0,0 +1,5 @@
+@@ -0,0 +1,6 @@

 +2098-fix-saCkptDispatch-deadlock
 +2099-fix-saTmrDispatch-deadlock
 +2100-fix-saLckDispatch-deadlock
 +2101-fix-saClmDispatch-deadlock
 +2102-fix-saMsgDispatch-deadlock
 +2098-fix-saCkptDispatch-deadlock
 +2099-fix-saTmrDispatch-deadlock
 +2100-fix-saLckDispatch-deadlock
 +2101-fix-saClmDispatch-deadlock
 +2102-fix-saMsgDispatch-deadlock

++invirt_bump_locks

 only in patch2:
 unchanged:
 --- openais-1.1.1.orig/debian/patches/2102-fix-saMsgDispatch-deadlock
 only in patch2:
 unchanged:
 --- openais-1.1.1.orig/debian/patches/2102-fix-saMsgDispatch-deadlock

@@ -243,3 +244,19 @@ unchanged:
 +                      }
 +                      res_clm_nodegetcallback = (struct res_clm_nodegetcallback *)dispatch_data;
 +                      marshall_from_mar_clm_cluster_node_t (
 +                      }
 +                      res_clm_nodegetcallback = (struct res_clm_nodegetcallback *)dispatch_data;
 +                      marshall_from_mar_clm_cluster_node_t (

+only in patch2:
+unchanged:
+--- openais-1.1.1.orig/debian/patches/invirt_bump_locks
++++ openais-1.1.1/debian/patches/invirt_bump_locks
+@@ -0,0 +1,11 @@
++--- a/include/ipc_lck.h       2010-05-29 17:05:43.000000000 -0400
+++++ b/include/ipc_lck.h   2010-05-29 17:06:22.000000000 -0400
++@@ -75,7 +75,7 @@
++ * can be obtained via the library call saLckLimitGet
++ * by passing the appropriate limitId (see saLck.h).
++ */
++-#define LCK_MAX_NUM_LOCKS 4096
+++#define LCK_MAX_NUM_LOCKS 524288
++
++ struct req_lib_lck_resourceopen {
++       coroipc_request_header_t header __attribute__((aligned(8)));