]>
Commit | Line | Data |
---|---|---|
bb104d9e SL |
1 | From 11c08d673a10a2fd65345af4f1a8ae588e2fd2fc Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com> | |
3 | Date: Wed, 10 Apr 2019 11:11:23 -0700 | |
4 | Subject: uml: fix a boot splat wrt use of cpu_all_mask | |
5 | MIME-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ||
9 | [ Upstream commit 689a58605b63173acb0a8cf954af6a8f60440c93 ] | |
10 | ||
11 | Memory: 509108K/542612K available (3835K kernel code, 919K rwdata, 1028K rodata, 129K init, 211K bss, 33504K reserved, 0K cma-reserved) | |
12 | NR_IRQS: 15 | |
13 | clocksource: timer: mask: 0xffffffffffffffff max_cycles: 0x1cd42e205, max_idle_ns: 881590404426 ns | |
14 | ------------[ cut here ]------------ | |
15 | WARNING: CPU: 0 PID: 0 at kernel/time/clockevents.c:458 clockevents_register_device+0x72/0x140 | |
16 | posix-timer cpumask == cpu_all_mask, using cpu_possible_mask instead | |
17 | Modules linked in: | |
18 | CPU: 0 PID: 0 Comm: swapper Not tainted 5.1.0-rc4-00048-ged79cc87302b #4 | |
19 | Stack: | |
20 | 604ebda0 603c5370 604ebe20 6046fd17 | |
21 | 00000000 6006fcbb 604ebdb0 603c53b5 | |
22 | 604ebe10 6003bfc4 604ebdd0 9000001ca | |
23 | Call Trace: | |
24 | [<6006fcbb>] ? printk+0x0/0x94 | |
25 | [<60083160>] ? clockevents_register_device+0x72/0x140 | |
26 | [<6001f16e>] show_stack+0x13b/0x155 | |
27 | [<603c5370>] ? dump_stack_print_info+0xe2/0xeb | |
28 | [<6006fcbb>] ? printk+0x0/0x94 | |
29 | [<603c53b5>] dump_stack+0x2a/0x2c | |
30 | [<6003bfc4>] __warn+0x10e/0x13e | |
31 | [<60070320>] ? vprintk_func+0xc8/0xcf | |
32 | [<60030fd6>] ? block_signals+0x0/0x16 | |
33 | [<6006fcbb>] ? printk+0x0/0x94 | |
34 | [<6003c08b>] warn_slowpath_fmt+0x97/0x99 | |
35 | [<600311a1>] ? set_signals+0x0/0x3f | |
36 | [<6003bff4>] ? warn_slowpath_fmt+0x0/0x99 | |
37 | [<600842cb>] ? tick_oneshot_mode_active+0x44/0x4f | |
38 | [<60030fd6>] ? block_signals+0x0/0x16 | |
39 | [<6006fcbb>] ? printk+0x0/0x94 | |
40 | [<6007d2d5>] ? __clocksource_select+0x20/0x1b1 | |
41 | [<60030fd6>] ? block_signals+0x0/0x16 | |
42 | [<6006fcbb>] ? printk+0x0/0x94 | |
43 | [<60083160>] clockevents_register_device+0x72/0x140 | |
44 | [<60031192>] ? get_signals+0x0/0xf | |
45 | [<60030fd6>] ? block_signals+0x0/0x16 | |
46 | [<6006fcbb>] ? printk+0x0/0x94 | |
47 | [<60002eec>] um_timer_setup+0xc8/0xca | |
48 | [<60001b59>] start_kernel+0x47f/0x57e | |
49 | [<600035bc>] start_kernel_proc+0x49/0x4d | |
50 | [<6006c483>] ? kmsg_dump_register+0x82/0x8a | |
51 | [<6001de62>] new_thread_handler+0x81/0xb2 | |
52 | [<60003571>] ? kmsg_dumper_stdout_init+0x1a/0x1c | |
53 | [<60020c75>] uml_finishsetup+0x54/0x59 | |
54 | ||
55 | random: get_random_bytes called from init_oops_id+0x27/0x34 with crng_init=0 | |
56 | ---[ end trace 00173d0117a88acb ]--- | |
57 | Calibrating delay loop... 6941.90 BogoMIPS (lpj=34709504) | |
58 | ||
59 | Signed-off-by: Maciej Żenczykowski <maze@google.com> | |
60 | Cc: Jeff Dike <jdike@addtoit.com> | |
61 | Cc: Richard Weinberger <richard@nod.at> | |
62 | Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com> | |
63 | Cc: linux-um@lists.infradead.org | |
64 | Cc: linux-kernel@vger.kernel.org | |
65 | ||
66 | Signed-off-by: Richard Weinberger <richard@nod.at> | |
67 | Signed-off-by: Sasha Levin <sashal@kernel.org> | |
68 | --- | |
69 | arch/um/kernel/time.c | 2 +- | |
70 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
71 | ||
72 | diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c | |
73 | index 25c23666d592..040e3efdc9a6 100644 | |
74 | --- a/arch/um/kernel/time.c | |
75 | +++ b/arch/um/kernel/time.c | |
76 | @@ -56,7 +56,7 @@ static int itimer_one_shot(struct clock_event_device *evt) | |
77 | static struct clock_event_device timer_clockevent = { | |
78 | .name = "posix-timer", | |
79 | .rating = 250, | |
80 | - .cpumask = cpu_all_mask, | |
81 | + .cpumask = cpu_possible_mask, | |
82 | .features = CLOCK_EVT_FEAT_PERIODIC | | |
83 | CLOCK_EVT_FEAT_ONESHOT, | |
84 | .set_state_shutdown = itimer_shutdown, | |
85 | -- | |
86 | 2.20.1 | |
87 |