git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
drivers
/
cpufreq
/
amd_freq_sensitivity.c
diff --git
a/drivers/cpufreq/amd_freq_sensitivity.c
b/drivers/cpufreq/amd_freq_sensitivity.c
index 4ac7c3cf34bef93ab2070d1c5f69a7c3a8b0ec25..6927a8c0e748055480b62bbea7f0f1a6165d3693 100644
(file)
--- a/
drivers/cpufreq/amd_freq_sensitivity.c
+++ b/
drivers/cpufreq/amd_freq_sensitivity.c
@@
-124,7
+124,7
@@
static int __init amd_freq_sensitivity_init(void)
PCI_DEVICE_ID_AMD_KERNCZ_SMBUS, NULL);
if (!pcidev) {
- if (!
static
_cpu_has(X86_FEATURE_PROC_FEEDBACK))
+ if (!
boot
_cpu_has(X86_FEATURE_PROC_FEEDBACK))
return -ENODEV;
}