diff options
| author | attilio <attilio@FreeBSD.org> | 2013-01-09 11:58:47 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2013-01-09 11:58:47 +0000 |
| commit | 561dd1163dbb481d204da7a526739ac6e43d08f2 (patch) | |
| tree | a0bb5397cf6520f42738cd6bdab4a0dc32e343f2 /sys/i386 | |
| parent | fcadd67d75edc1dd5239b272370d22ec35df1669 (diff) | |
| parent | b63b7017bb1a90be6087cf288cd64b04b1d65fe4 (diff) | |
| download | FreeBSD-src-561dd1163dbb481d204da7a526739ac6e43d08f2.zip FreeBSD-src-561dd1163dbb481d204da7a526739ac6e43d08f2.tar.gz | |
MFC
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/conf/GENERIC | 10 | ||||
| -rw-r--r-- | sys/i386/xen/xen_machdep.c | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 76d09dd..3a808ba 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -37,6 +37,7 @@ options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists options UFS_DIRHASH # Improve performance on big directories options UFS_GJOURNAL # Enable gjournal-based UFS journaling +options QUOTA # Enable disk quotas for UFS options MD_ROOT # MD is a potential root device options NFSCL # New Network Filesystem Client options NFSD # New Network Filesystem Server @@ -331,15 +332,6 @@ device usb # USB Bus (required) device ukbd # Keyboard device umass # Disks/Mass storage - Requires scbus and da -# FireWire support -device firewire # FireWire bus code -# sbp(4) works for some systems but causes boot failure on others -#device sbp # SCSI over FireWire (Requires scbus and da) -device fwe # Ethernet over FireWire (non-standard!) -device fwip # IP over FireWire (RFC 2734,3146) -device dcons # Dumb console driver -device dcons_crom # Configuration ROM for dcons - # Sound support device sound # Generic sound driver (required) device snd_cmi # CMedia CMI8338/CMI8738 diff --git a/sys/i386/xen/xen_machdep.c b/sys/i386/xen/xen_machdep.c index f197976..3b3da6f 100644 --- a/sys/i386/xen/xen_machdep.c +++ b/sys/i386/xen/xen_machdep.c @@ -216,7 +216,9 @@ static mmu_update_t xpq_queue[MAX_VIRT_CPUS][XPQUEUE_SIZE]; #else static mmu_update_t xpq_queue[XPQUEUE_SIZE]; +#ifdef INVARIANTS static struct mmu_log xpq_queue_log[XPQUEUE_SIZE]; +#endif static int xpq_idx = 0; #define XPQ_QUEUE_LOG xpq_queue_log |
