cyrix.c (e5451c8f8330e03ad3cfa16048b4daf961af434f) cyrix.c (c109bf95992b391bb40bc37c5d309d13fead99b5)
1#include <linux/init.h>
2#include <linux/io.h>
3#include <linux/mm.h>
4
5#include <asm/processor-cyrix.h>
6#include <asm/processor-flags.h>
7#include <asm/mtrr.h>
8#include <asm/msr.h>

--- 123 unchanged lines hidden (view full) ---

132
133static u32 cr4, ccr3;
134
135static void prepare_set(void)
136{
137 u32 cr0;
138
139 /* Save value of CR4 and clear Page Global Enable (bit 7) */
1#include <linux/init.h>
2#include <linux/io.h>
3#include <linux/mm.h>
4
5#include <asm/processor-cyrix.h>
6#include <asm/processor-flags.h>
7#include <asm/mtrr.h>
8#include <asm/msr.h>

--- 123 unchanged lines hidden (view full) ---

132
133static u32 cr4, ccr3;
134
135static void prepare_set(void)
136{
137 u32 cr0;
138
139 /* Save value of CR4 and clear Page Global Enable (bit 7) */
140 if (cpu_has_pge) {
140 if (boot_cpu_has(X86_FEATURE_PGE)) {
141 cr4 = __read_cr4();
142 __write_cr4(cr4 & ~X86_CR4_PGE);
143 }
144
145 /*
146 * Disable and flush caches.
147 * Note that wbinvd flushes the TLBs as a side-effect
148 */

--- 16 unchanged lines hidden (view full) ---

165
166 /* Cyrix ARRs - everything else was excluded at the top */
167 setCx86(CX86_CCR3, ccr3);
168
169 /* Enable caches */
170 write_cr0(read_cr0() & ~X86_CR0_CD);
171
172 /* Restore value of CR4 */
141 cr4 = __read_cr4();
142 __write_cr4(cr4 & ~X86_CR4_PGE);
143 }
144
145 /*
146 * Disable and flush caches.
147 * Note that wbinvd flushes the TLBs as a side-effect
148 */

--- 16 unchanged lines hidden (view full) ---

165
166 /* Cyrix ARRs - everything else was excluded at the top */
167 setCx86(CX86_CCR3, ccr3);
168
169 /* Enable caches */
170 write_cr0(read_cr0() & ~X86_CR0_CD);
171
172 /* Restore value of CR4 */
173 if (cpu_has_pge)
173 if (boot_cpu_has(X86_FEATURE_PGE))
174 __write_cr4(cr4);
175}
176
177static void cyrix_set_arr(unsigned int reg, unsigned long base,
178 unsigned long size, mtrr_type type)
179{
180 unsigned char arr, arr_type, arr_size;
181

--- 101 unchanged lines hidden --- 		174 __write_cr4(cr4);
175}
176
177static void cyrix_set_arr(unsigned int reg, unsigned long base,
178 unsigned long size, mtrr_type type)
179{
180 unsigned char arr, arr_type, arr_size;
181

--- 101 unchanged lines hidden ---