From: Greg Kroah-Hartman Date: Wed, 27 Nov 2019 09:26:14 +0000 (+0100) Subject: 5.3-stable patches X-Git-Tag: v4.4.204~49 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f6de5b74a946002b9a2ee7ac6bc4eaeb6ad13562;p=thirdparty%2Fkernel%2Fstable-queue.git 5.3-stable patches added patches: x86-insn-fix-awk-regexp-warnings.patch --- diff --git a/queue-5.3/series b/queue-5.3/series index 8e07b81ca87..124655a6e7a 100644 --- a/queue-5.3/series +++ b/queue-5.3/series @@ -43,3 +43,4 @@ revert-dm-crypt-use-wq_highpri-for-the-io-and-crypt-workqueues.patch md-raid10-prevent-access-of-uninitialized-resync_pages-offset.patch mdio_bus-fix-init-if-config_reset_controller-n.patch arm-8904-1-skip-nomap-memblocks-while-finding-the-lowmem-highmem-boundary.patch +x86-insn-fix-awk-regexp-warnings.patch diff --git a/queue-5.3/x86-insn-fix-awk-regexp-warnings.patch b/queue-5.3/x86-insn-fix-awk-regexp-warnings.patch new file mode 100644 index 00000000000..9a026ad52b7 --- /dev/null +++ b/queue-5.3/x86-insn-fix-awk-regexp-warnings.patch @@ -0,0 +1,88 @@ +From 700c1018b86d0d4b3f1f2d459708c0cdf42b521d Mon Sep 17 00:00:00 2001 +From: Alexander Kapshuk +Date: Tue, 24 Sep 2019 07:46:59 +0300 +Subject: x86/insn: Fix awk regexp warnings + +From: Alexander Kapshuk + +commit 700c1018b86d0d4b3f1f2d459708c0cdf42b521d upstream. + +gawk 5.0.1 generates the following regexp warnings: + + GEN /home/sasha/torvalds/tools/objtool/arch/x86/lib/inat-tables.c + awk: ../arch/x86/tools/gen-insn-attr-x86.awk:260: warning: regexp escape sequence `\:' is not a known regexp operator + awk: ../arch/x86/tools/gen-insn-attr-x86.awk:350: (FILENAME=../arch/x86/lib/x86-opcode-map.txt FNR=41) warning: regexp escape sequence `\&' is not a known regexp operator + +Ealier versions of gawk are not known to generate these warnings. The +gawk manual referenced below does not list characters ':' and '&' as +needing escaping, so 'unescape' them. See + + https://www.gnu.org/software/gawk/manual/html_node/Escape-Sequences.html + +for more info. + +Running diff on the output generated by the script before and after +applying the patch reported no differences. + + [ bp: Massage commit message. ] + +[ Caught the respective tools header discrepancy. ] +Reported-by: kbuild test robot +Signed-off-by: Alexander Kapshuk +Signed-off-by: Borislav Petkov +Acked-by: Masami Hiramatsu +Cc: "H. Peter Anvin" +Cc: "Peter Zijlstra (Intel)" +Cc: Arnaldo Carvalho de Melo +Cc: Ingo Molnar +Cc: Josh Poimboeuf +Cc: Thomas Gleixner +Cc: x86-ml +Link: https://lkml.kernel.org/r/20190924044659.3785-1-alexander.kapshuk@gmail.com +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/tools/gen-insn-attr-x86.awk | 4 ++-- + tools/objtool/arch/x86/tools/gen-insn-attr-x86.awk | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +--- a/arch/x86/tools/gen-insn-attr-x86.awk ++++ b/arch/x86/tools/gen-insn-attr-x86.awk +@@ -69,7 +69,7 @@ BEGIN { + + lprefix1_expr = "\\((66|!F3)\\)" + lprefix2_expr = "\\(F3\\)" +- lprefix3_expr = "\\((F2|!F3|66\\&F2)\\)" ++ lprefix3_expr = "\\((F2|!F3|66&F2)\\)" + lprefix_expr = "\\((66|F2|F3)\\)" + max_lprefix = 4 + +@@ -257,7 +257,7 @@ function convert_operands(count,opnd, + return add_flags(imm, mod) + } + +-/^[0-9a-f]+\:/ { ++/^[0-9a-f]+:/ { + if (NR == 1) + next + # get index +--- a/tools/objtool/arch/x86/tools/gen-insn-attr-x86.awk ++++ b/tools/objtool/arch/x86/tools/gen-insn-attr-x86.awk +@@ -69,7 +69,7 @@ BEGIN { + + lprefix1_expr = "\\((66|!F3)\\)" + lprefix2_expr = "\\(F3\\)" +- lprefix3_expr = "\\((F2|!F3|66\\&F2)\\)" ++ lprefix3_expr = "\\((F2|!F3|66&F2)\\)" + lprefix_expr = "\\((66|F2|F3)\\)" + max_lprefix = 4 + +@@ -257,7 +257,7 @@ function convert_operands(count,opnd, + return add_flags(imm, mod) + } + +-/^[0-9a-f]+\:/ { ++/^[0-9a-f]+:/ { + if (NR == 1) + next + # get index