]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob - releases/4.14.113/thermal-intel_powerclamp-fix-__percpu-declaration-of.patch
Linux 4.14.113
[thirdparty/kernel/stable-queue.git] / releases / 4.14.113 / thermal-intel_powerclamp-fix-__percpu-declaration-of.patch
1 From 3d0d8c2dd0c2f0c96a255e8c332f443ad89481b3 Mon Sep 17 00:00:00 2001
2 From: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
3 Date: Sat, 19 Jan 2019 17:15:23 +0100
4 Subject: thermal/intel_powerclamp: fix __percpu declaration of worker_data
5
6 [ Upstream commit aa36e3616532f82a920b5ebf4e059fbafae63d88 ]
7
8 This variable is declared as:
9 static struct powerclamp_worker_data * __percpu worker_data;
10 In other words, a percpu pointer to struct ...
11
12 But this variable not used like so but as a pointer to a percpu
13 struct powerclamp_worker_data.
14
15 So fix the declaration as:
16 static struct powerclamp_worker_data __percpu *worker_data;
17
18 This also quiets Sparse's warnings from __verify_pcpu_ptr(), like:
19 494:49: warning: incorrect type in initializer (different address spaces)
20 494:49: expected void const [noderef] <asn:3> *__vpp_verify
21 494:49: got struct powerclamp_worker_data *
22
23 Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
24 Reviewed-by: Petr Mladek <pmladek@suse.com>
25 Signed-off-by: Zhang Rui <rui.zhang@intel.com>
26 Signed-off-by: Sasha Levin <sashal@kernel.org>
27 ---
28 drivers/thermal/intel_powerclamp.c | 2 +-
29 1 file changed, 1 insertion(+), 1 deletion(-)
30
31 diff --git a/drivers/thermal/intel_powerclamp.c b/drivers/thermal/intel_powerclamp.c
32 index d718cd179ddb..45d9840491bd 100644
33 --- a/drivers/thermal/intel_powerclamp.c
34 +++ b/drivers/thermal/intel_powerclamp.c
35 @@ -101,7 +101,7 @@ struct powerclamp_worker_data {
36 bool clamping;
37 };
38
39 -static struct powerclamp_worker_data * __percpu worker_data;
40 +static struct powerclamp_worker_data __percpu *worker_data;
41 static struct thermal_cooling_device *cooling_dev;
42 static unsigned long *cpu_clamping_mask; /* bit map for tracking per cpu
43 * clamping kthread worker
44 --
45 2.19.1
46