Skip to contentSkip to conversation

drivers/hwmon: remove new __cpuinit usage from coretemp.c

PATCH-next Paul Gortmaker 2 participants 2 messages Jan 10, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Commit da9e8c7a7b99b245c464ff45c7bde38a4b510019 ("hwmon: (coretemp) Use PCI host bridge ID to identify CPU if necessary") added a new instance of the __cpuinit macro usage.

We removed this a couple versions ago; we now want to remove the compat no-op stubs. Introducing new users is not what we want to see at this point in time, as it will break once the stubs are gone.

---

[Patch based on today's linux-next tree, so if hwmon next content
gets rebased, then the above commit ID will be invalidated; if it _does_ get rebased, then feel free to squash this fix into the orig.]

 drivers/hwmon/coretemp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/coretemp.c +1 -1
index 6e0579e80538..f44549f7c445 100644
@@ -197,7 +197,7 @@ struct tjmax_pci {
 	int tjmax;
 };
 
-static const struct tjmax_pci tjmax_pci_table[] __cpuinitconst = {
+static const struct tjmax_pci tjmax_pci_table[] = {
 	{ 0x0708, 110000 },	/* CE41x0 (Sodaville ) */
 	{ 0x0c72, 102000 },	/* Atom S1240 (Centerton) */
 	{ 0x0c73, 95000 },	/* Atom S1220 (Centerton) */
Signature · 7 lines
1.8.5.2


_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
maintainer
#1 lore raw
Quoted 9 lines · Paul Gortmaker

Commit da9e8c7a7b99b245c464ff45c7bde38a4b510019 ("hwmon: (coretemp) Use PCI host bridge ID to identify CPU if necessary") added a new instance of the __cpuinit macro usage.

We removed this a couple versions ago; we now want to remove the compat no-op stubs. Introducing new users is not what we want to see at this point in time, as it will break once the stubs are gone.

Quoted 8 lines

---

[Patch based on today's linux-next tree, so if hwmon next content
gets rebased, then the above commit ID will be invalidated; if it _does_ get rebased, then feel free to squash this fix into the orig.]

Hi Paul,

thanks a lot for the fix. I rebased hwmon-next and removed __cpuinitconst from the original commit, so the problem should be gone in the next iteration of linux-next.

Thanks,
Guenter

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors