Merge commit 'c70b3198' into thread-next [lots of conflicts]

There were more conflicts that I'd like to see, most notably in route
export. If a bisect identifies this commit with something related, it
may be simply true that this commit introduces that bug. Let's hope it
doesn't happen.

1 files changed, 1 insertions, 0 deletions

diff --git a/lib/resource.h b/lib/resource.h
index 4cedbf00..8bb264b1 100644
--- a/lib/resource.h
+++ b/lib/resource.h
@@ -115,6 +115,7 @@ void sl_free(void *);
 void buffer_realloc(void **buf, unsigned *size, unsigned need, unsigned item_size);
 
 /* Allocator of whole pages; for use in slabs and other high-level allocators. */
+#define PAGE_HEAD(x)	((void *) (((uintptr_t) (x)) & ~(page_size-1)))
 extern long page_size;
 void *alloc_page(void);
 void free_page(void *);