diff for duplicates of <20180413141901.GA15253@altlinux.org> diff --git a/a/1.txt b/N1/1.txt index a81d1b3..c132d97 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,7 +3,7 @@ results to wrong values in si_pid and si_uid fields of compat siginfo_t. This happens due to FPE_FIXME being defined to 0 for sparc, and at the same time siginfo_layout() introduced by the same commit returns -SIL_FAULT for SIGFPE if si_code = SI_USER and FPE_FIXME is defined to 0. +SIL_FAULT for SIGFPE if si_code == SI_USER and FPE_FIXME is defined to 0. Fix this regression by removing FPE_FIXME macro and changing all its users to assign FPE_FLTUNK to si_code instead of FPE_FIXME. @@ -53,7 +53,7 @@ index b1ed763..33cd35b 100644 info.si_trapno = 0; - info.si_code = FPE_FIXME; + info.si_code = FPE_FLTUNK; - if ((fsr & 0x1c000) = (1 << 14)) { + if ((fsr & 0x1c000) == (1 << 14)) { if (fsr & 0x10) info.si_code = FPE_FLTINV; diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c @@ -66,7 +66,7 @@ index 462a21a..e81072a 100644 info.si_trapno = 0; - info.si_code = FPE_FIXME; + info.si_code = FPE_FLTUNK; - if ((fsr & 0x1c000) = (1 << 14)) { + if ((fsr & 0x1c000) == (1 << 14)) { if (fsr & 0x10) info.si_code = FPE_FLTINV; -- diff --git a/a/content_digest b/N1/content_digest index f610739..b61ef6c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dmitry V. Levin <ldv@altlinux.org>\0" "Subject\0[PATCH] sparc: fix compat siginfo ABI regression\0" - "Date\0Fri, 13 Apr 2018 14:19:02 +0000\0" + "Date\0Fri, 13 Apr 2018 17:19:02 +0300\0" "To\0David S. Miller <davem@davemloft.net>\0" "Cc\0Eric W. Biederman <ebiederm@xmission.com>" Anatoly Pugachev <matorola@gmail.com> @@ -13,7 +13,7 @@ "\n" "This happens due to FPE_FIXME being defined to 0 for sparc, and at the\n" "same time siginfo_layout() introduced by the same commit returns\n" - "SIL_FAULT for SIGFPE if si_code = SI_USER and FPE_FIXME is defined to 0.\n" + "SIL_FAULT for SIGFPE if si_code == SI_USER and FPE_FIXME is defined to 0.\n" "\n" "Fix this regression by removing FPE_FIXME macro and changing all its users\n" "to assign FPE_FLTUNK to si_code instead of FPE_FIXME.\n" @@ -63,7 +63,7 @@ " \tinfo.si_trapno = 0;\n" "-\tinfo.si_code = FPE_FIXME;\n" "+\tinfo.si_code = FPE_FLTUNK;\n" - " \tif ((fsr & 0x1c000) = (1 << 14)) {\n" + " \tif ((fsr & 0x1c000) == (1 << 14)) {\n" " \t\tif (fsr & 0x10)\n" " \t\t\tinfo.si_code = FPE_FLTINV;\n" "diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c\n" @@ -76,10 +76,10 @@ " \t\tinfo.si_trapno = 0;\n" "-\t\tinfo.si_code = FPE_FIXME;\n" "+\t\tinfo.si_code = FPE_FLTUNK;\n" - " \t\tif ((fsr & 0x1c000) = (1 << 14)) {\n" + " \t\tif ((fsr & 0x1c000) == (1 << 14)) {\n" " \t\t\tif (fsr & 0x10)\n" " \t\t\t\tinfo.si_code = FPE_FLTINV;\n" "-- \n" ldv -f9b81382ea7ed48d144a27edf443455dd2a1dbb90b904270d94cec36ce0d957a +3a3d6955ac7a9b38fad5fdeb81f7060e5d9dde926414d6b3b97c538d36e6769d
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.