pop

diff --git a/meta b/meta
index 4c658ace4846c3b3b652fa1d1710802f1712b887..a8344265e62002420dfda3eb50fecca20ae9c8d5 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,10 @@
 Version: 1
-Previous: 4b20f1fdc9e3a1a4d45d80eda483e0fec3f4cf38
-Head: 4c834bc154a73e7edd6dd4a912933958ca142d8d
+Previous: 664a91b00cfa83c72b9eaed94ea3edcc80fbcffb
+Head: a270468d34074ebd394e4b26b747ead8c77922ed
 Applied:
   transpose: 4c834bc154a73e7edd6dd4a912933958ca142d8d
+  fork: a270468d34074ebd394e4b26b747ead8c77922ed
 Unapplied:
-  fork: d62b389a7f30187f39e8c6ae709fbdbf8423e7e8
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de
 Hidden:

diff --git a/patches/fork b/patches/fork
index 3740c83bffccf22947ace23a334fe18d968fd293..4a4bf4bfbc4d09ca86b0ae00a2d962c54927cdeb 100644 (file)
--- a/patches/fork
+++ b/patches/fork
@@ -1,5 +1,5 @@
-Bottom: 7ec243f3149e9a1ff1d5183f18e30d2458e354d6
-Top:    8ec84e6e24d58093de94f5921ca22d6e4c566290
+Bottom: 454cf9a1db769bb4bf7d2c1d4b95f0a992a0aafa
+Top:    aaae6221e67fef87997f863c01c8702f0dfc8d21
 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 2750b30..8b9fbaf 100644
+index 0d457bf..599e5fb 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 2750b30..8b9fbaf 100644
  }
  
  static void init_preload(void)
-@@ -301,6 +307,68 @@ err:
+@@ -313,6 +319,68 @@ err:
  }
  
  /*
@@ -111,7 +111,7 @@ index 2750b30..8b9fbaf 100644
   * Use defaults on failure.
   */
  void set_rsocket_options(int rsocket)
-@@ -332,8 +400,16 @@ int socket(int domain, int type, int protocol)
+@@ -344,8 +412,16 @@ int socket(int domain, int type, int protocol)
        ret = rsocket(domain, type, protocol);
        recursive = 0;
        if (ret >= 0) {
@@ -130,7 +130,7 @@ index 2750b30..8b9fbaf 100644
                return index;
        }
        fd_close(index, &ret);
-@@ -388,6 +464,29 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
+@@ -403,6 +479,29 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
        }
  }