pop

diff --git a/meta b/meta
index 4493b4e6eb37bea2cca51ff5f45840a114e20d7b..a4cf4dc306f6e9d1e461ad877b6d5e1111660d92 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,10 @@
 Version: 1
-Previous: 134288d5f91d1ad625b276d1bc23a68a5536984b
-Head: 03f4d89839a16c30de3e5094b587e5c4b386adc4
+Previous: 9517186015b2e8f6da10053be4737197c343c747
+Head: a3854cfc3535f6b396e909741fed3010af710ab4
 Applied:
   transpose: 03f4d89839a16c30de3e5094b587e5c4b386adc4
+  fork: a3854cfc3535f6b396e909741fed3010af710ab4
 Unapplied:
-  fork: 454d730c27cbe7efcf9927edc0826f7f833fb95f
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de
 Hidden:

diff --git a/patches/fork b/patches/fork
index fd75ff193b2fa4d026ee9ade3553bcd03ca0994b..4407d4ff4fae202a6acee6ccf77965ef17a12534 100644 (file)
--- a/patches/fork
+++ b/patches/fork
@@ -1,5 +1,5 @@
-Bottom: 454cf9a1db769bb4bf7d2c1d4b95f0a992a0aafa
-Top:    6824bd04c82761ee7e8d74496b6527b2166fd460
+Bottom: a8d2f5e9e4909e604d5a7b614f02d08080507dcb
+Top:    e90a53de4491d0aa00f51dec53f5a436f320da53
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-13 15:25:53 -0700
 
@@ -14,7 +14,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index 0d457bf..9c4c423 100644
+index 498e813..ca81292 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -92,10 +92,12 @@ static pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER;
@@ -42,7 +42,7 @@ index 0d457bf..9c4c423 100644
  }
  
  static void init_preload(void)
-@@ -344,8 +350,16 @@ int socket(int domain, int type, int protocol)
+@@ -365,8 +371,16 @@ int socket(int domain, int type, int protocol)
        ret = rsocket(domain, type, protocol);
        recursive = 0;
        if (ret >= 0) {
@@ -61,7 +61,7 @@ index 0d457bf..9c4c423 100644
                return index;
        }
        fd_close(index, &ret);
-@@ -403,6 +417,27 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
+@@ -421,6 +435,27 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
        }
  }