]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
tools headers: Sync uapi/linux/prctl.h with the kernel source
authorArnaldo Carvalho de Melo <acme@redhat.com>
Sat, 1 Nov 2025 15:53:56 +0000 (12:53 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Sat, 1 Nov 2025 15:53:56 +0000 (12:53 -0300)
To pick up the changes in these csets:

  8cdc4d27019356b0 ("mm/huge_memory: respect MADV_COLLAPSE with PR_THP_DISABLE_EXCEPT_ADVISED")
  9dc21bbd62edeae6 ("prctl: extend PR_SET_THP_DISABLE to optionally exclude VM_HUGEPAGE")

That don't introduce anything of interest for the tools/, just
addressing these perf build warnings:

  Warning: Kernel ABI header differences:
    diff -u tools/perf/trace/beauty/include/uapi/linux/prctl.h include/uapi/linux/prctl.h

Please see tools/include/uapi/README for further details.

Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: David Hildenbrand <david@redhat.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/trace/beauty/include/uapi/linux/prctl.h

index ed3aed264aeb28810abfd2366e53444f868f130d..51c4e8c82b1e98899c00d2e4609ca35432176533 100644 (file)
@@ -177,7 +177,17 @@ struct prctl_mm_map {
 
 #define PR_GET_TID_ADDRESS     40
 
+/*
+ * Flags for PR_SET_THP_DISABLE are only applicable when disabling. Bit 0
+ * is reserved, so PR_GET_THP_DISABLE can return "1 | flags", to effectively
+ * return "1" when no flags were specified for PR_SET_THP_DISABLE.
+ */
 #define PR_SET_THP_DISABLE     41
+/*
+ * Don't disable THPs when explicitly advised (e.g., MADV_HUGEPAGE /
+ * VM_HUGEPAGE, MADV_COLLAPSE).
+ */
+# define PR_THP_DISABLE_EXCEPT_ADVISED (1 << 1)
 #define PR_GET_THP_DISABLE     42
 
 /*