Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f4f09b4 authored by Jean Delvare's avatar Jean Delvare
Browse files

hwmon: (coretemp) Properly label the sensors 



Don't assume that CPU entry number and core ID always match. It
worked in the simple cases (single CPU, no HT) but fails on
multi-CPU systems.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Acked-by: default avatarHuaxu Wan <huaxu.wan@intel.com>
Cc: stable@kernel.org
parent d883b9f0

drivers/hwmon/coretemp.c

+5 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ struct coretemp_data { 
	struct mutex update_lock;

	const char *name;

	u32 id;

	u16 core_id;

	char valid;		/* zero until following fields are valid */

	unsigned long last_updated;	/* in jiffies */

	int temp;
@@ -75,7 +76,7 @@ static ssize_t show_name(struct device *dev, struct device_attribute 
	if (attr->index == SHOW_NAME)

		ret = sprintf(buf, "%s\n", data->name);

	else	/* show label */

		ret = sprintf(buf, "Core %d\n", data->id);

		ret = sprintf(buf, "Core %d\n", data->core_id);

	return ret;

}
@@ -304,6 +305,9 @@ static int __devinit coretemp_probe(struct platform_device *pdev) 
	}



	data->id = pdev->id;

#ifdef CONFIG_SMP

	data->core_id = c->cpu_core_id;

#endif

	data->name = "coretemp";

	mutex_init(&data->update_lock);