projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes' into next
[linux-2.6-microblaze.git]
/
arch
/
powerpc
/
kernel
/
head_book3s_32.S
diff --git
a/arch/powerpc/kernel/head_book3s_32.S
b/arch/powerpc/kernel/head_book3s_32.S
index
a0dda2a
..
ed25d99
100644
(file)
--- a/
arch/powerpc/kernel/head_book3s_32.S
+++ b/
arch/powerpc/kernel/head_book3s_32.S
@@
-207,7
+207,7
@@
turn_on_mmu:
lis r0,start_here@h
ori r0,r0,start_here@l
mtspr SPRN_SRR0,r0
lis r0,start_here@h
ori r0,r0,start_here@l
mtspr SPRN_SRR0,r0
-
RFI
/* enables MMU */
+
rfi
/* enables MMU */
/*
* We need __secondary_hold as a place to hold the other cpus on
/*
* We need __secondary_hold as a place to hold the other cpus on
@@
-758,13
+758,13
@@
fast_hash_page_return:
mtcr r11
lwz r11, THR11(r10)
mfspr r10, SPRN_SPRG_SCRATCH0
mtcr r11
lwz r11, THR11(r10)
mfspr r10, SPRN_SPRG_SCRATCH0
- RFI
+ rfi
1: /* ISI */
mtcr r11
mfspr r11, SPRN_SPRG_SCRATCH1
mfspr r10, SPRN_SPRG_SCRATCH0
1: /* ISI */
mtcr r11
mfspr r11, SPRN_SPRG_SCRATCH1
mfspr r10, SPRN_SPRG_SCRATCH0
- RFI
+ rfi
stack_overflow:
vmap_stack_overflow_exception
stack_overflow:
vmap_stack_overflow_exception
@@
-899,7
+899,7
@@
__secondary_start:
ori r3,r3,start_secondary@l
mtspr SPRN_SRR0,r3
mtspr SPRN_SRR1,r4
ori r3,r3,start_secondary@l
mtspr SPRN_SRR0,r3
mtspr SPRN_SRR1,r4
- RFI
+ rfi
#endif /* CONFIG_SMP */
#ifdef CONFIG_KVM_BOOK3S_HANDLER
#endif /* CONFIG_SMP */
#ifdef CONFIG_KVM_BOOK3S_HANDLER
@@
-1027,7
+1027,7
@@
start_here:
.align 4
mtspr SPRN_SRR0,r4
mtspr SPRN_SRR1,r3
.align 4
mtspr SPRN_SRR0,r4
mtspr SPRN_SRR1,r3
- RFI
+ rfi
/* Load up the kernel context */
2: bl load_up_mmu
/* Load up the kernel context */
2: bl load_up_mmu
@@
-1051,7
+1051,7
@@
start_here:
ori r3,r3,start_kernel@l
mtspr SPRN_SRR0,r3
mtspr SPRN_SRR1,r4
ori r3,r3,start_kernel@l
mtspr SPRN_SRR0,r3
mtspr SPRN_SRR1,r4
- RFI
+ rfi
/*
* void switch_mmu_context(struct mm_struct *prev, struct mm_struct *next);
/*
* void switch_mmu_context(struct mm_struct *prev, struct mm_struct *next);
@@
-1166,7
+1166,7
@@
_ENTRY(update_bats)
.align 4
mtspr SPRN_SRR0, r4
mtspr SPRN_SRR1, r3
.align 4
mtspr SPRN_SRR0, r4
mtspr SPRN_SRR1, r3
- RFI
+ rfi
1: bl clear_bats
lis r3, BATS@ha
addi r3, r3, BATS@l
1: bl clear_bats
lis r3, BATS@ha
addi r3, r3, BATS@l
@@
-1185,7
+1185,7
@@
END_MMU_FTR_SECTION_IFSET(MMU_FTR_USE_HIGH_BATS)
mtmsr r3
mtspr SPRN_SRR0, r7
mtspr SPRN_SRR1, r6
mtmsr r3
mtspr SPRN_SRR0, r7
mtspr SPRN_SRR1, r6
- RFI
+ rfi
flush_tlbs:
lis r10, 0x40
flush_tlbs:
lis r10, 0x40
@@
-1206,7
+1206,7
@@
mmu_off:
mtspr SPRN_SRR0,r4
mtspr SPRN_SRR1,r3
sync
mtspr SPRN_SRR0,r4
mtspr SPRN_SRR1,r3
sync
- RFI
+ rfi
/* We use one BAT to map up to 256M of RAM at _PAGE_OFFSET */
initial_bats:
/* We use one BAT to map up to 256M of RAM at _PAGE_OFFSET */
initial_bats: