Merge commit '0c59f7ff' into haugesund

diff --cc lib/mempool.c
index 169826d4c59cf4d4a191f7430ba69b301e700695,8f300b818618e2650329186ff83abe8f04a3cd06..f9a9aacacd962fc4ba6d640b3695e8a25a5ea53e
--- 1/lib/mempool.c
--- 2/lib/mempool.c
+++ b/lib/mempool.c
@@@ -37,13 -37,12 +37,14 @@@ const int lp_chunk_size = sizeof(struc
  struct linpool {
    resource r;
    byte *ptr, *end;
+   pool *p;
    struct lp_chunk *first, *current;           /* Normal (reusable) chunks */
    struct lp_chunk *first_large;                       /* Large chunks */
-   uint chunk_size, threshold, total, total_large;
+   uint chunk_size, threshold, total:31, use_pages:1, total_large;
  };
  
 +_Thread_local linpool *tmp_linpool;
 +
  static void lp_free(resource *);
  static void lp_dump(resource *);
  static resource *lp_lookup(resource *, unsigned long);

diff --cc lib/resource.h
Simple merge