refresh

diff --git a/meta b/meta
index 2790b32230663ba29da32bdbb7c31fc40d2070af..55fad1461fe45326fab05bf319d2936ae3784a07 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 2531212b4f495454f5a0474d31ee605389c25b6a
-Head: 07aecceff1396e0026a64e080625e165e183a55a
+Previous: a0af571aa7c7e12f7aa91cf6a5acb68da4281317
+Head: aa237d85e8cb72dcc30165d284f6c54255341bcc
 Applied:
   rm-build: d6d2302f2d258fa2c07e55a2e124a9bdd75367a0
   cm_listen_handler: 56372fe5e423b7238a4db99258c1493748c0a582
-  cm_poll: 29f684fbf523445e738aa796042ab62569823e4f
-  refresh-temp: 07aecceff1396e0026a64e080625e165e183a55a
+  cm_poll: aa237d85e8cb72dcc30165d284f6c54255341bcc
 Unapplied:
   old-bld-32: bd1bd1d366e3927b7646da33e243213a5d59c235
   old-apphang: 7a6f7ff02c6035e54fc262414eb9484ea98018b9

diff --git a/patches/cm_poll b/patches/cm_poll
index f134945dbf6e588c67ac935170a209a7cc18f29c..16bc40c1b509991ab9c2c1ea285499496037513b 100644 (file)
--- a/patches/cm_poll
+++ b/patches/cm_poll
@@ -1,5 +1,5 @@
 Bottom: fa748f1c52b43305bedd9af43719f0863bbecab5
-Top:    9f754288917224d5cc6537c9267e9e00ce970062
+Top:    94ddedd44bd8ad0ecfff1ba0cd50383b2addafa8
 Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
 Date:   2010-01-06 10:08:50 -0800
 
@@ -101,10 +101,18 @@ index 177bb9e..8ba28f1 100644
        p_ifc->send_rep = cm_send_rep;\r
        p_ifc->send_rtu = cm_send_rtu;\r
 diff --git a/trunk/core/al/kernel/al_cm_cep.c b/trunk/core/al/kernel/al_cm_cep.c
-index 4987207..d2bee9e 100644
+index 4987207..fbdfd56 100644
 --- a/trunk/core/al/kernel/al_cm_cep.c
 +++ b/trunk/core/al/kernel/al_cm_cep.c
-@@ -6652,7 +6652,7 @@ kal_cep_get_context(
+@@ -6641,7 +6641,6 @@ kal_cep_get_context(
+       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("[ CID = %d\n", cid) );\r
+ \r
+       CL_ASSERT( h_al );\r
+-      CL_ASSERT( pfn_addref );\r
+ \r
+       KeAcquireInStackQueuedSpinLock( &gp_cep_mgr->lock, &hdl );\r
+       p_cep = __lookup_cep( h_al, cid );\r
+@@ -6652,7 +6651,7 @@ kal_cep_get_context(
                goto out;\r
        }\r
  \r
@@ -113,7 +121,7 @@ index 4987207..d2bee9e 100644
        {\r
                AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR,\r
                        ("CEP callback mismatch for cid %d, h_al %p\n", cid, h_al ));\r
-@@ -6660,7 +6660,7 @@ kal_cep_get_context(
+@@ -6660,7 +6659,7 @@ kal_cep_get_context(
        }\r
  \r
        context = p_cep->context;\r

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index c11a2ba..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 9f754288917224d5cc6537c9267e9e00ce970062
-Top:    94ddedd44bd8ad0ecfff1ba0cd50383b2addafa8
-Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
-Date:   2010-01-07 12:04:56 -0800
-
-Refresh of cm_poll
-
----
-
-diff --git a/trunk/core/al/kernel/al_cm_cep.c b/trunk/core/al/kernel/al_cm_cep.c
-index d2bee9e..fbdfd56 100644
---- a/trunk/core/al/kernel/al_cm_cep.c
-+++ b/trunk/core/al/kernel/al_cm_cep.c
-@@ -6641,7 +6641,6 @@ kal_cep_get_context(
-       AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("[ CID = %d\n", cid) );\r
- \r
-       CL_ASSERT( h_al );\r
--      CL_ASSERT( pfn_addref );\r
- \r
-       KeAcquireInStackQueuedSpinLock( &gp_cep_mgr->lock, &hdl );\r
-       p_cep = __lookup_cep( h_al, cid );