summaryrefslogtreecommitdiffstats
path: root/drivers/video/fbdev/geode/video_gx.c
diff options
context:
space:
mode:
authorJia Zhang <qianyue.zj@alibaba-inc.com>2018-01-01 09:52:10 +0800
committerBen Hutchings <ben@decadent.org.uk>2020-06-11 19:05:55 +0100
commit582f3009d4511bdd12a4d88ae52da46359cd88aa (patch)
tree265989723b1b6139639c2fe1ac324249ebbe2aac /drivers/video/fbdev/geode/video_gx.c
parent53b7a2eb6f94f439bce973593ce177592d34c63f (diff)
downloadlinux-stable-582f3009d4511bdd12a4d88ae52da46359cd88aa.tar.gz
linux-stable-582f3009d4511bdd12a4d88ae52da46359cd88aa.tar.bz2
linux-stable-582f3009d4511bdd12a4d88ae52da46359cd88aa.zip
x86/cpu: Rename cpu_data.x86_mask to cpu_data.x86_stepping
commit b399151cb48db30ad1e0e93dd40d68c6d007b637 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> [bwh: Backported to 3.16: - Drop changes in arch/x86/lib/cpu.c - Adjust filenames, context] Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/video/fbdev/geode/video_gx.c')
-rw-r--r--drivers/video/fbdev/geode/video_gx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/geode/video_gx.c b/drivers/video/fbdev/geode/video_gx.c
index 6082f653c68a..67773e8bbb95 100644
--- a/drivers/video/fbdev/geode/video_gx.c
+++ b/drivers/video/fbdev/geode/video_gx.c
@@ -127,7 +127,7 @@ void gx_set_dclk_frequency(struct fb_info *info)
int timeout = 1000;
/* Rev. 1 Geode GXs use a 14 MHz reference clock instead of 48 MHz. */
- if (cpu_data(0).x86_mask == 1) {
+ if (cpu_data(0).x86_stepping == 1) {
pll_table = gx_pll_table_14MHz;
pll_table_len = ARRAY_SIZE(gx_pll_table_14MHz);
} else {