diff options
author | Scott Wood <scottwood@freescale.com> | 2014-01-02 17:37:50 -0500 |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2014-01-07 20:06:03 -0500 |
commit | b58a7bd6df7b61446b833a7c72f8a1f11066e0b0 (patch) | |
tree | d3753682c887b2fc1a56dd58c60944923e05d4ed | |
parent | 455d23a8908319fa7ad450e65e4f09afb45057a7 (diff) |
powerpc/fsl-booke: Use SPRN_SPRGn rather than mfsprg/mtsprg
This fixes a build break that was probably introduced with the removal
of -Wa,-me500 (commit f49596a4cf4753d13951608f24f939a59fdcc653), 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>
-rw-r--r-- | arch/powerpc/kernel/swsusp_booke.S | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/arch/powerpc/kernel/swsusp_booke.S b/arch/powerpc/kernel/swsusp_booke.S index 0f204053e5b5..553c1405ee05 100644 --- a/arch/powerpc/kernel/swsusp_booke.S +++ b/arch/powerpc/kernel/swsusp_booke.S | |||
@@ -74,21 +74,21 @@ _GLOBAL(swsusp_arch_suspend) | |||
74 | bne 1b | 74 | bne 1b |
75 | 75 | ||
76 | /* Save SPRGs */ | 76 | /* Save SPRGs */ |
77 | mfsprg r4,0 | 77 | mfspr r4,SPRN_SPRG0 |
78 | stw r4,SL_SPRG0(r11) | 78 | stw r4,SL_SPRG0(r11) |
79 | mfsprg r4,1 | 79 | mfspr r4,SPRN_SPRG1 |
80 | stw r4,SL_SPRG1(r11) | 80 | stw r4,SL_SPRG1(r11) |
81 | mfsprg r4,2 | 81 | mfspr r4,SPRN_SPRG2 |
82 | stw r4,SL_SPRG2(r11) | 82 | stw r4,SL_SPRG2(r11) |
83 | mfsprg r4,3 | 83 | mfspr r4,SPRN_SPRG3 |
84 | stw r4,SL_SPRG3(r11) | 84 | stw r4,SL_SPRG3(r11) |
85 | mfsprg r4,4 | 85 | mfspr r4,SPRN_SPRG4 |
86 | stw r4,SL_SPRG4(r11) | 86 | stw r4,SL_SPRG4(r11) |
87 | mfsprg r4,5 | 87 | mfspr r4,SPRN_SPRG5 |
88 | stw r4,SL_SPRG5(r11) | 88 | stw r4,SL_SPRG5(r11) |
89 | mfsprg r4,6 | 89 | mfspr r4,SPRN_SPRG6 |
90 | stw r4,SL_SPRG6(r11) | 90 | stw r4,SL_SPRG6(r11) |
91 | mfsprg r4,7 | 91 | mfspr r4,SPRN_SPRG7 |
92 | stw r4,SL_SPRG7(r11) | 92 | stw r4,SL_SPRG7(r11) |
93 | 93 | ||
94 | /* Call the low level suspend stuff (we should probably have made | 94 | /* Call the low level suspend stuff (we should probably have made |
@@ -150,21 +150,21 @@ _GLOBAL(swsusp_arch_resume) | |||
150 | bl _tlbil_all | 150 | bl _tlbil_all |
151 | 151 | ||
152 | lwz r4,SL_SPRG0(r11) | 152 | lwz r4,SL_SPRG0(r11) |
153 | mtsprg 0,r4 | 153 | mtspr SPRN_SPRG0,r4 |
154 | lwz r4,SL_SPRG1(r11) | 154 | lwz r4,SL_SPRG1(r11) |
155 | mtsprg 1,r4 | 155 | mtspr SPRN_SPRG1,r4 |
156 | lwz r4,SL_SPRG2(r11) | 156 | lwz r4,SL_SPRG2(r11) |
157 | mtsprg 2,r4 | 157 | mtspr SPRN_SPRG2,r4 |
158 | lwz r4,SL_SPRG3(r11) | 158 | lwz r4,SL_SPRG3(r11) |
159 | mtsprg 3,r4 | 159 | mtspr SPRN_SPRG3,r4 |
160 | lwz r4,SL_SPRG4(r11) | 160 | lwz r4,SL_SPRG4(r11) |
161 | mtsprg 4,r4 | 161 | mtspr SPRN_SPRG4,r4 |
162 | lwz r4,SL_SPRG5(r11) | 162 | lwz r4,SL_SPRG5(r11) |
163 | mtsprg 5,r4 | 163 | mtspr SPRN_SPRG5,r4 |
164 | lwz r4,SL_SPRG6(r11) | 164 | lwz r4,SL_SPRG6(r11) |
165 | mtsprg 6,r4 | 165 | mtspr SPRN_SPRG6,r4 |
166 | lwz r4,SL_SPRG7(r11) | 166 | lwz r4,SL_SPRG7(r11) |
167 | mtsprg 7,r4 | 167 | mtspr SPRN_SPRG7,r4 |
168 | 168 | ||
169 | /* restore the MSR */ | 169 | /* restore the MSR */ |
170 | lwz r3,SL_MSR(r11) | 170 | lwz r3,SL_MSR(r11) |