Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Jul 2011 18:20:01 GMT
From:      John Baldwin <jhb@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 196555 for review
Message-ID:  <201107221820.p6MIK1aO030419@skunkworks.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@196555?ac=10

Change 196555 by jhb@jhb_jhbbsd on 2011/07/22 18:19:55

	IFC @196554

Affected files ...

.. //depot/projects/pci/sys/amd64/amd64/genassym.c#3 integrate
.. //depot/projects/pci/sys/amd64/amd64/intr_machdep.c#3 integrate
.. //depot/projects/pci/sys/amd64/amd64/support.S#2 integrate
.. //depot/projects/pci/sys/amd64/include/param.h#2 integrate
.. //depot/projects/pci/sys/arm/arm/irq_dispatch.S#2 integrate
.. //depot/projects/pci/sys/arm/include/param.h#2 integrate
.. //depot/projects/pci/sys/arm/sa11x0/sa11x0_irq.S#2 integrate
.. //depot/projects/pci/sys/boot/forth/loader.conf.5#3 integrate
.. //depot/projects/pci/sys/boot/i386/Makefile.inc#2 integrate
.. //depot/projects/pci/sys/boot/i386/boot2/Makefile#6 integrate
.. //depot/projects/pci/sys/boot/i386/zfsboot/Makefile#6 integrate
.. //depot/projects/pci/sys/boot/powerpc/ps3/Makefile#3 integrate
.. //depot/projects/pci/sys/boot/powerpc/ps3/conf.c#2 integrate
.. //depot/projects/pci/sys/boot/powerpc/ps3/devicename.c#2 integrate
.. //depot/projects/pci/sys/boot/powerpc/ps3/lv1call.S#2 integrate
.. //depot/projects/pci/sys/boot/powerpc/ps3/lv1call.h#2 integrate
.. //depot/projects/pci/sys/boot/powerpc/ps3/main.c#2 integrate
.. //depot/projects/pci/sys/boot/powerpc/ps3/ps3bus.h#1 branch
.. //depot/projects/pci/sys/boot/powerpc/ps3/ps3devdesc.h#1 branch
.. //depot/projects/pci/sys/boot/powerpc/ps3/ps3disk.c#1 branch
.. //depot/projects/pci/sys/boot/powerpc/ps3/ps3repo.c#1 branch
.. //depot/projects/pci/sys/boot/powerpc/ps3/ps3repo.h#1 branch
.. //depot/projects/pci/sys/boot/powerpc/ps3/ps3stor.c#1 branch
.. //depot/projects/pci/sys/boot/powerpc/ps3/ps3stor.h#1 branch
.. //depot/projects/pci/sys/boot/powerpc/ps3/version#2 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#2 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#2 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#3 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#2 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#3 integrate
.. //depot/projects/pci/sys/compat/freebsd32/freebsd32.h#3 integrate
.. //depot/projects/pci/sys/compat/linux/linux_ipc.c#4 integrate
.. //depot/projects/pci/sys/conf/Makefile.mips#2 integrate
.. //depot/projects/pci/sys/conf/NOTES#6 integrate
.. //depot/projects/pci/sys/conf/files.i386#5 integrate
.. //depot/projects/pci/sys/conf/options#8 integrate
.. //depot/projects/pci/sys/conf/options.mips#4 integrate
.. //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#27 integrate
.. //depot/projects/pci/sys/dev/adb/adb_kbd.c#2 integrate
.. //depot/projects/pci/sys/dev/ata/ata-pci.c#2 integrate
.. //depot/projects/pci/sys/dev/ata/ata-pci.h#4 integrate
.. //depot/projects/pci/sys/dev/ata/chipsets/ata-acard.c#2 integrate
.. //depot/projects/pci/sys/dev/ata/chipsets/ata-acerlabs.c#2 integrate
.. //depot/projects/pci/sys/dev/ata/chipsets/ata-intel.c#4 integrate
.. //depot/projects/pci/sys/dev/ata/chipsets/ata-promise.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_dfs/null/dfs_null.c#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah.h#6 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah_regdomain.c#4 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_ctry.h#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h#2 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#6 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#5 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c#5 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9280.h#3 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c#5 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c#6 integrate
.. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c#4 integrate
.. //depot/projects/pci/sys/dev/ath/if_ath.c#7 integrate
.. //depot/projects/pci/sys/dev/ath/if_athioctl.h#5 integrate
.. //depot/projects/pci/sys/dev/atkbdc/atkbd.c#4 integrate
.. //depot/projects/pci/sys/dev/gem/if_gem.c#5 integrate
.. //depot/projects/pci/sys/dev/kbd/kbd.c#2 integrate
.. //depot/projects/pci/sys/dev/kbdmux/kbdmux.c#2 integrate
.. //depot/projects/pci/sys/dev/pci/pci.c#25 integrate
.. //depot/projects/pci/sys/dev/syscons/syscons.c#3 integrate
.. //depot/projects/pci/sys/dev/uart/uart_kbd_sun.c#2 integrate
.. //depot/projects/pci/sys/dev/usb/input/ukbd.c#5 integrate
.. //depot/projects/pci/sys/dev/usb/net/if_aue.c#4 integrate
.. //depot/projects/pci/sys/dev/usb/net/if_axe.c#5 integrate
.. //depot/projects/pci/sys/dev/usb/net/if_mos.c#4 integrate
.. //depot/projects/pci/sys/dev/usb/net/if_rue.c#4 integrate
.. //depot/projects/pci/sys/dev/usb/net/if_udav.c#5 integrate
.. //depot/projects/pci/sys/dev/usb/serial/u3g.c#3 integrate
.. //depot/projects/pci/sys/dev/usb/usb_request.c#3 integrate
.. //depot/projects/pci/sys/dev/usb/usbdevs#6 integrate
.. //depot/projects/pci/sys/dev/vkbd/vkbd.c#2 integrate
.. //depot/projects/pci/sys/fs/nfs/nfs_commonacl.c#3 integrate
.. //depot/projects/pci/sys/fs/nfs/nfs_commonkrpc.c#6 integrate
.. //depot/projects/pci/sys/fs/nfs/nfs_commonport.c#4 integrate
.. //depot/projects/pci/sys/fs/nfs/nfs_commonsubs.c#4 integrate
.. //depot/projects/pci/sys/fs/nfs/nfs_var.h#5 integrate
.. //depot/projects/pci/sys/fs/nfs/nfsdport.h#2 integrate
.. //depot/projects/pci/sys/fs/nfs/nfsport.h#4 integrate
.. //depot/projects/pci/sys/fs/nfsclient/nfs_clport.c#7 integrate
.. //depot/projects/pci/sys/fs/nfsclient/nfs_clsubs.c#5 integrate
.. //depot/projects/pci/sys/fs/nfsclient/nfs_clvfsops.c#4 integrate
.. //depot/projects/pci/sys/fs/nfsclient/nfs_clvnops.c#5 integrate
.. //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdcache.c#3 integrate
.. //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdkrpc.c#4 integrate
.. //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdport.c#4 integrate
.. //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdserv.c#4 integrate
.. //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdsocket.c#4 integrate
.. //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdstate.c#4 integrate
.. //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdsubs.c#2 integrate
.. //depot/projects/pci/sys/geom/geom.h#6 integrate
.. //depot/projects/pci/sys/i386/i386/genassym.c#3 integrate
.. //depot/projects/pci/sys/i386/i386/intr_machdep.c#3 integrate
.. //depot/projects/pci/sys/i386/i386/support.s#2 integrate
.. //depot/projects/pci/sys/i386/ibcs2/ibcs2_ioctl.c#2 integrate
.. //depot/projects/pci/sys/i386/include/param.h#3 integrate
.. //depot/projects/pci/sys/i386/xen/mptable.c#2 integrate
.. //depot/projects/pci/sys/ia64/conf/DEFAULTS#2 integrate
.. //depot/projects/pci/sys/ia64/ia64/clock.c#4 integrate
.. //depot/projects/pci/sys/ia64/ia64/efi.c#4 integrate
.. //depot/projects/pci/sys/ia64/ia64/interrupt.c#3 integrate
.. //depot/projects/pci/sys/ia64/ia64/locore.S#4 integrate
.. //depot/projects/pci/sys/ia64/ia64/nexus.c#5 integrate
.. //depot/projects/pci/sys/ia64/ia64/pmap.c#6 integrate
.. //depot/projects/pci/sys/ia64/include/efi.h#3 integrate
.. //depot/projects/pci/sys/ia64/include/param.h#2 integrate
.. //depot/projects/pci/sys/kern/kern_clock.c#3 integrate
.. //depot/projects/pci/sys/kern/kern_descrip.c#6 integrate
.. //depot/projects/pci/sys/kern/kern_exec.c#3 integrate
.. //depot/projects/pci/sys/kern/kern_intr.c#4 integrate
.. //depot/projects/pci/sys/kern/kern_linker.c#3 integrate
.. //depot/projects/pci/sys/kern/kern_mib.c#2 integrate
.. //depot/projects/pci/sys/kern/kern_proc.c#4 integrate
.. //depot/projects/pci/sys/kern/kern_resource.c#4 integrate
.. //depot/projects/pci/sys/kern/kern_sysctl.c#4 integrate
.. //depot/projects/pci/sys/kern/posix4_mib.c#2 integrate
.. //depot/projects/pci/sys/kern/sched_ule.c#4 integrate
.. //depot/projects/pci/sys/kern/subr_pcpu.c#4 integrate
.. //depot/projects/pci/sys/kern/subr_smp.c#5 integrate
.. //depot/projects/pci/sys/kern/sys_capability.c#4 integrate
.. //depot/projects/pci/sys/kgssapi/gss_impl.c#3 integrate
.. //depot/projects/pci/sys/mips/conf/XLP#1 branch
.. //depot/projects/pci/sys/mips/conf/XLP64#1 branch
.. //depot/projects/pci/sys/mips/conf/XLPN32#1 branch
.. //depot/projects/pci/sys/mips/include/bus.h#2 integrate
.. //depot/projects/pci/sys/mips/include/cpufunc.h#2 integrate
.. //depot/projects/pci/sys/mips/include/intr_machdep.h#2 integrate
.. //depot/projects/pci/sys/mips/include/param.h#2 integrate
.. //depot/projects/pci/sys/mips/malta/gt_pci.c#2 integrate
.. //depot/projects/pci/sys/mips/mips/cache.c#2 integrate
.. //depot/projects/pci/sys/mips/mips/cache_mipsNN.c#2 integrate
.. //depot/projects/pci/sys/mips/mips/cpu.c#3 integrate
.. //depot/projects/pci/sys/mips/mips/elf_trampoline.c#2 integrate
.. //depot/projects/pci/sys/mips/mips/exception.S#2 integrate
.. //depot/projects/pci/sys/mips/mips/locore.S#2 integrate
.. //depot/projects/pci/sys/mips/mips/machdep.c#2 integrate
.. //depot/projects/pci/sys/mips/nlm/board.c#1 branch
.. //depot/projects/pci/sys/mips/nlm/board.h#1 branch
.. //depot/projects/pci/sys/mips/nlm/bus_space_rmi.c#1 branch
.. //depot/projects/pci/sys/mips/nlm/clock.h#1 branch
.. //depot/projects/pci/sys/mips/nlm/cms.c#1 branch
.. //depot/projects/pci/sys/mips/nlm/files.xlp#1 branch
.. //depot/projects/pci/sys/mips/nlm/hal/bridge.h#1 branch
.. //depot/projects/pci/sys/mips/nlm/hal/cop0.h#1 branch
.. //depot/projects/pci/sys/mips/nlm/hal/cop2.h#1 branch
.. //depot/projects/pci/sys/mips/nlm/hal/cpucontrol.h#1 branch
.. //depot/projects/pci/sys/mips/nlm/hal/fmn.c#1 branch
.. //depot/projects/pci/sys/mips/nlm/hal/fmn.h#1 branch
.. //depot/projects/pci/sys/mips/nlm/hal/iomap.h#1 branch
.. //depot/projects/pci/sys/mips/nlm/hal/mips-extns.h#1 branch
.. //depot/projects/pci/sys/mips/nlm/hal/mmio.h#1 branch
.. //depot/projects/pci/sys/mips/nlm/hal/mmu.h#1 branch
.. //depot/projects/pci/sys/mips/nlm/hal/pic.h#1 branch
.. //depot/projects/pci/sys/mips/nlm/hal/sys.h#1 branch
.. //depot/projects/pci/sys/mips/nlm/hal/uart.h#1 branch
.. //depot/projects/pci/sys/mips/nlm/interrupt.h#1 branch
.. //depot/projects/pci/sys/mips/nlm/intr_machdep.c#1 branch
.. //depot/projects/pci/sys/mips/nlm/iodi.c#1 branch
.. //depot/projects/pci/sys/mips/nlm/mpreset.S#1 branch
.. //depot/projects/pci/sys/mips/nlm/msgring.h#1 branch
.. //depot/projects/pci/sys/mips/nlm/std.xlp#1 branch
.. //depot/projects/pci/sys/mips/nlm/tick.c#1 branch
.. //depot/projects/pci/sys/mips/nlm/uart_bus_xlp_iodi.c#1 branch
.. //depot/projects/pci/sys/mips/nlm/uart_cpu_mips_xlp.c#1 branch
.. //depot/projects/pci/sys/mips/nlm/xlp.h#1 branch
.. //depot/projects/pci/sys/mips/nlm/xlp_machdep.c#1 branch
.. //depot/projects/pci/sys/net/if_var.h#4 integrate
.. //depot/projects/pci/sys/net/radix.h#2 integrate
.. //depot/projects/pci/sys/net80211/ieee80211_proto.c#3 integrate
.. //depot/projects/pci/sys/netgraph/ng_ether.c#3 integrate
.. //depot/projects/pci/sys/netinet/in_pcb.h#5 integrate
.. //depot/projects/pci/sys/netinet/tcp_syncache.h#2 integrate
.. //depot/projects/pci/sys/netinet/tcp_var.h#3 integrate
.. //depot/projects/pci/sys/pc98/cbus/pckbd.c#2 integrate
.. //depot/projects/pci/sys/pc98/conf/DEFAULTS#2 integrate
.. //depot/projects/pci/sys/powerpc/aim/locore32.S#4 integrate
.. //depot/projects/pci/sys/powerpc/aim/locore64.S#4 integrate
.. //depot/projects/pci/sys/powerpc/booke/locore.S#3 integrate
.. //depot/projects/pci/sys/powerpc/include/param.h#3 integrate
.. //depot/projects/pci/sys/security/audit/audit.h#2 integrate
.. //depot/projects/pci/sys/security/audit/audit_arg.c#2 integrate
.. //depot/projects/pci/sys/security/audit/audit_bsm.c#2 integrate
.. //depot/projects/pci/sys/security/audit/audit_private.h#2 integrate
.. //depot/projects/pci/sys/sparc64/include/param.h#2 integrate
.. //depot/projects/pci/sys/sparc64/sparc64/exception.S#5 integrate
.. //depot/projects/pci/sys/sparc64/sparc64/intr_machdep.c#4 integrate
.. //depot/projects/pci/sys/sys/capability.h#3 integrate
.. //depot/projects/pci/sys/sys/interrupt.h#3 integrate
.. //depot/projects/pci/sys/sys/kbio.h#2 integrate
.. //depot/projects/pci/sys/sys/param.h#7 integrate
.. //depot/projects/pci/sys/sys/pcpu.h#4 integrate
.. //depot/projects/pci/sys/sys/resourcevar.h#3 integrate
.. //depot/projects/pci/sys/sys/sysctl.h#3 integrate
.. //depot/projects/pci/sys/sys/user.h#4 integrate
.. //depot/projects/pci/sys/ufs/ffs/ffs_alloc.c#7 integrate
.. //depot/projects/pci/sys/x86/include/mptable.h#6 integrate
.. //depot/projects/pci/sys/x86/x86/mptable.c#10 integrate

Differences ...

==== //depot/projects/pci/sys/amd64/amd64/genassym.c#3 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.185 2011/04/25 22:22:51 rmacklem Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.186 2011/07/18 15:19:40 attilio Exp $");
 
 #include "opt_compat.h"
 #include "opt_hwpmc_hooks.h"
@@ -201,7 +201,6 @@
 ASSYM(ENOENT, ENOENT);
 ASSYM(EFAULT, EFAULT);
 ASSYM(ENAMETOOLONG, ENAMETOOLONG);
-ASSYM(MAXCPU, MAXCPU);
 ASSYM(MAXCOMLEN, MAXCOMLEN);
 ASSYM(MAXPATHLEN, MAXPATHLEN);
 ASSYM(PC_SIZEOF, sizeof(struct pcpu));

==== //depot/projects/pci/sys/amd64/amd64/intr_machdep.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.53 2011/06/07 08:46:13 attilio Exp $
+ * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.54 2011/07/18 15:19:40 attilio Exp $
  */
 
 /*
@@ -80,6 +80,11 @@
 static int assign_cpu;
 #endif
 
+u_long intrcnt[INTRCNT_COUNT];
+char intrnames[INTRCNT_COUNT * (MAXCOMLEN + 1)];
+size_t sintrcnt = sizeof(intrcnt);
+size_t sintrnames = sizeof(intrnames);
+
 static int	intr_assign_cpu(void *arg, u_char cpu);
 static void	intr_disable_src(void *arg);
 static void	intr_init(void *__dummy);

==== //depot/projects/pci/sys/amd64/amd64/support.S#2 (text+ko) ====

@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.132 2010/11/26 08:11:43 uqs Exp $
+ * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.133 2011/07/18 15:19:40 attilio Exp $
  */
 
 #include "opt_ddb.h"
@@ -38,18 +38,6 @@
 
 #include "assym.s"
 
-	.data
-	ALIGN_DATA
-	.globl	intrcnt, eintrcnt
-intrcnt:
-	.space	INTRCNT_COUNT * 8
-eintrcnt:
-
-	.globl	intrnames, eintrnames
-intrnames:
-	.space	INTRCNT_COUNT * (MAXCOMLEN + 1)
-eintrnames:
-
 	.text
 
 /*

==== //depot/projects/pci/sys/amd64/include/param.h#2 (text+ko) ====

@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/amd64/include/param.h,v 1.35 2010/07/22 09:13:49 kib Exp $
+ * $FreeBSD: src/sys/amd64/include/param.h,v 1.37 2011/07/19 13:00:30 attilio Exp $
  */
 
 
@@ -64,7 +64,9 @@
 #endif
 
 #if defined(SMP) || defined(KLD_MODULE)
-#define MAXCPU		32
+#ifndef MAXCPU
+#define MAXCPU		64
+#endif
 #else
 #define MAXCPU		1
 #endif

==== //depot/projects/pci/sys/arm/arm/irq_dispatch.S#2 (text+ko) ====

@@ -72,7 +72,7 @@
 #include <machine/asm.h>
 #include <machine/asmacros.h>
 #include <machine/armreg.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/irq_dispatch.S,v 1.4 2005/01/05 21:58:47 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/irq_dispatch.S,v 1.5 2011/07/18 15:19:40 attilio Exp $");
 
 /*
  * irq_entry:
@@ -102,14 +102,16 @@
 	.align	0
 
 
-	.global _C_LABEL(intrnames), _C_LABEL(eintrnames)
-	.global _C_LABEL(intrcnt), _C_LABEL(eintrcnt)
+	.global _C_LABEL(intrnames), _C_LABEL(sintrnames)
+	.global _C_LABEL(intrcnt), _C_LABEL(sintrcnt)
 _C_LABEL(intrnames): 
 	.space NIRQ * (MAXCOMLEN + 1)
-_C_LABEL(eintrnames):
 _C_LABEL(intrcnt):
 	.space NIRQ * 4
-_C_LABEL(eintrcnt):
+_C_LABEL(sintrnames):
+	.word NIRQ * (MAXCOMLEN + 1)
+_C_LABEL(sintrcnt):
+	.word NIRQ * 4
 
 	.global _C_LABEL(current_intr_depth)
 _C_LABEL(current_intr_depth):

==== //depot/projects/pci/sys/arm/include/param.h#2 (text+ko) ====

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD: src/sys/arm/include/param.h,v 1.18 2009/09/18 17:04:57 alc Exp $
+ * $FreeBSD: src/sys/arm/include/param.h,v 1.19 2011/07/19 00:37:24 attilio Exp $
  */
 
 #ifndef _ARM_INCLUDE_PARAM_H_
@@ -61,7 +61,9 @@
 #define	MID_MACHINE	MID_ARM6 
 
 #if defined(SMP) || defined(KLD_MODULE)
+#ifndef MAXCPU
 #define	MAXCPU		2
+#endif
 #else
 #define	MAXCPU		1
 #endif /* SMP || KLD_MODULE */

==== //depot/projects/pci/sys/arm/sa11x0/sa11x0_irq.S#2 (text+ko) ====

@@ -36,7 +36,7 @@
 #include <machine/armreg.h>
 #include <machine/asmacros.h>
 #include <arm/sa11x0/sa11x0_reg.h>
-__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_irq.S,v 1.4 2010/02/16 21:59:17 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_irq.S,v 1.5 2011/07/18 15:19:40 attilio Exp $");
 Lcurrent_intr_depth:
 	.word	_C_LABEL(current_intr_depth)
 
@@ -118,16 +118,11 @@
 	mov	r1, #0xffffffff
 	str	r1, [r0, #(SAIPIC_MR)]
 	mov	pc, lr
-#ifdef IRQSTATS
-Lintrcnt:
-	.word	_C_LABEL(intrcnt)
-#endif
 
-	.global _C_LABEL(intrnames), _C_LABEL(eintrnames)
-	.global _C_LABEL(eintrcnt)
+	.global _C_LABEL(intrnames), _C_LABEL(sintrnames)
 _C_LABEL(intrnames): 
-_C_LABEL(eintrnames):
-_C_LABEL(eintrcnt):
+_C_LABEL(sintrnames):
+	.word	0
 
 	.globl	_C_LABEL(intrcnt), _C_LABEL(sintrcnt)
 
@@ -135,4 +130,4 @@
 	.space	ICU_LEN*4  /* XXX Should be linked to number of interrupts */
 
 _C_LABEL(sintrcnt):
-	.space 32*4
+	.word	ICU_LEN*4

==== //depot/projects/pci/sys/boot/forth/loader.conf.5#3 (text+ko) ====

@@ -22,8 +22,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/sys/boot/forth/loader.conf.5,v 1.31 2011/05/28 08:50:38 julian Exp $
-.Dd January 16, 2008
+.\" $FreeBSD: src/sys/boot/forth/loader.conf.5,v 1.32 2011/07/20 15:18:24 jhb Exp $
+.Dd July 20, 2011
 .Dt LOADER.CONF 5
 .Os
 .Sh NAME
@@ -107,6 +107,9 @@
 Name of the kernel to be loaded.
 If no kernel name is set, no additional
 modules will be loaded.
+The name must be a subdirectory of
+.Pa /boot
+that contains a kernel.
 .It Ar kernel_options
 Flags to be passed to the kernel.
 .It Ar password
@@ -190,7 +193,7 @@
 .Dq spinning
 character (useful for embedded products and such).
 .It Va kernel
-.Pq Dq Pa /boot/kernel/kernel
+.Pq Dq kernel
 .It Va loader_conf_files
 .Pq Dq Pa /boot/loader.conf /boot/loader.conf.local
 .It Va splash_bmp_load

==== //depot/projects/pci/sys/boot/i386/Makefile.inc#2 (text+ko) ====

@@ -1,6 +1,6 @@
 # Common defines for all of /sys/boot/i386/
 #
-# $FreeBSD: src/sys/boot/i386/Makefile.inc,v 1.15 2011/01/05 22:24:33 dim Exp $
+# $FreeBSD: src/sys/boot/i386/Makefile.inc,v 1.16 2011/07/17 13:50:21 dim Exp $
 
 BINDIR?=	/boot
 
@@ -11,6 +11,7 @@
 
 .if ${MACHINE_CPUARCH} == "amd64"
 CFLAGS+=	-m32 -march=i386
+ACFLAGS+=	-m32
 LDFLAGS+=	-m elf_i386_fbsd
 AFLAGS+=	--32
 .endif

==== //depot/projects/pci/sys/boot/i386/boot2/Makefile#6 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.70 2011/05/05 18:47:24 dim Exp $
+# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.71 2011/07/17 13:50:21 dim Exp $
 
 .include <bsd.own.mk>
 
@@ -89,6 +89,9 @@
 	${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC}
 
 boot2.o: boot2.s
+.if ${CC:T:Mclang} == "clang"
+	${CC} ${ACFLAGS} -c boot2.s
+.endif
 
 SRCS=	boot2.c boot2.h
 

==== //depot/projects/pci/sys/boot/i386/zfsboot/Makefile#6 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/i386/zfsboot/Makefile,v 1.14 2011/06/27 21:43:56 jhb Exp $
+# $FreeBSD: src/sys/boot/i386/zfsboot/Makefile,v 1.15 2011/07/17 13:50:21 dim Exp $
 
 .PATH:		${.CURDIR}/../boot2 ${.CURDIR}/../common ${.CURDIR}/../../common
 
@@ -86,6 +86,9 @@
 	${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}
 
 zfsboot.o: zfsboot.s
+.if ${CC:T:Mclang} == "clang"
+	${CC} ${ACFLAGS} -c zfsboot.s
+.endif
 
 SRCS=	zfsboot.c
 

==== //depot/projects/pci/sys/boot/powerpc/ps3/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/powerpc/ps3/Makefile,v 1.3 2011/05/30 04:23:33 julian Exp $
+# $FreeBSD: src/sys/boot/powerpc/ps3/Makefile,v 1.4 2011/07/16 19:01:09 nwhitehorn Exp $
 
 .include <bsd.own.mk>
 MK_SSP=		no
@@ -10,13 +10,13 @@
 
 # Architecture-specific loader code
 SRCS=		start.S conf.c metadata.c vers.c main.c devicename.c ppc64_elf_freebsd.c
-SRCS+=		lv1call.S ps3cons.c font.h ps3mmu.c ps3net.c
+SRCS+=		lv1call.S ps3cons.c font.h ps3mmu.c ps3net.c ps3repo.c ps3stor.c ps3disk.c
 SRCS+=		ucmpdi2.c
 
 LOADER_DISK_SUPPORT?=	yes
 LOADER_UFS_SUPPORT?=	yes
 LOADER_CD9660_SUPPORT?=	yes
-LOADER_EXT2FS_SUPPORT?=	no
+LOADER_EXT2FS_SUPPORT?=	yes
 LOADER_NET_SUPPORT?=	yes
 LOADER_NFS_SUPPORT?=	yes
 LOADER_TFTP_SUPPORT?=	no

==== //depot/projects/pci/sys/boot/powerpc/ps3/conf.c#2 (text+ko) ====

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
+ * Copyright (C) 1999 Michael Smith <msmith@freebsd.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/powerpc/ps3/conf.c,v 1.1 2011/01/06 04:12:29 nwhitehorn Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/powerpc/ps3/conf.c,v 1.2 2011/07/16 19:01:09 nwhitehorn Exp $");
 
 #include <stand.h>
 #include "bootstrap.h"
@@ -34,6 +34,8 @@
 #include "dev_net.h"
 #endif
 
+extern struct devsw ps3disk;
+
 /*
  * We could use linker sets for some or all of these, but
  * then we would have to control what ended up linked into
@@ -46,10 +48,8 @@
 /* Exported for libstand */
 struct devsw *devsw[] = {
 #if defined(LOADER_DISK_SUPPORT) || defined(LOADER_CD9660_SUPPORT)
-#ifdef NOTYET
     &ps3disk,
 #endif
-#endif
 #if defined(LOADER_NET_SUPPORT)
     &netdev,
 #endif

==== //depot/projects/pci/sys/boot/powerpc/ps3/devicename.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/powerpc/ps3/devicename.c,v 1.1 2011/01/06 04:12:29 nwhitehorn Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/powerpc/ps3/devicename.c,v 1.2 2011/07/16 19:01:09 nwhitehorn Exp $");
 
 #include <sys/disklabel.h>
 
@@ -33,8 +33,10 @@
 #include <string.h>
 
 #include "bootstrap.h"
+#include "ps3.h"
+#include "ps3devdesc.h"
 
-static int ps3_parsedev(struct devdesc **dev, const char *devspec,
+static int ps3_parsedev(struct ps3_devdesc **dev, const char *devspec,
     const char **path);
 
 /*
@@ -45,7 +47,7 @@
 int
 ps3_getdev(void **vdev, const char *devspec, const char **path)
 {
-	struct devdesc **dev = (struct devdesc **)vdev;
+	struct ps3_devdesc **dev = (struct ps3_devdesc **)vdev;
 	int rv = 0;
 
 	/*
@@ -82,9 +84,9 @@
  *
  */
 static int
-ps3_parsedev(struct devdesc **dev, const char *devspec, const char **path)
+ps3_parsedev(struct ps3_devdesc **dev, const char *devspec, const char **path)
 {
-	struct devdesc *idev;
+	struct ps3_devdesc *idev;
 	struct devsw *dv;
 	char *cp;
 	const char *np;
@@ -104,7 +106,7 @@
 	}
 	if (dv == NULL)
 		return(ENOENT);
-	idev = malloc(sizeof(struct devdesc));
+	idev = malloc(sizeof(struct ps3_devdesc));
 	err = 0;
 	np = (devspec + strlen(dv->dv_name));
 
@@ -112,7 +114,6 @@
 	case DEVT_NONE:
 		break;
 
-#ifdef NOTYET
 	case DEVT_DISK:
 		unit = -1;
 		pnum = -1;
@@ -154,7 +155,6 @@
 		if (path != NULL)
 			*path = (*cp == 0) ? cp : cp + 1;
 		break;
-#endif
 
 	case DEVT_NET:
 		/*
@@ -188,7 +188,7 @@
 char *
 ps3_fmtdev(void *vdev)
 {
-	struct devdesc *dev = (struct devdesc *)vdev;
+	struct ps3_devdesc *dev = (struct ps3_devdesc *)vdev;
 	char *cp;
 	static char buf[128];
 
@@ -197,7 +197,6 @@
 		strcpy(buf, "(no device)");
 		break;
 
-#ifdef NOTYET
 	case DEVT_DISK:
 		cp = buf;
 		cp += sprintf(cp, "%s%d", dev->d_dev->dv_name, dev->d_unit);
@@ -212,7 +211,6 @@
 
 		strcat(cp, ":");
 		break;
-#endif
 
 	case DEVT_NET:
 		sprintf(buf, "%s%d:", dev->d_dev->dv_name, dev->d_unit);
@@ -227,7 +225,7 @@
 int
 ps3_setcurrdev(struct env_var *ev, int flags, const void *value)
 {
-	struct devdesc *ncurr;
+	struct ps3_devdesc *ncurr;
 	int rv;
 
 	if ((rv = ps3_parsedev(&ncurr, value, NULL)) != 0)

==== //depot/projects/pci/sys/boot/powerpc/ps3/lv1call.S#2 (text+ko) ====

@@ -1,5 +1,6 @@
 /*-
  * Copyright (C) 2010 Nathan Whitehorn
+ * Copyright (C) 2011 glevand (geoffrey.levand@mail.ru)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -22,7 +23,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/boot/powerpc/ps3/lv1call.S,v 1.1 2011/01/06 04:12:29 nwhitehorn Exp $
+ * $FreeBSD: src/sys/boot/powerpc/ps3/lv1call.S,v 1.2 2011/07/16 19:01:09 nwhitehorn Exp $
  */
 
 /* Hypercall stubs. Note: this is all a hack and should die. */
@@ -163,7 +164,7 @@
 
 	sldi	%r3,%r3,32
 	clrldi	%r4,%r4,32
-	ori	%r3,%r3,%r4
+	or	%r3,%r3,%r4
 	clrldi	%r4,%r5,32
 	clrldi	%r5,%r6,32
 
@@ -254,3 +255,98 @@
 	mtlr	%r0
 	blr
 
+.global lv1_get_repository_node_value
+lv1_get_repository_node_value:
+	mflr	%r0
+	stw	%r0,4(%r1)
+
+	sldi	%r3,%r3,32
+	clrldi	%r4,%r4,32
+	or	%r3,%r3,%r4
+	sldi	%r4,%r5,32
+	clrldi	%r5,%r6,32
+	or	%r4,%r4,%r5
+	sldi	%r5,%r7,32
+	clrldi	%r6,%r8,32
+	or	%r5,%r5,%r6
+	sldi	%r6,%r9,32
+	clrldi	%r7,%r10,32
+	or	%r6,%r6,%r7
+	lwz     %r7,8(%r1)
+	lwz     %r8,12(%r1)
+	sldi	%r7,%r7,32
+	or	%r7,%r7,%r8
+
+	li	%r11,91
+	hc
+	extsw	%r3,%r3
+
+	lwz	%r6,16(%r1)
+	std	%r4,0(%r6)
+	lwz	%r6,20(%r1)
+	std	%r5,0(%r6)
+
+	lwz	%r0,4(%r1)
+	mtlr	%r0
+	blr
+
+.global lv1_storage_read
+lv1_storage_read:
+	mflr	%r0
+	stw	%r0,4(%r1)
+
+	sldi	%r3,%r3,32
+	clrldi	%r4,%r4,32
+	or	%r3,%r3,%r4
+	sldi	%r4,%r5,32
+	clrldi	%r5,%r6,32
+	or	%r4,%r4,%r5
+	sldi	%r5,%r7,32
+	clrldi	%r6,%r8,32
+	or	%r5,%r5,%r6
+	sldi	%r6,%r9,32
+	clrldi	%r7,%r10,32
+	or	%r6,%r6,%r7
+	lwz     %r7,8(%r1)
+	lwz     %r8,12(%r1)
+	sldi	%r7,%r7,32
+	or	%r7,%r7,%r8
+	lwz     %r8,16(%r1)
+	lwz     %r9,20(%r1)
+	sldi	%r8,%r8,32
+	or	%r8,%r8,%r9
+
+	li	%r11,245
+	hc
+	extsw	%r3,%r3
+
+	lwz	%r5,24(%r1)
+	std	%r4,0(%r5)
+
+	lwz	%r0,4(%r1)
+	mtlr	%r0
+	blr
+
+.global lv1_storage_check_async_status
+lv1_storage_check_async_status:
+	mflr	%r0
+	stw	%r0,4(%r1)
+	stw	%r7,-4(%r1)
+
+	sldi	%r3,%r3,32
+	clrldi	%r4,%r4,32
+	or	%r3,%r3,%r4
+	sldi	%r4,%r5,32
+	clrldi	%r5,%r6,32
+	or	%r4,%r4,%r5
+
+	li	%r11,254
+	hc
+	extsw	%r3,%r3
+
+	lwz	%r5,-4(%r1)
+	std	%r4,0(%r5)
+
+	lwz	%r0,4(%r1)
+	mtlr	%r0
+	blr

==== //depot/projects/pci/sys/boot/powerpc/ps3/lv1call.h#2 (text+ko) ====

@@ -22,7 +22,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/boot/powerpc/ps3/lv1call.h,v 1.1 2011/01/06 04:12:29 nwhitehorn Exp $
+ * $FreeBSD: src/sys/boot/powerpc/ps3/lv1call.h,v 1.2 2011/07/16 19:01:09 nwhitehorn Exp $
  */
 
 #ifndef _PS3_LV1CALL_H
@@ -68,5 +68,13 @@
 int lv1_net_stop_tx_dma(int bus, int dev, int);
 int lv1_net_stop_rx_dma(int bus, int dev, int);
 
+int lv1_get_repository_node_value(uint64_t lpar_id, uint64_t n1, uint64_t n2,
+	uint64_t n3, uint64_t n4, uint64_t *v1, uint64_t *v2);
+
+int lv1_storage_read(uint64_t dev_id, uint64_t region_id,
+	uint64_t start_sector, uint64_t sector_count,
+	uint64_t flags, uint64_t buf, uint64_t *tag);
+int lv1_storage_check_async_status(uint64_t dev_id, uint64_t tag, uint64_t *status);
+
 #endif
 

==== //depot/projects/pci/sys/boot/powerpc/ps3/main.c#2 (text+ko) ====

@@ -1,5 +1,6 @@
 /*-
  * Copyright (C) 2010 Nathan Whitehorn
+ * Copyright (C) 2011 glevand (geoffrey.levand@mail.ru)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/powerpc/ps3/main.c,v 1.1 2011/01/06 04:12:29 nwhitehorn Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/powerpc/ps3/main.c,v 1.2 2011/07/16 19:01:09 nwhitehorn Exp $");
 
 #include <stand.h>
 #include <sys/param.h>
@@ -35,6 +36,7 @@
 #include "bootstrap.h"
 #include "lv1call.h"
 #include "ps3.h"
+#include "ps3devdesc.h"
 
 struct arch_switch	archsw;
 extern void *_end;
@@ -58,7 +60,9 @@
 {
 	uint64_t maxmem = 0;
 	void *heapbase;
-	int i;
+	int i, err;
+	struct ps3_devdesc currdev;
+	struct open_file f;
 
 	lv1_get_physmem(&maxmem);
 	
@@ -78,9 +82,37 @@
 	/*
 	 * March through the device switch probing for things.
 	 */
-	for (i = 0; devsw[i] != NULL; i++)
-		if (devsw[i]->dv_init != NULL)
-			(devsw[i]->dv_init)();
+	for (i = 0; devsw[i] != NULL; i++) {
+		if (devsw[i]->dv_init != NULL) {
+			err = (devsw[i]->dv_init)();
+			if (err) {
+				printf("\n%s: initialization failed err=%d\n",
+					devsw[i]->dv_name, err);
+				continue;
+			}
+		}
+
+		printf("\nDevice: %s\n", devsw[i]->dv_name);
+
+		currdev.d_dev = devsw[i];
+		currdev.d_type = currdev.d_dev->dv_type;
+
+		if (strcmp(devsw[i]->dv_name, "disk") == 0) {
+			f.f_devdata = &currdev;
+			currdev.d_unit = 3;
+			currdev.d_disk.pnum = 1;
+			currdev.d_disk.ptype = PTYPE_GPT;
+
+			if (devsw[i]->dv_open(&f, &currdev) == 0)
+				break;
+		}
+
+		if (strcmp(devsw[i]->dv_name, "net") == 0)
+			break;
+	}
+
+	if (devsw[i] == NULL)
+		panic("No boot device found!");
 
 	/*
 	 * Get timebase at boot.
@@ -98,8 +130,10 @@
 	printf("(%s, %s)\n", bootprog_maker, bootprog_date);
 	printf("Memory: %lldKB\n", maxmem / 1024);
 
-	env_setenv("currdev", EV_VOLATILE, "net", ps3_setcurrdev, env_nounset);
-	env_setenv("loaddev", EV_VOLATILE, "net", env_noset, env_nounset);
+	env_setenv("currdev", EV_VOLATILE, ps3_fmtdev(&currdev),
+	    ps3_setcurrdev, env_nounset);
+	env_setenv("loaddev", EV_VOLATILE, ps3_fmtdev(&currdev), env_noset,
+	    env_nounset);
 	setenv("LINES", "24", 1);
 	setenv("hw.platform", "ps3", 1);
 

==== //depot/projects/pci/sys/boot/powerpc/ps3/version#2 (text+ko) ====

@@ -1,6 +1,8 @@
-$FreeBSD: src/sys/boot/powerpc/ps3/version,v 1.1 2011/01/06 04:12:29 nwhitehorn Exp $
+$FreeBSD: src/sys/boot/powerpc/ps3/version,v 1.2 2011/07/16 19:01:09 nwhitehorn Exp $
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
 
+0.3:	Added GPT support to disk.
+0.2:	Added disk support.
 0.1:	Initial PS3/PowerPC version.

==== //depot/projects/pci/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#2 (text+ko) ====

@@ -20,6 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  */
 
 #include <sys/types.h>
@@ -376,7 +377,7 @@
  * by nfsace, assuming aclent_t -> nfsace semantics.
  */
 static uint32_t
-mode_to_ace_access(mode_t mode, int isdir, int isowner, int isallow)
+mode_to_ace_access(mode_t mode, boolean_t isdir, int isowner, int isallow)
 {
 	uint32_t access = 0;
 	int haswriteperm = 0;
@@ -419,7 +420,7 @@
 			access |= ACE_DELETE_CHILD;
 	}
 	/* exec */
-	if (mode & 01) {
+	if (mode & S_IXOTH) {
 		access |= ACE_EXECUTE;
 	}
 
@@ -670,7 +671,7 @@
 }
 
 static int
-convert_aent_to_ace(aclent_t *aclentp, int aclcnt, int isdir,
+convert_aent_to_ace(aclent_t *aclentp, int aclcnt, boolean_t isdir,
     ace_t **retacep, int *retacecnt)
 {
 	ace_t *acep;
@@ -696,7 +697,7 @@
 		dfaclcnt = aclcnt - i;
 	}
 
-	if (dfaclcnt && isdir == 0) {
+	if (dfaclcnt && !isdir) {
 		return (EINVAL);
 	}
 
@@ -734,7 +735,7 @@
 }
 
 static int
-ace_mask_to_mode(uint32_t  mask, o_mode_t *modep, int isdir)
+ace_mask_to_mode(uint32_t  mask, o_mode_t *modep, boolean_t isdir)
 {
 	int error = 0;
 	o_mode_t mode = 0;
@@ -1031,7 +1032,7 @@
 }
 
 static int
-ace_allow_to_mode(uint32_t mask, o_mode_t *modep, int isdir)
+ace_allow_to_mode(uint32_t mask, o_mode_t *modep, boolean_t isdir)
 {
 	/* ACE_READ_ACL and ACE_READ_ATTRIBUTES must both be set */
 	if ((mask & (ACE_READ_ACL | ACE_READ_ATTRIBUTES)) !=
@@ -1044,7 +1045,7 @@
 
 static int
 acevals_to_aent(acevals_t *vals, aclent_t *dest, ace_list_t *list,
-    uid_t owner, gid_t group, int isdir)
+    uid_t owner, gid_t group, boolean_t isdir)

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107221820.p6MIK1aO030419>