File tree Expand file tree Collapse file tree 3 files changed +8
-20
lines changed Expand file tree Collapse file tree 3 files changed +8
-20
lines changed Original file line number Diff line number Diff line change @@ -257,6 +257,7 @@ extern int rbv_present,via_alt_mapping;
257
257
258
258
struct irq_desc ;
259
259
260
+ extern void via_l2_flush (int writeback );
260
261
extern void via_register_interrupts (void );
261
262
extern void via_irq_enable (int );
262
263
extern void via_irq_disable (int );
Original file line number Diff line number Diff line change @@ -59,7 +59,6 @@ extern void iop_preinit(void);
59
59
extern void iop_init (void );
60
60
extern void via_init (void );
61
61
extern void via_init_clock (irq_handler_t func );
62
- extern void via_flush_cache (void );
63
62
extern void oss_init (void );
64
63
extern void psc_init (void );
65
64
extern void baboon_init (void );
@@ -130,21 +129,6 @@ int __init mac_parse_bootinfo(const struct bi_record *record)
130
129
return unknown ;
131
130
}
132
131
133
- /*
134
- * Flip into 24bit mode for an instant - flushes the L2 cache card. We
135
- * have to disable interrupts for this. Our IRQ handlers will crap
136
- * themselves if they take an IRQ in 24bit mode!
137
- */
138
-
139
- static void mac_cache_card_flush (int writeback )
140
- {
141
- unsigned long flags ;
142
-
143
- local_irq_save (flags );
144
- via_flush_cache ();
145
- local_irq_restore (flags );
146
- }
147
-
148
132
void __init config_mac (void )
149
133
{
150
134
if (!MACH_IS_MAC )
@@ -175,9 +159,8 @@ void __init config_mac(void)
175
159
* not.
176
160
*/
177
161
178
- if (macintosh_config -> ident == MAC_MODEL_IICI
179
- || macintosh_config -> ident == MAC_MODEL_IIFX )
180
- mach_l2_flush = mac_cache_card_flush ;
162
+ if (macintosh_config -> ident == MAC_MODEL_IICI )
163
+ mach_l2_flush = via_l2_flush ;
181
164
}
182
165
183
166
Original file line number Diff line number Diff line change @@ -294,10 +294,14 @@ void via_debug_dump(void)
294
294
* the system into 24-bit mode for an instant.
295
295
*/
296
296
297
- void via_flush_cache ( void )
297
+ void via_l2_flush ( int writeback )
298
298
{
299
+ unsigned long flags ;
300
+
301
+ local_irq_save (flags );
299
302
via2 [gBufB ] &= ~VIA2B_vMode32 ;
300
303
via2 [gBufB ] |= VIA2B_vMode32 ;
304
+ local_irq_restore (flags );
301
305
}
302
306
303
307
/*
You can’t perform that action at this time.
0 commit comments