lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc/fsl-booke: Use SPRN_SPRGn rather than mfsprg/mtsprg

Browse Source 
This fixes a build break that was probably introduced with the removal
of -Wa,-me500 (commit f49596a4cf), where
the assembler refuses to recognize SPRG4-7 with a generic PPC target.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Cc: Dongsheng Wang <dongsheng.wang@freescale.com>
Cc: Anton Vorontsov <avorontsov@mvista.com>
Reviewed-by: Wang Dongsheng <dongsheng.wang@freescale.com>
Tested-by: Wang Dongsheng <dongsheng.wang@freescale.com>
This commit is contained in:
Scott Wood
2014-01-02 16:37:50 -06:00
parent 455d23a890
commit b58a7bd6df
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
arch/powerpc/kernel/swsusp_booke.S
View File

@@ -74,21 +74,21 @@ _GLOBAL(swsusp_arch_suspend)
bne 1b bne 1b
/* Save SPRGs */ /* Save SPRGs */
mfsprg r4,0 mfspr r4,SPRN_SPRG0
stw r4,SL_SPRG0(r11) stw r4,SL_SPRG0(r11)
mfsprg r4,1 mfspr r4,SPRN_SPRG1
stw r4,SL_SPRG1(r11) stw r4,SL_SPRG1(r11)
mfsprg r4,2 mfspr r4,SPRN_SPRG2
stw r4,SL_SPRG2(r11) stw r4,SL_SPRG2(r11)
mfsprg r4,3 mfspr r4,SPRN_SPRG3
stw r4,SL_SPRG3(r11) stw r4,SL_SPRG3(r11)
mfsprg r4,4 mfspr r4,SPRN_SPRG4
stw r4,SL_SPRG4(r11) stw r4,SL_SPRG4(r11)
mfsprg r4,5 mfspr r4,SPRN_SPRG5
stw r4,SL_SPRG5(r11) stw r4,SL_SPRG5(r11)
mfsprg r4,6 mfspr r4,SPRN_SPRG6
stw r4,SL_SPRG6(r11) stw r4,SL_SPRG6(r11)
mfsprg r4,7 mfspr r4,SPRN_SPRG7
stw r4,SL_SPRG7(r11) stw r4,SL_SPRG7(r11)
/* Call the low level suspend stuff (we should probably have made /* Call the low level suspend stuff (we should probably have made
@@ -150,21 +150,21 @@ _GLOBAL(swsusp_arch_resume)
bl _tlbil_all bl _tlbil_all
lwz r4,SL_SPRG0(r11) lwz r4,SL_SPRG0(r11)
mtsprg 0,r4 mtspr SPRN_SPRG0,r4
lwz r4,SL_SPRG1(r11) lwz r4,SL_SPRG1(r11)
mtsprg 1,r4 mtspr SPRN_SPRG1,r4
lwz r4,SL_SPRG2(r11) lwz r4,SL_SPRG2(r11)
mtsprg 2,r4 mtspr SPRN_SPRG2,r4
lwz r4,SL_SPRG3(r11) lwz r4,SL_SPRG3(r11)
mtsprg 3,r4 mtspr SPRN_SPRG3,r4
lwz r4,SL_SPRG4(r11) lwz r4,SL_SPRG4(r11)
mtsprg 4,r4 mtspr SPRN_SPRG4,r4
lwz r4,SL_SPRG5(r11) lwz r4,SL_SPRG5(r11)
mtsprg 5,r4 mtspr SPRN_SPRG5,r4
lwz r4,SL_SPRG6(r11) lwz r4,SL_SPRG6(r11)
mtsprg 6,r4 mtspr SPRN_SPRG6,r4
lwz r4,SL_SPRG7(r11) lwz r4,SL_SPRG7(r11)
mtsprg 7,r4 mtspr SPRN_SPRG7,r4
/* restore the MSR */ /* restore the MSR */
lwz r3,SL_MSR(r11) lwz r3,SL_MSR(r11)