PERFORCE change 52421 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=52421

Change 52421 by peter at peter_daintree on 2004/05/07 07:37:25

	fix mismerge

Affected files ...

.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#13 edit

Differences ...

==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#13 (text+ko) ====

@@ -961,33 +961,6 @@
 #endif
 
 int
-freebsd4_freebsd32_fhstatfs(struct thread *td, struct freebsd4_freebsd32_fhstatfs_args *uap)
-{
-	int error;
-	caddr_t sg;
-	struct statfs32 *p32, s32;
-	struct statfs *p = NULL, s;
-
-	p32 = uap->buf;
-	if (p32) {
-		sg = stackgap_init();
-		p = stackgap_alloc(&sg, sizeof(struct statfs));
-		uap->buf = (struct statfs32 *)p;
-	}
-	error = fhstatfs(td, (struct fhstatfs_args *) uap);
-	if (error)
-		return (error);
-	if (p32) {
-		error = copyin(p, &s, sizeof(s));
-		if (error)
-			return (error);
-		copy_statfs(&s, &s32);
-		error = copyout(&s32, p32, sizeof(s32));
-	}
-	return (error);
-}
-
-int
 freebsd32_semsys(struct thread *td, struct freebsd32_semsys_args *uap)
 {
 	/*