diff options
author | Jia Zhang <qianyue.zj@alibaba-inc.com> | 2018-01-01 09:52:10 +0800 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-02-15 01:15:52 +0100 |
commit | b399151cb48db30ad1e0e93dd40d68c6d007b637 (patch) | |
tree | 91d908a4d004adbef9c7a9563c32d28550bc8abc /drivers/hwmon/k10temp.c | |
parent | 961888b1d76d84efc66a8f5604b06ac12ac2f978 (diff) | |
download | linux-stable-b399151cb48db30ad1e0e93dd40d68c6d007b637.tar.gz linux-stable-b399151cb48db30ad1e0e93dd40d68c6d007b637.tar.bz2 linux-stable-b399151cb48db30ad1e0e93dd40d68c6d007b637.zip |
x86/cpu: Rename cpu_data.x86_mask to cpu_data.x86_stepping
x86_mask is a confusing name which is hard to associate with the
processor's stepping.
Additionally, correct an indent issue in lib/cpu.c.
Signed-off-by: Jia Zhang <qianyue.zj@alibaba-inc.com>
[ Updated it to more recent kernels. ]
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: bp@alien8.de
Cc: tony.luck@intel.com
Link: http://lkml.kernel.org/r/1514771530-70829-1-git-send-email-qianyue.zj@alibaba-inc.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/hwmon/k10temp.c')
-rw-r--r-- | drivers/hwmon/k10temp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c index 0721e175664a..b960015cb073 100644 --- a/drivers/hwmon/k10temp.c +++ b/drivers/hwmon/k10temp.c @@ -226,7 +226,7 @@ static bool has_erratum_319(struct pci_dev *pdev) * and AM3 formats, but that's the best we can do. */ return boot_cpu_data.x86_model < 4 || - (boot_cpu_data.x86_model == 4 && boot_cpu_data.x86_mask <= 2); + (boot_cpu_data.x86_model == 4 && boot_cpu_data.x86_stepping <= 2); } static int k10temp_probe(struct pci_dev *pdev, |