integrate cfgperl changes#6293..6324 into mainline

p4raw-link: @6324 on //depot/cfgperl: 81bf48a6dbba4b295dfa172a17ca70b654dbf225
p4raw-link: @6293 on //depot/cfgperl: 6e37ea6052902cde1aeb08a2129ffc7c8ea53736

p4raw-id: //depot/perl@6369
p4raw-branched: from //depot/cfgperl@6368 'branch in' lib/Win32.pod
	lib/lib_pm.PL
p4raw-deleted: from //depot/cfgperl@6368 'delete in' pod/Win32.pod
	(@5937..) pod/buildtoc (@6091..) lib/lib.pm.PL (@6227..)
	pod/Makefile (@6232..)
p4raw-integrated: from //depot/cfgperl@6368 'copy in' thread.h
	(@5656..) lib/warnings/register.pm (@5704..) ext/B/B/Stash.pm
	(@5972..) lib/CGI/Util.pm (@6034..) util.c (@6217..) gv.c
	(@6244..) pp.c (@6260..) doop.c (@6269..) pod/perlfunc.pod
	(@6277..) pp_ctl.c (@6293..) makedef.pl (@6301..) embed.h
	global.sym objXSUB.h perlapi.c proto.h (@6305..) win32/Makefile
	(@6307..) Makefile.SH (@6309..) t/op/method.t (@6312..) sv.h
	(@6315..) 'ignore' op.c (@6273..) 'merge in' embed.pl
	win32/win32.c (@6305..)
p4raw-integrated: from //depot/cfgperl@6324 'merge in' toke.c (@6307..)
p4raw-branched: from //depot/cfgperl@6323 'branch in' pod/buildtoc.PL
	(@6319..)
p4raw-integrated: from //depot/cfgperl@6323 'copy in' pod/perl.pod
	(@6319..) pod/perltoc.pod (@6322..) 'merge in' MANIFEST
	(@6319..)
p4raw-branched: from //depot/cfgperl@6319 'branch in' pod/Makefile.SH
p4raw-integrated: from //depot/cfgperl@6315 'ignore' pp_hot.c (@6313..)
p4raw-integrated: from //depot/cfgperl@6311 'copy in'
	ext/POSIX/POSIX.pod (@6296..)
p4raw-integrated: from //depot/cfgperl@6307 'merge in' doio.c (@6223..)

1 files changed, 2 insertions, 2 deletions

diff --git a/gv.c b/gv.c
index e24fc45206..f18f174d6e 100644
--- a/gv.c
+++ b/gv.c
@@ -438,14 +438,14 @@ Perl_gv_autoload4(pTHX_ HV *stash, const char *name, STRLEN len, I32 method)
     ENTER;
 
 #ifdef USE_THREADS
-    Perl_lock(aTHX_ (SV *)varstash);
+    sv_lock((SV *)varstash);
 #endif
     if (!isGV(vargv))
 	gv_init(vargv, varstash, autoload, autolen, FALSE);
     LEAVE;
     varsv = GvSV(vargv);
 #ifdef USE_THREADS
-    Perl_lock(aTHX_ varsv);
+    sv_lock(varsv);
 #endif
     sv_setpv(varsv, HvNAME(stash));
     sv_catpvn(varsv, "::", 2);