aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/entry_64.S4
-rw-r--r--arch/powerpc/kernel/head_64.S10
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index ec754c92ba94..1a3d4de197d2 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -97,7 +97,9 @@ BEGIN_FW_FTR_SECTION
97 cmpdi cr1,r0,0x5555 /* syscall 0x5555 */ 97 cmpdi cr1,r0,0x5555 /* syscall 0x5555 */
98 andi. r10,r12,MSR_PR /* from kernel */ 98 andi. r10,r12,MSR_PR /* from kernel */
99 crand 4*cr0+eq,4*cr1+eq,4*cr0+eq 99 crand 4*cr0+eq,4*cr1+eq,4*cr0+eq
100 beq hardware_interrupt_entry 100 bne 2f
101 b hardware_interrupt_entry
1022:
101END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES) 103END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
102#endif 104#endif
103 mfmsr r11 105 mfmsr r11
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 8cdff5a1f3e2..71b1fe58e9e4 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -825,7 +825,7 @@ system_reset_iSeries:
825 825
826 cmpwi 0,r23,0 826 cmpwi 0,r23,0
827 beq iSeries_secondary_smp_loop /* Loop until told to go */ 827 beq iSeries_secondary_smp_loop /* Loop until told to go */
828 bne .__secondary_start /* Loop until told to go */ 828 bne __secondary_start /* Loop until told to go */
829iSeries_secondary_smp_loop: 829iSeries_secondary_smp_loop:
830 /* Let the Hypervisor know we are alive */ 830 /* Let the Hypervisor know we are alive */
831 /* 8002 is a call to HvCallCfg::getLps, a harmless Hypervisor function */ 831 /* 8002 is a call to HvCallCfg::getLps, a harmless Hypervisor function */
@@ -846,7 +846,6 @@ iSeries_secondary_smp_loop:
846 b 1b /* If SMP not configured, secondaries 846 b 1b /* If SMP not configured, secondaries
847 * loop forever */ 847 * loop forever */
848 848
849 .globl decrementer_iSeries_masked
850decrementer_iSeries_masked: 849decrementer_iSeries_masked:
851 /* We may not have a valid TOC pointer in here. */ 850 /* We may not have a valid TOC pointer in here. */
852 li r11,1 851 li r11,1
@@ -857,7 +856,6 @@ decrementer_iSeries_masked:
857 mtspr SPRN_DEC,r12 856 mtspr SPRN_DEC,r12
858 /* fall through */ 857 /* fall through */
859 858
860 .globl hardware_interrupt_iSeries_masked
861hardware_interrupt_iSeries_masked: 859hardware_interrupt_iSeries_masked:
862 mtcrf 0x80,r9 /* Restore regs */ 860 mtcrf 0x80,r9 /* Restore regs */
863 ld r12,PACALPPACAPTR(r13) 861 ld r12,PACALPPACAPTR(r13)
@@ -1604,7 +1602,7 @@ _GLOBAL(generic_secondary_smp_init)
1604 ld r1,PACAEMERGSP(r13) 1602 ld r1,PACAEMERGSP(r13)
1605 subi r1,r1,STACK_FRAME_OVERHEAD 1603 subi r1,r1,STACK_FRAME_OVERHEAD
1606 1604
1607 b .__secondary_start 1605 b __secondary_start
1608#endif 1606#endif
1609 1607
1610#ifdef CONFIG_PPC_ISERIES 1608#ifdef CONFIG_PPC_ISERIES
@@ -1873,7 +1871,7 @@ _GLOBAL(pmac_secondary_start)
1873 ld r1,PACAEMERGSP(r13) 1871 ld r1,PACAEMERGSP(r13)
1874 subi r1,r1,STACK_FRAME_OVERHEAD 1872 subi r1,r1,STACK_FRAME_OVERHEAD
1875 1873
1876 b .__secondary_start 1874 b __secondary_start
1877 1875
1878#endif /* CONFIG_PPC_PMAC */ 1876#endif /* CONFIG_PPC_PMAC */
1879 1877
@@ -1890,7 +1888,7 @@ _GLOBAL(pmac_secondary_start)
1890 * r13 = paca virtual address 1888 * r13 = paca virtual address
1891 * SPRG3 = paca virtual address 1889 * SPRG3 = paca virtual address
1892 */ 1890 */
1893_GLOBAL(__secondary_start) 1891__secondary_start:
1894 /* Set thread priority to MEDIUM */ 1892 /* Set thread priority to MEDIUM */
1895 HMT_MEDIUM 1893 HMT_MEDIUM
1896 1894