Merge commit '928a1cb034e6f9e8edcdd1dc07264cd703e00827' into thread-next

diff --cc filter/decl.m4
Simple merge

diff --cc proto/mrt/mrt.c
Simple merge

diff --cc sysdep/bsd/krt-sock.c
Simple merge

diff --cc sysdep/unix/alloc.c
index 3ea10c32f0f9a537807ee0b48d7f0dcddd0758be,5d9c6bcd695c775bb9bdae0e7c2c023619ec2aca..030fb9c1501d2b68822f107186a0b0eda525ae8f
--- 1/sysdep/unix/alloc.c
--- 2/sysdep/unix/alloc.c
+++ b/sysdep/unix/alloc.c
@@@ -293,7 -222,15 +297,13 @@@ page_cleanup(void *_ UNUSED
  void
  resource_sys_init(void)
  {
+ #ifdef CONFIG_DISABLE_THP
+   /* Disable transparent huge pages, they do not work properly with madvice(MADV_DONTNEED) */
+   if (prctl(PR_SET_THP_DISABLE,  (unsigned long) 1,  (unsigned long) 0,  (unsigned long) 0,  (unsigned long) 0) < 0)
+     die("prctl(PR_SET_THP_DISABLE) failed: %m");
+ #endif
+ 
  #ifdef HAVE_MMAP
 -  ASSERT_DIE(global_free_pages.cnt == 0);
 -
    /* Check what page size the system supports */
    if (!(page_size = sysconf(_SC_PAGESIZE)))
      die("System page size must be non-zero");