diff options
author | Anton Blanchard <anton@samba.org> | 2014-05-13 06:48:57 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-06-04 23:21:28 -0400 |
commit | c1931e21816a031a5aff7084e7f10eb84e24d8cc (patch) | |
tree | ba55bcf0b332652379d19e3b5b21e81d7275f9bf /arch/powerpc | |
parent | 2ac7b0166a9bc743893be3f38e7b1729ce975ab9 (diff) |
powerpc/pseries: hcall functions are exported to modules, need _GLOBAL_TOC()
The hcall macros may call out to c code for tracing, so we need
to set up a valid r2. This fixes an oops found when testing
ibmvscsi as a module.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/platforms/pseries/hvCall.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/pseries/hvCall.S b/arch/powerpc/platforms/pseries/hvCall.S index 7891a86066e8..99ecf0a5a929 100644 --- a/arch/powerpc/platforms/pseries/hvCall.S +++ b/arch/powerpc/platforms/pseries/hvCall.S | |||
@@ -106,7 +106,7 @@ END_FTR_SECTION(0, 1); \ | |||
106 | 106 | ||
107 | .text | 107 | .text |
108 | 108 | ||
109 | _GLOBAL(plpar_hcall_norets) | 109 | _GLOBAL_TOC(plpar_hcall_norets) |
110 | HMT_MEDIUM | 110 | HMT_MEDIUM |
111 | 111 | ||
112 | mfcr r0 | 112 | mfcr r0 |
@@ -122,7 +122,7 @@ _GLOBAL(plpar_hcall_norets) | |||
122 | mtcrf 0xff,r0 | 122 | mtcrf 0xff,r0 |
123 | blr /* return r3 = status */ | 123 | blr /* return r3 = status */ |
124 | 124 | ||
125 | _GLOBAL(plpar_hcall) | 125 | _GLOBAL_TOC(plpar_hcall) |
126 | HMT_MEDIUM | 126 | HMT_MEDIUM |
127 | 127 | ||
128 | mfcr r0 | 128 | mfcr r0 |
@@ -188,7 +188,7 @@ _GLOBAL(plpar_hcall_raw) | |||
188 | 188 | ||
189 | blr /* return r3 = status */ | 189 | blr /* return r3 = status */ |
190 | 190 | ||
191 | _GLOBAL(plpar_hcall9) | 191 | _GLOBAL_TOC(plpar_hcall9) |
192 | HMT_MEDIUM | 192 | HMT_MEDIUM |
193 | 193 | ||
194 | mfcr r0 | 194 | mfcr r0 |