diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2008-12-01 15:38:32 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2008-12-03 09:19:19 -0500 |
| commit | 06b90969a7564fad888f67e9f7f4c3a51a16ef1d (patch) | |
| tree | 9dce23b19176f65e4e3a6d0cf660076c7e524880 /arch/powerpc/kernel/head_fsl_booke.S | |
| parent | b3898895355f73973eb3aef3489e999d3fb8e2bc (diff) | |
powerpc/85xx: minor head_fsl_booke.S cleanup
Removed unused branch labels
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/head_fsl_booke.S')
| -rw-r--r-- | arch/powerpc/kernel/head_fsl_booke.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S index 8942d7a82faf..2b5760580254 100644 --- a/arch/powerpc/kernel/head_fsl_booke.S +++ b/arch/powerpc/kernel/head_fsl_booke.S | |||
| @@ -751,7 +751,7 @@ finish_tlb_load: | |||
| 751 | iseleq r12, r12, r10 | 751 | iseleq r12, r12, r10 |
| 752 | 752 | ||
| 753 | #ifdef CONFIG_PTE_64BIT | 753 | #ifdef CONFIG_PTE_64BIT |
| 754 | 2: rlwimi r12, r13, 24, 0, 7 /* grab RPN[32:39] */ | 754 | rlwimi r12, r13, 24, 0, 7 /* grab RPN[32:39] */ |
| 755 | rlwimi r12, r11, 24, 8, 19 /* grab RPN[40:51] */ | 755 | rlwimi r12, r11, 24, 8, 19 /* grab RPN[40:51] */ |
| 756 | mtspr SPRN_MAS3, r12 | 756 | mtspr SPRN_MAS3, r12 |
| 757 | BEGIN_FTR_SECTION | 757 | BEGIN_FTR_SECTION |
| @@ -759,7 +759,7 @@ BEGIN_FTR_SECTION | |||
| 759 | mtspr SPRN_MAS7, r10 | 759 | mtspr SPRN_MAS7, r10 |
| 760 | END_FTR_SECTION_IFSET(CPU_FTR_BIG_PHYS) | 760 | END_FTR_SECTION_IFSET(CPU_FTR_BIG_PHYS) |
| 761 | #else | 761 | #else |
| 762 | 2: rlwimi r11, r12, 0, 20, 31 /* Extract RPN from PTE and merge with perms */ | 762 | rlwimi r11, r12, 0, 20, 31 /* Extract RPN from PTE and merge with perms */ |
| 763 | mtspr SPRN_MAS3, r11 | 763 | mtspr SPRN_MAS3, r11 |
| 764 | #endif | 764 | #endif |
| 765 | #ifdef CONFIG_E200 | 765 | #ifdef CONFIG_E200 |