4,5c4,5
< # For more information on this file, please read the handbook section on
< # Kernel Configuration Files:
---
> # For more information on this file, please read the config(5) manual page,
> # and/or the handbook section on Kernel Configuration Files:
19c19
< # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.474.2.17.2.1 2009/04/15 03:14:26 kensmith Exp $
---
> # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.519.2.19 2012/03/31 10:47:40 marius Exp $
28a29,34
> # Use the following to compile in values accessible to the kernel
> # through getenv() (or kenv(1) in userland). The format of the file
> # is 'variable=value', see kenv(1)
> #
> # env         "GENERIC.env"
>
34c40
< #options      INET6                   # IPv6 communications protocols
---
> options       INET6                   # IPv6 communications protocols
52c58
< options       COMPAT_43TTY            # BSD 4.3 TTY compat [KEEP THIS!]
---
> options       COMPAT_43TTY            # BSD 4.3 TTY compat (sgtty)
62a69
> options       P1003_1B_SEMAPHORES     # POSIX-style semaphores
63a71
> options       PRINTF_BUFR_SIZE=128    # Prevent printf output being interspersed.
65,66c73
< #options      ADAPTIVE_GIANT          # Giant mutex is adaptive.
< #options      STOP_NMI                # Stop CPUS using NMI instead of IPI
---
> options       HWPMC_HOOKS             # Necessary kernel hooks for hwpmc(4)
67a75
> options       MAC                     # TrustedBSD MAC Framework
68a77
> options       INCLUDE_CONFIG_FILE     # Include this file in kernel
70,77c79,80
< ### upgrade to 8.0
< options        P1003_1B_SEMAPHORES
< options        PRINTF_BUFR_SIZE=128
< options        HWPMC_HOOKS
< options        MAC
< options        FLOWTABLE
< device         acpi
< ## END