[Devel] [PATCH 1/1] x86_64: keep __u32s in even groups

[Serge E. Hallyn]

Otherwise the struct will be different size on x86-32 and x86-64.

Signed-off-by: Serge E. Hallyn <serue at us.ibm.com>
---
 include/linux/checkpoint_hdr.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/linux/checkpoint_hdr.h b/include/linux/checkpoint_hdr.h
index e591fd1..5a68178 100644
--- a/include/linux/checkpoint_hdr.h
+++ b/include/linux/checkpoint_hdr.h
@@ -345,6 +345,9 @@ struct ckpt_hdr_task {
 	__u32 exit_code;
 	__u32 exit_signal;
 	__u32 pdeath_signal;
+	__u32 compat_robust_futex_head_len;
+	__u32 compat_robust_futex_list; /* a compat __user ptr */
+	__u32 robust_futex_head_len;
 
 #ifdef CONFIG_AUDITSYSCALL
 	/* would audit want to track the checkpointed ids,
@@ -354,9 +357,6 @@ struct ckpt_hdr_task {
 	__u64 set_child_tid;
 	__u64 clear_child_tid;
 
-	__u32 compat_robust_futex_head_len;
-	__u32 compat_robust_futex_list; /* a compat __user ptr */
-	__u32 robust_futex_head_len;
 	__u64 robust_futex_list; /* a __user ptr */
 } __attribute__((aligned(8)));
 
-- 
1.6.0.4

_______________________________________________
Containers mailing list
Containers at lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/containers