From: Greg Kroah-Hartman Date: Fri, 10 May 2019 06:24:17 +0000 (+0200) Subject: drop xtensa-fix-initialization-of-pt_regs-syscall-in-star.patch from most trees X-Git-Tag: v4.9.175~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=40f92f1d5967d8552a4fadd3cf3f9cf95fcce1f9;p=thirdparty%2Fkernel%2Fstable-queue.git drop xtensa-fix-initialization-of-pt_regs-syscall-in-star.patch from most trees --- diff --git a/queue-3.18/series b/queue-3.18/series index b3ab7b87b9a..0b0b8616ccc 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -53,7 +53,6 @@ scsi-libsas-fix-a-race-condition-when-smp-task-timeout.patch asoc-soc-pcm-fix-a-codec-fixup-issue-in-tdm-case.patch asoc-cs4270-set-auto-increment-bit-for-register-writ.patch asoc-tlv320aic32x4-fix-common-pins.patch -xtensa-fix-initialization-of-pt_regs-syscall-in-star.patch scsi-csiostor-fix-missing-data-copy-in-csio_scsi_err.patch iommu-amd-set-exclusion-range-correctly.patch genirq-prevent-use-after-free-and-work-list-corrupti.patch diff --git a/queue-3.18/xtensa-fix-initialization-of-pt_regs-syscall-in-star.patch b/queue-3.18/xtensa-fix-initialization-of-pt_regs-syscall-in-star.patch deleted file mode 100644 index afaafd41403..00000000000 --- a/queue-3.18/xtensa-fix-initialization-of-pt_regs-syscall-in-star.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 3687872fc20b0614e24450fd813624c74c4f508f Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Wed, 3 Apr 2019 20:22:42 -0700 -Subject: xtensa: fix initialization of pt_regs::syscall in start_thread - -[ Upstream commit 2663147dc7465cb29040a05cc4286fdd839978b5 ] - -New pt_regs should indicate that there's no syscall, not that there's -syscall #0. While at it wrap macro body in do/while and parenthesize -macro arguments. - -Signed-off-by: Max Filippov -Signed-off-by: Sasha Levin ---- - arch/xtensa/include/asm/processor.h | 21 ++++++++++++--------- - 1 file changed, 12 insertions(+), 9 deletions(-) - -diff --git a/arch/xtensa/include/asm/processor.h b/arch/xtensa/include/asm/processor.h -index b61bdf0eea254..79b2d1a6b4ffa 100644 ---- a/arch/xtensa/include/asm/processor.h -+++ b/arch/xtensa/include/asm/processor.h -@@ -152,15 +152,18 @@ struct thread_struct { - - /* Clearing a0 terminates the backtrace. */ - #define start_thread(regs, new_pc, new_sp) \ -- memset(regs, 0, sizeof(*regs)); \ -- regs->pc = new_pc; \ -- regs->ps = USER_PS_VALUE; \ -- regs->areg[1] = new_sp; \ -- regs->areg[0] = 0; \ -- regs->wmask = 1; \ -- regs->depc = 0; \ -- regs->windowbase = 0; \ -- regs->windowstart = 1; -+ do { \ -+ memset((regs), 0, sizeof(*(regs))); \ -+ (regs)->pc = (new_pc); \ -+ (regs)->ps = USER_PS_VALUE; \ -+ (regs)->areg[1] = (new_sp); \ -+ (regs)->areg[0] = 0; \ -+ (regs)->wmask = 1; \ -+ (regs)->depc = 0; \ -+ (regs)->windowbase = 0; \ -+ (regs)->windowstart = 1; \ -+ (regs)->syscall = NO_SYSCALL; \ -+ } while (0) - - /* Forward declaration */ - struct task_struct; --- -2.20.1 - diff --git a/queue-4.14/series b/queue-4.14/series index 18f5a2f0a44..877e6206e71 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -16,7 +16,6 @@ drm-mediatek-fix-an-error-code-in-mtk_hdmi_dt_parse_.patch perf-x86-intel-fix-handling-of-wakeup_events-for-mul.patch perf-x86-intel-initialize-tfa-msr.patch linux-kernel.h-use-parentheses-around-argument-in-u6.patch -xtensa-fix-initialization-of-pt_regs-syscall-in-star.patch asoc-rockchip-pdm-fix-regmap_ops-hang-issue.patch slab-fix-a-crash-by-reading-proc-slab_allocators.patch virtio_pci-fix-a-null-pointer-reference-in-vp_del_vq.patch diff --git a/queue-4.14/xtensa-fix-initialization-of-pt_regs-syscall-in-star.patch b/queue-4.14/xtensa-fix-initialization-of-pt_regs-syscall-in-star.patch deleted file mode 100644 index c9ba24ab7b6..00000000000 --- a/queue-4.14/xtensa-fix-initialization-of-pt_regs-syscall-in-star.patch +++ /dev/null @@ -1,52 +0,0 @@ -From ebeb90b3b3d5dd2b5611997a3a5d2e65dcdeef77 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Wed, 3 Apr 2019 20:22:42 -0700 -Subject: xtensa: fix initialization of pt_regs::syscall in start_thread - -[ Upstream commit 2663147dc7465cb29040a05cc4286fdd839978b5 ] - -New pt_regs should indicate that there's no syscall, not that there's -syscall #0. While at it wrap macro body in do/while and parenthesize -macro arguments. - -Signed-off-by: Max Filippov -Signed-off-by: Sasha Levin ---- - arch/xtensa/include/asm/processor.h | 21 ++++++++++++--------- - 1 file changed, 12 insertions(+), 9 deletions(-) - -diff --git a/arch/xtensa/include/asm/processor.h b/arch/xtensa/include/asm/processor.h -index a39cd81b741ad..3a0a8a53f2e72 100644 ---- a/arch/xtensa/include/asm/processor.h -+++ b/arch/xtensa/include/asm/processor.h -@@ -195,15 +195,18 @@ struct thread_struct { - - /* Clearing a0 terminates the backtrace. */ - #define start_thread(regs, new_pc, new_sp) \ -- memset(regs, 0, sizeof(*regs)); \ -- regs->pc = new_pc; \ -- regs->ps = USER_PS_VALUE; \ -- regs->areg[1] = new_sp; \ -- regs->areg[0] = 0; \ -- regs->wmask = 1; \ -- regs->depc = 0; \ -- regs->windowbase = 0; \ -- regs->windowstart = 1; -+ do { \ -+ memset((regs), 0, sizeof(*(regs))); \ -+ (regs)->pc = (new_pc); \ -+ (regs)->ps = USER_PS_VALUE; \ -+ (regs)->areg[1] = (new_sp); \ -+ (regs)->areg[0] = 0; \ -+ (regs)->wmask = 1; \ -+ (regs)->depc = 0; \ -+ (regs)->windowbase = 0; \ -+ (regs)->windowstart = 1; \ -+ (regs)->syscall = NO_SYSCALL; \ -+ } while (0) - - /* Forward declaration */ - struct task_struct; --- -2.20.1 - diff --git a/queue-4.19/series b/queue-4.19/series index a63165991d2..e4bcb7e52ea 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -29,7 +29,6 @@ drm-mediatek-fix-an-error-code-in-mtk_hdmi_dt_parse_.patch perf-x86-intel-fix-handling-of-wakeup_events-for-mul.patch perf-x86-intel-initialize-tfa-msr.patch linux-kernel.h-use-parentheses-around-argument-in-u6.patch -xtensa-fix-initialization-of-pt_regs-syscall-in-star.patch asoc-rockchip-pdm-fix-regmap_ops-hang-issue.patch drm-amd-display-fix-cursor-black-issue.patch asoc-cs35l35-disable-regulators-on-driver-removal.patch diff --git a/queue-4.19/xtensa-fix-initialization-of-pt_regs-syscall-in-star.patch b/queue-4.19/xtensa-fix-initialization-of-pt_regs-syscall-in-star.patch deleted file mode 100644 index c1f5163f0ab..00000000000 --- a/queue-4.19/xtensa-fix-initialization-of-pt_regs-syscall-in-star.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 0008f3f34df5efc48bcedfae9f77017c12498673 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Wed, 3 Apr 2019 20:22:42 -0700 -Subject: xtensa: fix initialization of pt_regs::syscall in start_thread - -[ Upstream commit 2663147dc7465cb29040a05cc4286fdd839978b5 ] - -New pt_regs should indicate that there's no syscall, not that there's -syscall #0. While at it wrap macro body in do/while and parenthesize -macro arguments. - -Signed-off-by: Max Filippov -Signed-off-by: Sasha Levin ---- - arch/xtensa/include/asm/processor.h | 21 ++++++++++++--------- - 1 file changed, 12 insertions(+), 9 deletions(-) - -diff --git a/arch/xtensa/include/asm/processor.h b/arch/xtensa/include/asm/processor.h -index 677bc76c1d707..6e709fb562831 100644 ---- a/arch/xtensa/include/asm/processor.h -+++ b/arch/xtensa/include/asm/processor.h -@@ -194,15 +194,18 @@ struct thread_struct { - - /* Clearing a0 terminates the backtrace. */ - #define start_thread(regs, new_pc, new_sp) \ -- memset(regs, 0, sizeof(*regs)); \ -- regs->pc = new_pc; \ -- regs->ps = USER_PS_VALUE; \ -- regs->areg[1] = new_sp; \ -- regs->areg[0] = 0; \ -- regs->wmask = 1; \ -- regs->depc = 0; \ -- regs->windowbase = 0; \ -- regs->windowstart = 1; -+ do { \ -+ memset((regs), 0, sizeof(*(regs))); \ -+ (regs)->pc = (new_pc); \ -+ (regs)->ps = USER_PS_VALUE; \ -+ (regs)->areg[1] = (new_sp); \ -+ (regs)->areg[0] = 0; \ -+ (regs)->wmask = 1; \ -+ (regs)->depc = 0; \ -+ (regs)->windowbase = 0; \ -+ (regs)->windowstart = 1; \ -+ (regs)->syscall = NO_SYSCALL; \ -+ } while (0) - - /* Forward declaration */ - struct task_struct; --- -2.20.1 - diff --git a/queue-4.4/series b/queue-4.4/series index 06fd6d81c08..19893f54ed0 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -145,7 +145,6 @@ asoc-soc-pcm-fix-a-codec-fixup-issue-in-tdm-case.patch asoc-cs4270-set-auto-increment-bit-for-register-writ.patch asoc-tlv320aic32x4-fix-common-pins.patch perf-x86-intel-fix-handling-of-wakeup_events-for-mul.patch -xtensa-fix-initialization-of-pt_regs-syscall-in-star.patch scsi-csiostor-fix-missing-data-copy-in-csio_scsi_err.patch iommu-amd-set-exclusion-range-correctly.patch genirq-prevent-use-after-free-and-work-list-corrupti.patch diff --git a/queue-4.4/xtensa-fix-initialization-of-pt_regs-syscall-in-star.patch b/queue-4.4/xtensa-fix-initialization-of-pt_regs-syscall-in-star.patch deleted file mode 100644 index b23834f608d..00000000000 --- a/queue-4.4/xtensa-fix-initialization-of-pt_regs-syscall-in-star.patch +++ /dev/null @@ -1,52 +0,0 @@ -From c62f2eccd4b585dc51e064ce3a720d0681fb5434 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Wed, 3 Apr 2019 20:22:42 -0700 -Subject: xtensa: fix initialization of pt_regs::syscall in start_thread - -[ Upstream commit 2663147dc7465cb29040a05cc4286fdd839978b5 ] - -New pt_regs should indicate that there's no syscall, not that there's -syscall #0. While at it wrap macro body in do/while and parenthesize -macro arguments. - -Signed-off-by: Max Filippov -Signed-off-by: Sasha Levin ---- - arch/xtensa/include/asm/processor.h | 21 ++++++++++++--------- - 1 file changed, 12 insertions(+), 9 deletions(-) - -diff --git a/arch/xtensa/include/asm/processor.h b/arch/xtensa/include/asm/processor.h -index d3ac00fcb15cc..9e3b4e75094dc 100644 ---- a/arch/xtensa/include/asm/processor.h -+++ b/arch/xtensa/include/asm/processor.h -@@ -183,15 +183,18 @@ struct thread_struct { - - /* Clearing a0 terminates the backtrace. */ - #define start_thread(regs, new_pc, new_sp) \ -- memset(regs, 0, sizeof(*regs)); \ -- regs->pc = new_pc; \ -- regs->ps = USER_PS_VALUE; \ -- regs->areg[1] = new_sp; \ -- regs->areg[0] = 0; \ -- regs->wmask = 1; \ -- regs->depc = 0; \ -- regs->windowbase = 0; \ -- regs->windowstart = 1; -+ do { \ -+ memset((regs), 0, sizeof(*(regs))); \ -+ (regs)->pc = (new_pc); \ -+ (regs)->ps = USER_PS_VALUE; \ -+ (regs)->areg[1] = (new_sp); \ -+ (regs)->areg[0] = 0; \ -+ (regs)->wmask = 1; \ -+ (regs)->depc = 0; \ -+ (regs)->windowbase = 0; \ -+ (regs)->windowstart = 1; \ -+ (regs)->syscall = NO_SYSCALL; \ -+ } while (0) - - /* Forward declaration */ - struct task_struct; --- -2.20.1 - diff --git a/queue-4.9/series b/queue-4.9/series index fe08ecfc4b1..5f29c12dbb3 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -9,7 +9,6 @@ asoc-tlv320aic32x4-fix-common-pins.patch drm-mediatek-fix-an-error-code-in-mtk_hdmi_dt_parse_.patch perf-x86-intel-fix-handling-of-wakeup_events-for-mul.patch linux-kernel.h-use-parentheses-around-argument-in-u6.patch -xtensa-fix-initialization-of-pt_regs-syscall-in-star.patch scsi-csiostor-fix-missing-data-copy-in-csio_scsi_err.patch drm-mediatek-fix-possible-object-reference-leak.patch virtio-blk-limit-number-of-hw-queues-by-nr_cpu_ids.patch diff --git a/queue-4.9/xtensa-fix-initialization-of-pt_regs-syscall-in-star.patch b/queue-4.9/xtensa-fix-initialization-of-pt_regs-syscall-in-star.patch deleted file mode 100644 index d232a3469d5..00000000000 --- a/queue-4.9/xtensa-fix-initialization-of-pt_regs-syscall-in-star.patch +++ /dev/null @@ -1,52 +0,0 @@ -From ccf8ba3957e3a3efba8c770ab011e59b09e8bb30 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Wed, 3 Apr 2019 20:22:42 -0700 -Subject: xtensa: fix initialization of pt_regs::syscall in start_thread - -[ Upstream commit 2663147dc7465cb29040a05cc4286fdd839978b5 ] - -New pt_regs should indicate that there's no syscall, not that there's -syscall #0. While at it wrap macro body in do/while and parenthesize -macro arguments. - -Signed-off-by: Max Filippov -Signed-off-by: Sasha Levin ---- - arch/xtensa/include/asm/processor.h | 21 ++++++++++++--------- - 1 file changed, 12 insertions(+), 9 deletions(-) - -diff --git a/arch/xtensa/include/asm/processor.h b/arch/xtensa/include/asm/processor.h -index 521c1e789e6e0..1fc0154597550 100644 ---- a/arch/xtensa/include/asm/processor.h -+++ b/arch/xtensa/include/asm/processor.h -@@ -180,15 +180,18 @@ struct thread_struct { - - /* Clearing a0 terminates the backtrace. */ - #define start_thread(regs, new_pc, new_sp) \ -- memset(regs, 0, sizeof(*regs)); \ -- regs->pc = new_pc; \ -- regs->ps = USER_PS_VALUE; \ -- regs->areg[1] = new_sp; \ -- regs->areg[0] = 0; \ -- regs->wmask = 1; \ -- regs->depc = 0; \ -- regs->windowbase = 0; \ -- regs->windowstart = 1; -+ do { \ -+ memset((regs), 0, sizeof(*(regs))); \ -+ (regs)->pc = (new_pc); \ -+ (regs)->ps = USER_PS_VALUE; \ -+ (regs)->areg[1] = (new_sp); \ -+ (regs)->areg[0] = 0; \ -+ (regs)->wmask = 1; \ -+ (regs)->depc = 0; \ -+ (regs)->windowbase = 0; \ -+ (regs)->windowstart = 1; \ -+ (regs)->syscall = NO_SYSCALL; \ -+ } while (0) - - /* Forward declaration */ - struct task_struct; --- -2.20.1 -