From: Greg Kroah-Hartman Date: Sun, 16 Jun 2019 15:24:17 +0000 (+0200) Subject: drop 4.4 uml patch X-Git-Tag: v5.1.11~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=32148a30e23ddc5fccabf1be889aef82a103a531;p=thirdparty%2Fkernel%2Fstable-queue.git drop 4.4 uml patch --- diff --git a/queue-4.4/series b/queue-4.4/series index 57daa5bb526..38f44942535 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -12,7 +12,6 @@ drm-bridge-adv7511-fix-low-refresh-rate-selection.patch ntp-allow-tai-utc-offset-to-be-set-to-zero.patch f2fs-fix-to-avoid-panic-in-do_recover_data.patch f2fs-fix-to-do-sanity-check-on-valid-block-count-of-.patch -uml-fix-a-boot-splat-wrt-use-of-cpu_all_mask.patch iommu-vt-d-set-intel_iommu_gfx_mapped-correctly.patch alsa-hda-register-irq-handler-after-the-chip-initial.patch nvmem-core-fix-read-buffer-in-place.patch diff --git a/queue-4.4/uml-fix-a-boot-splat-wrt-use-of-cpu_all_mask.patch b/queue-4.4/uml-fix-a-boot-splat-wrt-use-of-cpu_all_mask.patch deleted file mode 100644 index 9bef2d62fad..00000000000 --- a/queue-4.4/uml-fix-a-boot-splat-wrt-use-of-cpu_all_mask.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 6d5f60012c11dbb218c0f4aed31525df59a2c31f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= -Date: Wed, 10 Apr 2019 11:11:23 -0700 -Subject: uml: fix a boot splat wrt use of cpu_all_mask -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -[ Upstream commit 689a58605b63173acb0a8cf954af6a8f60440c93 ] - -Memory: 509108K/542612K available (3835K kernel code, 919K rwdata, 1028K rodata, 129K init, 211K bss, 33504K reserved, 0K cma-reserved) -NR_IRQS: 15 -clocksource: timer: mask: 0xffffffffffffffff max_cycles: 0x1cd42e205, max_idle_ns: 881590404426 ns -------------[ cut here ]------------ -WARNING: CPU: 0 PID: 0 at kernel/time/clockevents.c:458 clockevents_register_device+0x72/0x140 -posix-timer cpumask == cpu_all_mask, using cpu_possible_mask instead -Modules linked in: -CPU: 0 PID: 0 Comm: swapper Not tainted 5.1.0-rc4-00048-ged79cc87302b #4 -Stack: - 604ebda0 603c5370 604ebe20 6046fd17 - 00000000 6006fcbb 604ebdb0 603c53b5 - 604ebe10 6003bfc4 604ebdd0 9000001ca -Call Trace: - [<6006fcbb>] ? printk+0x0/0x94 - [<60083160>] ? clockevents_register_device+0x72/0x140 - [<6001f16e>] show_stack+0x13b/0x155 - [<603c5370>] ? dump_stack_print_info+0xe2/0xeb - [<6006fcbb>] ? printk+0x0/0x94 - [<603c53b5>] dump_stack+0x2a/0x2c - [<6003bfc4>] __warn+0x10e/0x13e - [<60070320>] ? vprintk_func+0xc8/0xcf - [<60030fd6>] ? block_signals+0x0/0x16 - [<6006fcbb>] ? printk+0x0/0x94 - [<6003c08b>] warn_slowpath_fmt+0x97/0x99 - [<600311a1>] ? set_signals+0x0/0x3f - [<6003bff4>] ? warn_slowpath_fmt+0x0/0x99 - [<600842cb>] ? tick_oneshot_mode_active+0x44/0x4f - [<60030fd6>] ? block_signals+0x0/0x16 - [<6006fcbb>] ? printk+0x0/0x94 - [<6007d2d5>] ? __clocksource_select+0x20/0x1b1 - [<60030fd6>] ? block_signals+0x0/0x16 - [<6006fcbb>] ? printk+0x0/0x94 - [<60083160>] clockevents_register_device+0x72/0x140 - [<60031192>] ? get_signals+0x0/0xf - [<60030fd6>] ? block_signals+0x0/0x16 - [<6006fcbb>] ? printk+0x0/0x94 - [<60002eec>] um_timer_setup+0xc8/0xca - [<60001b59>] start_kernel+0x47f/0x57e - [<600035bc>] start_kernel_proc+0x49/0x4d - [<6006c483>] ? kmsg_dump_register+0x82/0x8a - [<6001de62>] new_thread_handler+0x81/0xb2 - [<60003571>] ? kmsg_dumper_stdout_init+0x1a/0x1c - [<60020c75>] uml_finishsetup+0x54/0x59 - -random: get_random_bytes called from init_oops_id+0x27/0x34 with crng_init=0 ----[ end trace 00173d0117a88acb ]--- -Calibrating delay loop... 6941.90 BogoMIPS (lpj=34709504) - -Signed-off-by: Maciej Żenczykowski -Cc: Jeff Dike -Cc: Richard Weinberger -Cc: Anton Ivanov -Cc: linux-um@lists.infradead.org -Cc: linux-kernel@vger.kernel.org - -Signed-off-by: Richard Weinberger -Signed-off-by: Sasha Levin ---- - arch/um/kernel/time.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c -index 25c23666d592..040e3efdc9a6 100644 ---- a/arch/um/kernel/time.c -+++ b/arch/um/kernel/time.c -@@ -56,7 +56,7 @@ static int itimer_one_shot(struct clock_event_device *evt) - static struct clock_event_device timer_clockevent = { - .name = "posix-timer", - .rating = 250, -- .cpumask = cpu_all_mask, -+ .cpumask = cpu_possible_mask, - .features = CLOCK_EVT_FEAT_PERIODIC | - CLOCK_EVT_FEAT_ONESHOT, - .set_state_shutdown = itimer_shutdown, --- -2.20.1 -