diff options
Diffstat (limited to 'arch/ppc/kernel/misc.S')
-rw-r--r-- | arch/ppc/kernel/misc.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/ppc/kernel/misc.S b/arch/ppc/kernel/misc.S index d319f9ba2379..0da55368655c 100644 --- a/arch/ppc/kernel/misc.S +++ b/arch/ppc/kernel/misc.S | |||
@@ -328,7 +328,7 @@ BEGIN_FTR_SECTION | |||
328 | mtspr SPRN_L1CSR0,r3 | 328 | mtspr SPRN_L1CSR0,r3 |
329 | isync | 329 | isync |
330 | blr | 330 | blr |
331 | END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE) | 331 | END_FTR_SECTION_IFSET(CPU_FTR_UNIFIED_ID_CACHE) |
332 | mfspr r3,SPRN_L1CSR1 | 332 | mfspr r3,SPRN_L1CSR1 |
333 | ori r3,r3,L1CSR1_ICFI|L1CSR1_ICLFR | 333 | ori r3,r3,L1CSR1_ICFI|L1CSR1_ICLFR |
334 | mtspr SPRN_L1CSR1,r3 | 334 | mtspr SPRN_L1CSR1,r3 |
@@ -355,7 +355,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE) | |||
355 | _GLOBAL(__flush_icache_range) | 355 | _GLOBAL(__flush_icache_range) |
356 | BEGIN_FTR_SECTION | 356 | BEGIN_FTR_SECTION |
357 | blr /* for 601, do nothing */ | 357 | blr /* for 601, do nothing */ |
358 | END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE) | 358 | END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_ICACHE) |
359 | li r5,L1_CACHE_BYTES-1 | 359 | li r5,L1_CACHE_BYTES-1 |
360 | andc r3,r3,r5 | 360 | andc r3,r3,r5 |
361 | subf r4,r3,r4 | 361 | subf r4,r3,r4 |
@@ -472,7 +472,7 @@ _GLOBAL(flush_dcache_all) | |||
472 | _GLOBAL(__flush_dcache_icache) | 472 | _GLOBAL(__flush_dcache_icache) |
473 | BEGIN_FTR_SECTION | 473 | BEGIN_FTR_SECTION |
474 | blr /* for 601, do nothing */ | 474 | blr /* for 601, do nothing */ |
475 | END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE) | 475 | END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_ICACHE) |
476 | rlwinm r3,r3,0,0,19 /* Get page base address */ | 476 | rlwinm r3,r3,0,0,19 /* Get page base address */ |
477 | li r4,4096/L1_CACHE_BYTES /* Number of lines in a page */ | 477 | li r4,4096/L1_CACHE_BYTES /* Number of lines in a page */ |
478 | mtctr r4 | 478 | mtctr r4 |
@@ -500,7 +500,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE) | |||
500 | _GLOBAL(__flush_dcache_icache_phys) | 500 | _GLOBAL(__flush_dcache_icache_phys) |
501 | BEGIN_FTR_SECTION | 501 | BEGIN_FTR_SECTION |
502 | blr /* for 601, do nothing */ | 502 | blr /* for 601, do nothing */ |
503 | END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE) | 503 | END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_ICACHE) |
504 | mfmsr r10 | 504 | mfmsr r10 |
505 | rlwinm r0,r10,0,28,26 /* clear DR */ | 505 | rlwinm r0,r10,0,28,26 /* clear DR */ |
506 | mtmsr r0 | 506 | mtmsr r0 |