Date: Sat, 6 Apr 2002 20:54:25 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 9258 for review Message-ID: <200204070454.g374sOk75927@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9258 Change 9258 by peter@peter_daintree on 2002/04/06 20:53:49 IFC @9257 Affected files ... ... //depot/projects/ia64/libexec/rtld-elf/ia64/reloc.c#3 integrate ... //depot/projects/ia64/sys/boot/efi/loader/Makefile#12 integrate ... //depot/projects/ia64/sys/boot/ia64/skiload/Makefile#9 integrate ... //depot/projects/ia64/sys/conf/Makefile.ia64#11 integrate ... //depot/projects/ia64/sys/ia64/conf/GENERIC#8 integrate ... //depot/projects/ia64/sys/sys/ucred.h#5 integrate Differences ... ==== //depot/projects/ia64/libexec/rtld-elf/ia64/reloc.c#3 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/ia64/reloc.c,v 1.2 2001/10/29 10:10:10 peter Exp $ + * $FreeBSD: src/libexec/rtld-elf/ia64/reloc.c,v 1.3 2002/04/07 04:16:35 peter Exp $ */ /* ==== //depot/projects/ia64/sys/boot/efi/loader/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/efi/loader/Makefile,v 1.14 2002/04/06 04:29:36 peter Exp $ +# $FreeBSD: src/sys/boot/efi/loader/Makefile,v 1.17 2002/04/07 04:27:50 peter Exp $ .PATH: ${.CURDIR}/../common @@ -6,7 +6,8 @@ PROG= ${BASE}.efi NOMAN= NEWVERSWHAT= "EFI boot" ${MACHINE_ARCH} -STRIP= #do not strip PE loader.efi +BINDIR?= /boot +STRIP= # We must not strip loader.efi at install time. SRCS+= main.c conf.c dev_net.c ==== //depot/projects/ia64/sys/boot/ia64/skiload/Makefile#9 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/sys/boot/ia64/skiload/Makefile,v 1.7 2002/04/06 04:33:53 peter Exp $ +# $FreeBSD: src/sys/boot/ia64/skiload/Makefile,v 1.8 2002/04/07 04:26:42 peter Exp $ .PATH: ${.CURDIR}/../common PROG= skiload NOMAN= NEWVERSWHAT= "ia64 SKI boot" ${MACHINE_ARCH} +BINDIR?= /boot SRCS+= main.c conf.c ==== //depot/projects/ia64/sys/conf/Makefile.ia64#11 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.ia64 -- with config changes. # Copyright 1990 W. Jolitz # from: src/sys/conf/Makefile.alpha,v 1.76 -# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.48 2002/03/24 17:45:46 obrien Exp $ +# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.49 2002/04/07 04:34:21 peter Exp $ # # Makefile for FreeBSD # ==== //depot/projects/ia64/sys/ia64/conf/GENERIC#8 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.27 2002/04/03 10:56:57 ru Exp $ +# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.28 2002/04/07 04:36:02 peter Exp $ machine ia64 cpu ITANIUM ==== //depot/projects/ia64/sys/sys/ucred.h#5 (text+ko) ==== @@ -31,16 +31,12 @@ * SUCH DAMAGE. * * @(#)ucred.h 8.4 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/sys/ucred.h,v 1.33 2002/04/01 21:31:11 jhb Exp $ + * $FreeBSD: src/sys/sys/ucred.h,v 1.34 2002/04/07 03:59:31 dd Exp $ */ #ifndef _SYS_UCRED_H_ #define _SYS_UCRED_H_ -#include <sys/queue.h> -#include <sys/_lock.h> -#include <sys/_mutex.h> - /* * Credentials. * @@ -61,16 +57,13 @@ struct uidinfo *cr_ruidinfo; /* per ruid resource consumption */ struct prison *cr_prison; /* jail(4) */ #define cr_endcopy cr_mtxp - struct mtx *cr_mtxp; /* protect refcount */ + struct mtx *cr_mtxp; /* protect refcount */ }; -#define cr_gid cr_groups[0] #define NOCRED ((struct ucred *)0) /* no credential available */ #define FSCRED ((struct ucred *)-1) /* filesystem credential */ /* - * This is the external representation of struct ucred, based upon the - * size of a 4.2-RELEASE struct ucred. There will probably never be - * any need to change the size of this or layout of its used fields. + * This is the external representation of struct ucred. */ struct xucred { u_int cr_version; /* structure layout version */ @@ -81,7 +74,11 @@ }; #define XUCRED_VERSION 0 +/* This can be used for both ucred and xucred structures. */ +#define cr_gid cr_groups[0] + #ifdef _KERNEL +struct thread; #ifdef DIAGNOSTIC void cred_free_thread(struct thread *td); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204070454.g374sOk75927>