diff options
| author | bz <bz@FreeBSD.org> | 2011-03-19 15:50:34 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2011-03-19 15:50:34 +0000 |
| commit | c41eae2d13dc4dcff4b2067fe307b4b6d965e468 (patch) | |
| tree | 26be20e949798d63e46f9ecf829f7eca290837f9 | |
| parent | f12f2f2a3d6fa2f70b63b68e2476ea4814196c0d (diff) | |
| download | FreeBSD-src-c41eae2d13dc4dcff4b2067fe307b4b6d965e468.zip FreeBSD-src-c41eae2d13dc4dcff4b2067fe307b4b6d965e468.tar.gz | |
For now remove options FLOWTABLE from the remaining GENERIC kernel
configurations and make it opt-in for those who want it. LINT will
still build it.
While it may be a perfect win in some scenarios, it still troubles users
(see PRs) in general cases. In addition we are still allocating resources
even if disabled by sysctl and still leak arp/nd6 entries in case of
interface destruction.
Discussed with: qingli (2010-11-24, just never executed)
Discussed with: juli (OCTEON1)
PR: kern/148018, kern/155604, kern/144917, kern/146792
MFC after: 2 weeks
| -rw-r--r-- | sys/amd64/conf/GENERIC | 1 | ||||
| -rw-r--r-- | sys/i386/conf/GENERIC | 1 | ||||
| -rw-r--r-- | sys/ia64/conf/GENERIC | 2 | ||||
| -rw-r--r-- | sys/mips/conf/OCTEON1 | 1 |
4 files changed, 0 insertions, 5 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 2f68f9e..eca47a8 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -61,7 +61,6 @@ options KBD_INSTALL_CDEV # install a CDEV entry in /dev options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing options MAC # TrustedBSD MAC Framework -options FLOWTABLE # per-cpu routing cache #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks options INCLUDE_CONFIG_FILE # Include this file in kernel diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index b709f36..6abc29c 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -62,7 +62,6 @@ options KBD_INSTALL_CDEV # install a CDEV entry in /dev options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing options MAC # TrustedBSD MAC Framework -options FLOWTABLE # per-cpu routing cache #options KDTRACE_HOOKS # Kernel DTrace hooks options INCLUDE_CONFIG_FILE # Include this file in kernel diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC index 03919cd..6c3c6a7 100644 --- a/sys/ia64/conf/GENERIC +++ b/sys/ia64/conf/GENERIC @@ -31,8 +31,6 @@ options COMPAT_FREEBSD7 # Compatible with FreeBSD7 options DDB # Support DDB options DEADLKRES # Enable the deadlock resolver options FFS # Berkeley Fast Filesystem -#options FLOWTABLE # per-cpu routing cache (removed due to - # misaligned access -- see kern/148018) options GDB # Support remote GDB options GEOM_LABEL # Provides labelization options INCLUDE_CONFIG_FILE # Include this file in kernel diff --git a/sys/mips/conf/OCTEON1 b/sys/mips/conf/OCTEON1 index 844a2ae..421297d 100644 --- a/sys/mips/conf/OCTEON1 +++ b/sys/mips/conf/OCTEON1 @@ -73,7 +73,6 @@ options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed. options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing options MAC # TrustedBSD MAC Framework -options FLOWTABLE # per-cpu routing cache #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks options INCLUDE_CONFIG_FILE # Include this file in kernel |
