git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916...
[safe/jmp/linux-2.6]
/
drivers
/
acpi
/
processor_throttling.c
diff --git
a/drivers/acpi/processor_throttling.c
b/drivers/acpi/processor_throttling.c
index
1c5d7a8
..
29c6f57
100644
(file)
--- a/
drivers/acpi/processor_throttling.c
+++ b/
drivers/acpi/processor_throttling.c
@@
-660,7
+660,7
@@
static int acpi_processor_get_throttling_fadt(struct acpi_processor *pr)
#ifdef CONFIG_X86
static int acpi_throttling_rdmsr(struct acpi_processor *pr,
#ifdef CONFIG_X86
static int acpi_throttling_rdmsr(struct acpi_processor *pr,
-
acpi_integer *
value)
+
u64 *
value)
{
struct cpuinfo_x86 *c;
u64 msr_high, msr_low;
{
struct cpuinfo_x86 *c;
u64 msr_high, msr_low;
@@
-681,13
+681,13
@@
static int acpi_throttling_rdmsr(struct acpi_processor *pr,
rdmsr_safe(MSR_IA32_THERM_CONTROL,
(u32 *)&msr_low , (u32 *) &msr_high);
msr = (msr_high << 32) | msr_low;
rdmsr_safe(MSR_IA32_THERM_CONTROL,
(u32 *)&msr_low , (u32 *) &msr_high);
msr = (msr_high << 32) | msr_low;
- *value = (
acpi_integer
) msr;
+ *value = (
u64
) msr;
ret = 0;
}
return ret;
}
ret = 0;
}
return ret;
}
-static int acpi_throttling_wrmsr(struct acpi_processor *pr,
acpi_integer
value)
+static int acpi_throttling_wrmsr(struct acpi_processor *pr,
u64
value)
{
struct cpuinfo_x86 *c;
unsigned int cpu;
{
struct cpuinfo_x86 *c;
unsigned int cpu;
@@
-711,14
+711,14
@@
static int acpi_throttling_wrmsr(struct acpi_processor *pr, acpi_integer value)
}
#else
static int acpi_throttling_rdmsr(struct acpi_processor *pr,
}
#else
static int acpi_throttling_rdmsr(struct acpi_processor *pr,
-
acpi_integer *
value)
+
u64 *
value)
{
printk(KERN_ERR PREFIX
"HARDWARE addr space,NOT supported yet\n");
return -1;
}
{
printk(KERN_ERR PREFIX
"HARDWARE addr space,NOT supported yet\n");
return -1;
}
-static int acpi_throttling_wrmsr(struct acpi_processor *pr,
acpi_integer
value)
+static int acpi_throttling_wrmsr(struct acpi_processor *pr,
u64
value)
{
printk(KERN_ERR PREFIX
"HARDWARE addr space,NOT supported yet\n");
{
printk(KERN_ERR PREFIX
"HARDWARE addr space,NOT supported yet\n");
@@
-727,7
+727,7
@@
static int acpi_throttling_wrmsr(struct acpi_processor *pr, acpi_integer value)
#endif
static int acpi_read_throttling_status(struct acpi_processor *pr,
#endif
static int acpi_read_throttling_status(struct acpi_processor *pr,
-
acpi_integer
*value)
+
u64
*value)
{
u32 bit_width, bit_offset;
u64 ptc_value;
{
u32 bit_width, bit_offset;
u64 ptc_value;
@@
-746,7
+746,7
@@
static int acpi_read_throttling_status(struct acpi_processor *pr,
address, (u32 *) &ptc_value,
(u32) (bit_width + bit_offset));
ptc_mask = (1 << bit_width) - 1;
address, (u32 *) &ptc_value,
(u32) (bit_width + bit_offset));
ptc_mask = (1 << bit_width) - 1;
- *value = (
acpi_integer
) ((ptc_value >> bit_offset) & ptc_mask);
+ *value = (
u64
) ((ptc_value >> bit_offset) & ptc_mask);
ret = 0;
break;
case ACPI_ADR_SPACE_FIXED_HARDWARE:
ret = 0;
break;
case ACPI_ADR_SPACE_FIXED_HARDWARE:
@@
-760,7
+760,7
@@
static int acpi_read_throttling_status(struct acpi_processor *pr,
}
static int acpi_write_throttling_state(struct acpi_processor *pr,
}
static int acpi_write_throttling_state(struct acpi_processor *pr,
-
acpi_integer
value)
+
u64
value)
{
u32 bit_width, bit_offset;
u64 ptc_value;
{
u32 bit_width, bit_offset;
u64 ptc_value;
@@
-793,7
+793,7
@@
static int acpi_write_throttling_state(struct acpi_processor *pr,
}
static int acpi_get_throttling_state(struct acpi_processor *pr,
}
static int acpi_get_throttling_state(struct acpi_processor *pr,
-
acpi_integer
value)
+
u64
value)
{
int i;
{
int i;
@@
-808,7
+808,7
@@
static int acpi_get_throttling_state(struct acpi_processor *pr,
}
static int acpi_get_throttling_value(struct acpi_processor *pr,
}
static int acpi_get_throttling_value(struct acpi_processor *pr,
- int state,
acpi_integer
*value)
+ int state,
u64
*value)
{
int ret = -1;
{
int ret = -1;
@@
-826,7
+826,7
@@
static int acpi_processor_get_throttling_ptc(struct acpi_processor *pr)
{
int state = 0;
int ret;
{
int state = 0;
int ret;
-
acpi_integer
value;
+
u64
value;
if (!pr)
return -EINVAL;
if (!pr)
return -EINVAL;
@@
-993,7
+993,7
@@
static int acpi_processor_set_throttling_ptc(struct acpi_processor *pr,
int state, bool force)
{
int ret;
int state, bool force)
{
int ret;
-
acpi_integer
value;
+
u64
value;
if (!pr)
return -EINVAL;
if (!pr)
return -EINVAL;
@@
-1133,9
+1133,6
@@
int acpi_processor_get_throttling_info(struct acpi_processor *pr)
int result = 0;
struct acpi_processor_throttling *pthrottling;
int result = 0;
struct acpi_processor_throttling *pthrottling;
- if (!pr)
- return -EINVAL;
-
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
"pblk_address[0x%08x] duty_offset[%d] duty_width[%d]\n",
pr->throttling.address,
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
"pblk_address[0x%08x] duty_offset[%d] duty_width[%d]\n",
pr->throttling.address,