powerpc/pseries: hcall functions are exported to modules, need _GLOBAL_TOC()

PATCH New Anton Blanchard 1 participant 1 message May 13, 2014 PowerPC

Share & tools

Anton Blanchard

author

2014-05-13 10:48 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---

arch/powerpc/platforms/pseries/hvCall.S +3 -3

index 7891a86..99ecf0a 100644
@@ -106,7 +106,7 @@ END_FTR_SECTION(0, 1);						\
 
 	.text
 
-_GLOBAL(plpar_hcall_norets)
+_GLOBAL_TOC(plpar_hcall_norets)
 	HMT_MEDIUM
 
 	mfcr	r0

@@ -122,7 +122,7 @@ _GLOBAL(plpar_hcall_norets)
 	mtcrf	0xff,r0
 	blr				/* return r3 = status */
 
-_GLOBAL(plpar_hcall)
+_GLOBAL_TOC(plpar_hcall)
 	HMT_MEDIUM
 
 	mfcr	r0

@@ -188,7 +188,7 @@ _GLOBAL(plpar_hcall_raw)
 
 	blr				/* return r3 = status */
 
-_GLOBAL(plpar_hcall9)
+_GLOBAL_TOC(plpar_hcall9)
 	HMT_MEDIUM
 
 	mfcr	r0