--- a/usr/src/cmd/fmthard/fmthard.c	Thu Jul 02 13:26:09 2009 -0400
+++ b/usr/src/cmd/fmthard/fmthard.c	Thu Jul 02 16:27:07 2009 -0400
@@ -693,6 +693,7 @@
 -n volumename | -s datafile  [ -d arguments] raw-device\n");
 
 #elif defined(__s390__)
+	(void) fprintf(stderr,
 "fmthard is not required under System z and does nothing\n");
 
 #else

--- a/usr/src/lib/libpkg/common/pkgserv.c	Thu Jul 02 13:26:09 2009 -0400
+++ b/usr/src/lib/libpkg/common/pkgserv.c	Thu Jul 02 16:27:07 2009 -0400
@@ -571,7 +571,7 @@
 	int plen = strlen(path);
 	pkgfilter_t *pcmd = alloca(sizeof (*pcmd) + plen);
 	char *result;
-	unsigned int rlen;
+	size_t rlen;
 
 	pcmd->cmd = PKG_FINDFILE;
 	*pathlen = pcmd->len = plen;

--- a/usr/src/lib/sun_fc/s390/Makefile	Thu Jul 02 13:26:09 2009 -0400
+++ b/usr/src/lib/sun_fc/s390/Makefile	Thu Jul 02 16:27:07 2009 -0400
@@ -26,6 +26,7 @@
 
 include ../Makefile.com
 
+DYNFLAGS +=	-L$(ROOTLIBDIR)
 LDLIBS	+=	-lstdc++ -lgcc_s
 
 .KEEP_STATE:

--- a/usr/src/lib/sun_fc/s390x/Makefile	Thu Jul 02 13:26:09 2009 -0400
+++ b/usr/src/lib/sun_fc/s390x/Makefile	Thu Jul 02 16:27:07 2009 -0400
@@ -27,6 +27,7 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
+DYNFLAGS +=	-L$(ROOTLIBDIR64)
 LDLIBS	+=	-lstdc++ -lgcc_s
 
 .KEEP_STATE:

--- a/usr/src/uts/s390x/os/trap.c	Thu Jul 02 13:26:09 2009 -0400
+++ b/usr/src/uts/s390x/os/trap.c	Thu Jul 02 16:27:07 2009 -0400
@@ -326,7 +326,7 @@
 		}
 
 		if (tp->t_rprof != NULL) {
-			realsigprof(0, 0);
+			realsigprof(0, 0, 0);
 			tp->t_sig_check = 1;
 		}
 	}

--- a/usr/src/uts/zSeries/os/syscall.c	Thu Jul 02 13:26:09 2009 -0400
+++ b/usr/src/uts/zSeries/os/syscall.c	Thu Jul 02 16:27:07 2009 -0400
@@ -157,56 +157,6 @@
 
 /*------------------------------------------------------------------*/
 /*                                                                  */
-/* Name		- realsigprof.                                      */
-/*                                                                  */
-/* Function	- Arrange for the real time profiling signal to be  */
-/*		  dispatched.                  		 	    */
-/*		                               		 	    */
-/*------------------------------------------------------------------*/
-
-void
-realsigprof(int sysnum, int error)
-{
-	proc_t *p;
-	klwp_t *lwp;
-
-	if (curthread->t_rprof->rp_anystate == 0)
-		return;
-	p   = ttoproc(curthread);
-	lwp = ttolwp(curthread);
-	mutex_enter(&p->p_lock);
-	if (sigismember(&p->p_ignore, SIGPROF) ||
-	    signal_is_blocked(curthread, SIGPROF)) {
-		mutex_exit(&p->p_lock);
-		return;
-	}
-	lwp->lwp_siginfo.si_signo = SIGPROF;
-	lwp->lwp_siginfo.si_code = PROF_SIG;
-	lwp->lwp_siginfo.si_errno = error;
-	hrt2ts(gethrtime(), &lwp->lwp_siginfo.si_tstamp);
-	lwp->lwp_siginfo.si_syscall = sysnum;
-	lwp->lwp_siginfo.si_nsysarg = (sysnum > 0 && sysnum < NSYSCALL) ?
-		LWP_GETSYSENT(lwp)[sysnum].sy_narg : 0;
-	lwp->lwp_siginfo.si_fault = lwp->lwp_lastfault;
-	lwp->lwp_siginfo.si_faddr = lwp->lwp_lastfaddr;
-	lwp->lwp_lastfault = 0;
-	lwp->lwp_lastfaddr = NULL;
-	sigtoproc(p, curthread, SIGPROF);
-	mutex_exit(&p->p_lock);
-	ASSERT(lwp->lwp_cursig == 0);
-	if (issig(FORREAL)) {
-		psig();
-	}
-	mutex_enter(&p->p_lock);
-	lwp->lwp_siginfo.si_signo = 0;
-	bzero(curthread->t_rprof, sizeof (*curthread->t_rprof));
-	mutex_exit(&p->p_lock);
-}
-
-/*========================= End of Function ========================*/
-
-/*------------------------------------------------------------------*/
-/*                                                                  */
 /* Name		- get_syscall_args.                                 */
 /*                                                                  */
 /* Function	- Get the arguments to the current system call.     */
@@ -834,7 +784,9 @@
 		}
 
 		if (sigprof) {
-			realsigprof(code, error);
+			int nargs = (code > 0 && code < NSYSCALL)?
+			    LWP_GETSYSENT(lwp)[code].sy_narg : 0;
+			realsigprof(code, nargs, error);
 			t->t_sig_check = 1;	/* recheck next time */
 		}
 

--- a/usr/src/uts/zSeries/sys/archsystm.h	Thu Jul 02 13:26:09 2009 -0400
+++ b/usr/src/uts/zSeries/sys/archsystm.h	Thu Jul 02 16:27:07 2009 -0400
@@ -53,7 +53,6 @@
 extern uint_t getpil(void);
 extern void setpil(uint_t);
 extern greg_t gettbr(void);
-extern void realsigprof(int, int);
 
 extern uintptr_t shm_alignment;