From: Greg Kroah-Hartman Date: Mon, 30 Jul 2018 12:17:44 +0000 (+0200) Subject: drop patch from 4.4 and 3.18 X-Git-Tag: v4.17.12~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb9d69340a038d3365b2e899c33a0385fa132328;p=thirdparty%2Fkernel%2Fstable-queue.git drop patch from 4.4 and 3.18 --- diff --git a/queue-3.18/series b/queue-3.18/series index b96ea008940..59f35a5ef46 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -42,7 +42,6 @@ drm-radeon-fix-mode_valid-s-return-type.patch powerpc-embedded6xx-hlwd-pic-prevent-interrupts-from-being-handled-by-starlet.patch hid-i2c-hid-check-if-device-is-there-before-really-probing.patch tty-fix-data-race-in-tty_insert_flip_string_fixed_flag.patch -tick-prefer-a-lower-rating-device-only-if-it-s-cpu-local-device.patch libata-fix-command-retry-decision.patch media-saa7164-fix-driver-name-in-debug-output.patch s390-cpum_sf-add-data-entry-sizes-to-sampling-trailer-entry.patch diff --git a/queue-3.18/tick-prefer-a-lower-rating-device-only-if-it-s-cpu-local-device.patch b/queue-3.18/tick-prefer-a-lower-rating-device-only-if-it-s-cpu-local-device.patch deleted file mode 100644 index 581e2609ebf..00000000000 --- a/queue-3.18/tick-prefer-a-lower-rating-device-only-if-it-s-cpu-local-device.patch +++ /dev/null @@ -1,40 +0,0 @@ -From foo@baz Sat Jul 28 12:29:48 CEST 2018 -From: Sudeep Holla -Date: Wed, 9 May 2018 17:02:08 +0100 -Subject: tick: Prefer a lower rating device only if it's CPU local device - -From: Sudeep Holla - -[ Upstream commit 1332a90558013ae4242e3dd7934bdcdeafb06c0d ] - -Checking the equality of cpumask for both new and old tick device doesn't -ensure that it's CPU local device. This will cause issue if a low rating -clockevent tick device is registered first followed by the registration -of higher rating clockevent tick device. - -In such case, clockevents_released list will never get emptied as both -the devices get selected as preferred one and we will loop forever in -clockevents_notify_released. - -Signed-off-by: Sudeep Holla -Signed-off-by: Thomas Gleixner -Cc: Frederic Weisbecker -Link: https://lkml.kernel.org/r/1525881728-4858-1-git-send-email-sudeep.holla@arm.com -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - kernel/time/tick-common.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/kernel/time/tick-common.c -+++ b/kernel/time/tick-common.c -@@ -266,7 +266,8 @@ static bool tick_check_preferred(struct - */ - return !curdev || - newdev->rating > curdev->rating || -- !cpumask_equal(curdev->cpumask, newdev->cpumask); -+ (!cpumask_equal(curdev->cpumask, newdev->cpumask) && -+ !tick_check_percpu(curdev, newdev, smp_processor_id())); - } - - /* diff --git a/queue-4.4/series b/queue-4.4/series index 1553efacca3..9df1ed44629 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -63,7 +63,6 @@ powerpc-embedded6xx-hlwd-pic-prevent-interrupts-from-being-handled-by-starlet.pa hid-i2c-hid-check-if-device-is-there-before-really-probing.patch tty-fix-data-race-in-tty_insert_flip_string_fixed_flag.patch dma-iommu-fix-compilation-when-config_iommu_dma.patch -tick-prefer-a-lower-rating-device-only-if-it-s-cpu-local-device.patch media-rcar_jpu-add-missing-clk_disable_unprepare-on-error-in-jpu_open.patch libata-fix-command-retry-decision.patch media-saa7164-fix-driver-name-in-debug-output.patch diff --git a/queue-4.4/tick-prefer-a-lower-rating-device-only-if-it-s-cpu-local-device.patch b/queue-4.4/tick-prefer-a-lower-rating-device-only-if-it-s-cpu-local-device.patch deleted file mode 100644 index bd5fd2466dd..00000000000 --- a/queue-4.4/tick-prefer-a-lower-rating-device-only-if-it-s-cpu-local-device.patch +++ /dev/null @@ -1,40 +0,0 @@ -From foo@baz Sat Jul 28 12:10:33 CEST 2018 -From: Sudeep Holla -Date: Wed, 9 May 2018 17:02:08 +0100 -Subject: tick: Prefer a lower rating device only if it's CPU local device - -From: Sudeep Holla - -[ Upstream commit 1332a90558013ae4242e3dd7934bdcdeafb06c0d ] - -Checking the equality of cpumask for both new and old tick device doesn't -ensure that it's CPU local device. This will cause issue if a low rating -clockevent tick device is registered first followed by the registration -of higher rating clockevent tick device. - -In such case, clockevents_released list will never get emptied as both -the devices get selected as preferred one and we will loop forever in -clockevents_notify_released. - -Signed-off-by: Sudeep Holla -Signed-off-by: Thomas Gleixner -Cc: Frederic Weisbecker -Link: https://lkml.kernel.org/r/1525881728-4858-1-git-send-email-sudeep.holla@arm.com -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - kernel/time/tick-common.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/kernel/time/tick-common.c -+++ b/kernel/time/tick-common.c -@@ -277,7 +277,8 @@ static bool tick_check_preferred(struct - */ - return !curdev || - newdev->rating > curdev->rating || -- !cpumask_equal(curdev->cpumask, newdev->cpumask); -+ (!cpumask_equal(curdev->cpumask, newdev->cpumask) && -+ !tick_check_percpu(curdev, newdev, smp_processor_id())); - } - - /*