summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/Changes6
-rw-r--r--Documentation/Configure.help82
-rw-r--r--Documentation/cachetlb.txt28
3 files changed, 103 insertions, 13 deletions
diff --git a/Documentation/Changes b/Documentation/Changes
index 4521da0de42e..0b2f66e6f91e 100644
--- a/Documentation/Changes
+++ b/Documentation/Changes
@@ -335,9 +335,9 @@ o <ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/testing/isdn4k-utils.v3.1beta7.
Netfilter
---------
-o <http://netfilter.filewatcher.org/iptables-1.1.1.tar.bz2>
-o <http://www.samba.org/netfilter/iptables-1.1.1.tar.bz2>
-o <http://netfilter.kernelnotes.org/iptables-1.1.1.tar.bz2>
+o <http://netfilter.filewatcher.org/iptables-1.2.tar.bz2>
+o <http://netfilter.samba.org/iptables-1.2.tar.bz2>
+o <http://netfilter.kernelnotes.org/iptables-1.2.tar.bz2>
Ip-route2
---------
diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index 9381fcf0de6a..bfe48e9ba811 100644
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -2069,6 +2069,72 @@ CONFIG_INET_ECN
If in doubt, say N.
+IP6 tables support (required for filtering/masq/NAT)
+CONFIG_IP6_NF_IPTABLES
+ ip6tables is a general, extensible packet identification framework.
+ Currently only the packet filtering and packet mangling subsystem
+ for IPv6 use this, but connection tracking is going to follow.
+ Say 'Y' or 'M' here if you want to use either of those.
+
+ If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. If unsure, say `N'.
+
+IPv6 limit match support
+CONFIG_IP6_NF_MATCH_LIMIT
+ limit matching allows you to control the rate at which a rule can be
+ matched: mainly useful in combination with the LOG target ("LOG
+ target support", below) and to avoid some Denial of Service attacks.
+
+ If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. If unsure, say `N'.
+
+MAC address match support
+CONFIG_IP6_NF_MATCH_MAC
+ mac matching allows you to match packets based on the source
+ ethernet address of the packet.
+
+ If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. If unsure, say `N'.
+
+netfilter mark match support
+CONFIG_IP6_NF_MATCH_MARK
+ Netfilter mark matching allows you to match packets based on the
+ `nfmark' value in the packet. This can be set by the MARK target
+ (see below).
+
+ If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. If unsure, say `N'.
+
+Packet filtering
+CONFIG_IP6_NF_FILTER
+ Packet filtering defines a table `filter', which has a series of
+ rules for simple packet filtering at local input, forwarding and
+ local output. See the man page for iptables(8).
+
+ If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. If unsure, say `N'.
+
+Packet mangling
+CONFIG_IP6_NF_MANGLE
+ This option adds a `mangle' table to iptables: see the man page for
+ iptables(8). This table is used for various packet alterations
+ which can effect how the packet is routed.
+
+ If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. If unsure, say `N'.
+
+MARK target support
+CONFIG_IP6_NF_TARGET_MARK
+ This option adds a `MARK' target, which allows you to create rules
+ in the `mangle' table which alter the netfilter mark (nfmark) field
+ associated with the packet packet prior to routing. This can change
+ the routing method (see `IP: use netfilter MARK value as routing
+ key') and can also be used by other subsystems to change their
+ behavior.
+
+ If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. If unsure, say `N'.
+
SYN flood protection
CONFIG_SYN_COOKIES
Normal TCP/IP networking is open to an attack known as "SYN
@@ -13266,7 +13332,7 @@ CONFIG_ACPI
This support requires an ACPI compliant platform (hardware/firmware).
If both ACPI and Advanced Power Management (APM) support are
- configured, ACPI is used.
+ configured, whichever is loaded first shall be used.
This code DOES NOT currently provide a complete OSPM implementation --
it has not yet reached APM's level of functionality. When fully
@@ -17004,6 +17070,20 @@ CONFIG_DISPLAY7SEG
another UltraSPARC-IIi-cEngine boardset with a 7-segment display,
you should say N to this option.
+CP1XXX Hardware Watchdog support
+CONFIG_WATCHDOG_CP1XXX
+ This is the driver for the hardware watchdog timers present on
+ Sun Microsystems CompactPCI models CP1400 and CP1500.
+
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ The module will be called cpwatchdog.o. If you want to compile it
+ as a module, say M here and read Documentation/modules.txt.
+
+ If you do not have a CompactPCI model CP1400 or CP1500, or
+ another UltraSPARC-IIi-cEngine boardset with hardware watchdog,
+ you should say N to this option.
+
IA-64 system type
CONFIG_IA64_GENERIC
This selects the system type of your hardware. A "generic" kernel
diff --git a/Documentation/cachetlb.txt b/Documentation/cachetlb.txt
index f3ae78497971..c47cd632d964 100644
--- a/Documentation/cachetlb.txt
+++ b/Documentation/cachetlb.txt
@@ -167,7 +167,7 @@ Here are the routines, one by one:
This interface flushes an entire user address space from
the caches. That is, after running, there will be no cache
- lines assosciated with 'mm'.
+ lines associated with 'mm'.
This interface is used to handle whole address space
page table operations such as what happens during
@@ -209,7 +209,7 @@ require a whole different set of interfaces to handle properly.
The biggest problem is that of virtual aliasing in the data cache
of a processor.
-Is your port subsceptible to virtual aliasing in it's D-cache?
+Is your port susceptible to virtual aliasing in it's D-cache?
Well, if your D-cache is virtually indexed, is larger in size than
PAGE_SIZE, and does not prevent multiple cache lines for the same
physical address from existing at once, you have this problem.
@@ -221,6 +221,9 @@ size). This setting will force the SYSv IPC layer to only allow user
processes to mmap shared memory at address which are a multiple of
this value.
+NOTE: This does not fix shared mmaps, check out the sparc64 port for
+one way to solve this (in particular SPARC_FLAG_MMAPSHARED).
+
Next, you have two methods to solve the D-cache aliasing issue for all
other cases. Please keep in mind that fact that, for a given page
mapped into some user address space, there is always at least one more
@@ -240,7 +243,7 @@ existing ports should move over to the new mechanism as well.
The physical page 'page' is about to be place into the
user address space of a process. If it is possible for
stores done recently by the kernel into this physical
- page, to not be visible to an arbitray mapping in userspace,
+ page, to not be visible to an arbitrary mapping in userspace,
you must flush this page from the D-cache.
If the D-cache is writeback in nature, the dirty data (if
@@ -266,7 +269,7 @@ Here is the new interface:
For example, a port may temporarily map 'from' and 'to' to
kernel virtual addresses during the copy. The virtual address
- for these two pages is choosen in such a way that the kernel
+ for these two pages is chosen in such a way that the kernel
load/store instructions happen to virtual addresses which are
of the same "color" as the user mapping of the page. Sparc64
for example, uses this technique.
@@ -306,7 +309,7 @@ Here is the new interface:
simply be defined as a nop on that architecture.
There is a bit set aside in page->flags (PG_arch_1) as
- "architecture private". The kernel guarentees that,
+ "architecture private". The kernel guarantees that,
for pagecache pages, it will clear this bit when such
a page first enters the pagecache.
@@ -323,7 +326,14 @@ Here is the new interface:
update_mmu_cache(), a check is made of this flag bit, and if
set the flush is done and the flag bit is cleared.
-XXX Not documented: flush_icache_page(), need to talk to Paul
- Mackerras, David Mosberger-Tang, et al.
- to see what the expected semantics of this
- interface are. -DaveM
+ void flush_icache_range(unsigned long start, unsigned long end)
+ When the kernel stores into addresses that it will execute
+ out of (eg when loading modules), this function is called.
+
+ If the icache does not snoop stores then this routine will need
+ to flush it.
+
+ void flush_icache_page(struct vm_area_struct *vma, struct page *page)
+ All the functionality of flush_icache_page can be implemented in
+ flush_dcache_page and update_mmu_cache. In 2.5 the hope is to
+ remove this interface completely.