commit 55b5639cca0b41c37028a08795f4739989d88308
author Greg Kaiser <gkaiser@google.com> Fri May 27 20:41:14 2022 +0000
committer Greg Kaiser <gkaiser@google.com> Fri May 27 20:41:14 2022 +0000
tree 3f1eeecd25b8d5ab3c50197790e62433d5cb9d51
parent 5d3679612fa6398ba5231f659438cfd72cd55adc

Revert "Update to v5.18 kernel headers."

Revert "Update to v5.18 kernel headers."

Revert submission 2106847-kernel_update

Reason for revert: b/234125620
Reverted Changes:
I5844ca1fc:Update to v5.18 kernel headers.
I5700813ee:Update to v5.18 kernel headers.
Bug: 234125620

Change-Id: I07a39aa9c01939455b5a2a9da5fc04be497ca399

libc/kernel/uapi/linux/rseq.h

diff --git a/libc/kernel/uapi/linux/rseq.h b/libc/kernel/uapi/linux/rseq.h
index 29a9457..ba0ceb1 100644
--- a/libc/kernel/uapi/linux/rseq.h
+++ b/libc/kernel/uapi/linux/rseq.h
@@ -47,7 +47,22 @@
 struct rseq {
   __u32 cpu_id_start;
   __u32 cpu_id;
-  __u64 rseq_cs;
+  union {
+    __u64 ptr64;
+#ifdef __LP64__
+    __u64 ptr;
+#else
+    struct {
+#if defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN || defined(__BIG_ENDIAN)
+      __u32 padding;
+      __u32 ptr32;
+#else
+      __u32 ptr32;
+      __u32 padding;
+#endif
+    } ptr;
+#endif
+  } rseq_cs;
   __u32 flags;
 } __attribute__((aligned(4 * sizeof(__u64))));
 #endif