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

Commit cb6f3c15 authored by Ingo Molnar's avatar Ingo Molnar Committed by H. Peter Anvin
Browse files

x86, mce: clean up therm_throt.c 



Make the coding style match that of the rest of the x86 arch code.

[ Impact: cleanup ]

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent bdbfbdd5

arch/x86/kernel/cpu/mcheck/therm_throt.c

+39 −35
Original line number Diff line number Diff line 
/*

 *

 * Thermal throttle event support code (such as syslog messaging and rate

 * limiting) that was factored out from x86_64 (mce_intel.c) and i386 (p4.c).

 *

 * This allows consistent reporting of CPU thermal throttle events.

 *

 * Maintains a counter in /sys that keeps track of the number of thermal
@@ -13,20 +13,21 @@ 
 * Credits: Adapted from Zwane Mwaikambo's original code in mce_intel.c.

 *          Inspired by Ross Biro's and Al Borchers' counter code.

 */



#include <linux/notifier.h>

#include <linux/jiffies.h>

#include <linux/percpu.h>

#include <linux/sysdev.h>

#include <linux/cpu.h>

#include <asm/cpu.h>

#include <linux/notifier.h>

#include <linux/jiffies.h>



#include <asm/therm_throt.h>

#include <asm/cpu.h>



/* How long to wait between reporting thermal events */

#define CHECK_INTERVAL		(300 * HZ)



static DEFINE_PER_CPU(__u64, next_check) = INITIAL_JIFFIES;

static DEFINE_PER_CPU(unsigned long, thermal_throttle_count);



atomic_t therm_throt_en		= ATOMIC_INIT(0);



#ifdef CONFIG_SYSFS
@@ -110,10 +111,11 @@ int therm_throt_process(int curr) 
}



#ifdef CONFIG_SYSFS

/* Add/Remove thermal_throttle interface for CPU device */

/* Add/Remove thermal_throttle interface for CPU device: */

static __cpuinit int thermal_throttle_add_dev(struct sys_device *sys_dev)

{

	return sysfs_create_group(&sys_dev->kobj, &thermal_throttle_attr_group);

	return sysfs_create_group(&sys_dev->kobj,

				  &thermal_throttle_attr_group);

}



static __cpuinit void thermal_throttle_remove_dev(struct sys_device *sys_dev)
@@ -121,11 +123,12 @@ static __cpuinit void thermal_throttle_remove_dev(struct sys_device *sys_dev) 
	sysfs_remove_group(&sys_dev->kobj, &thermal_throttle_attr_group);

}



/* Mutex protecting device creation against CPU hotplug */

/* Mutex protecting device creation against CPU hotplug: */

static DEFINE_MUTEX(therm_cpu_lock);



/* Get notified when a cpu comes on/off. Be hotplug friendly. */

static __cpuinit int thermal_throttle_cpu_callback(struct notifier_block *nfb,

static __cpuinit int

thermal_throttle_cpu_callback(struct notifier_block *nfb,

			      unsigned long action,

			      void *hcpu)

{
@@ -134,6 +137,7 @@ static __cpuinit int thermal_throttle_cpu_callback(struct notifier_block *nfb, 
	int err = 0;



	sys_dev = get_cpu_sysdev(cpu);



	switch (action) {

	case CPU_UP_PREPARE:

	case CPU_UP_PREPARE_FROZEN: