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

Commit 913a9041 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging 

Pull hwmon fixes from Guenter Roeck:
 "Fix OOPS seen in coretemp driver if the CPU core ID is too large"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (coretemp) Increase CPU core limit
  hwmon: (coretemp) fix oops on cpu unplug
parents ac001e76 bdc71c9a

drivers/hwmon/coretemp.c

+5 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ module_param_named(tjmax, force_tjmax, int, 0444); 
MODULE_PARM_DESC(tjmax, "TjMax value in degrees Celsius");



#define BASE_SYSFS_ATTR_NO	2	/* Sysfs Base attr no for coretemp */

#define NUM_REAL_CORES		16	/* Number of Real cores per cpu */

#define NUM_REAL_CORES		32	/* Number of Real cores per cpu */

#define CORETEMP_NAME_LENGTH	17	/* String Length of attrs */

#define MAX_CORE_ATTRS		4	/* Maximum no of basic attrs */

#define TOTAL_ATTRS		(MAX_CORE_ATTRS + 1)
@@ -709,6 +709,10 @@ static void __cpuinit put_core_offline(unsigned int cpu) 


	indx = TO_ATTR_NO(cpu);



	/* The core id is too big, just return */

	if (indx > MAX_CORE_DATA - 1)

		return;



	if (pdata->core_data[indx] && pdata->core_data[indx]->cpu == cpu)

		coretemp_remove_core(pdata, &pdev->dev, indx);