ckpt_siginfo now has addr and trapno fields, so use them for the __SI_FAULT case.
Signed-off-by: Nathan Lynch <[email protected]> --- kernel/signal.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/signal.c b/kernel/signal.c index df9b7be..de85c35 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -2933,9 +2933,9 @@ static void fill_siginfo(struct ckpt_siginfo *si, const siginfo_t *info) si->csi_fd = info->si_fd; break; case __SI_FAULT: - si->csi_ptr = (unsigned long) info->si_addr; + si->csi_addr = (unsigned long)info->si_addr; #ifdef __ARCH_SI_TRAPNO - si->csi_int = info->si_trapno; + si->csi_trapno = info->si_trapno; #endif break; case __SI_CHLD: @@ -2982,9 +2982,9 @@ static int load_siginfo(siginfo_t *info, const struct ckpt_siginfo *si) info->si_fd = si->csi_fd; break; case __SI_FAULT: - info->si_addr = (void __user *) (unsigned long) si->csi_ptr; + info->si_addr = (void __user *)(unsigned long)si->csi_addr; #ifdef __ARCH_SI_TRAPNO - info->si_trapno = si->csi_int; + info->si_trapno = si->csi_trapno; #endif break; case __SI_CHLD: -- 1.7.1.1 _______________________________________________ Containers mailing list [email protected] https://lists.linux-foundation.org/mailman/listinfo/containers _______________________________________________ Devel mailing list [email protected] https://openvz.org/mailman/listinfo/devel
