From 825423e4c4f18289df2393951cfd2a7a31fc0464 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 31 Jan 2001 22:22:27 +0000 Subject: Merge with Linux 2.4.1. --- Documentation/Changes | 8 +- Documentation/Configure.help | 166 ++++++++++++++++++++++++++++++++------- Documentation/cachetlb.txt | 28 ++++--- Documentation/usb/hotplug.txt | 19 +++-- Documentation/usb/usb-serial.txt | 2 +- 5 files changed, 174 insertions(+), 49 deletions(-) (limited to 'Documentation') diff --git a/Documentation/Changes b/Documentation/Changes index 91c60eee1..0b2f66e6f 100644 --- a/Documentation/Changes +++ b/Documentation/Changes @@ -56,7 +56,7 @@ o modutils 2.4.0 # insmod -V o e2fsprogs 1.19 # tune2fs --version o pcmcia-cs 3.1.21 # cardmgr -V o PPP 2.4.0 # pppd --version -o isdn4k-utils 3.1beta7 # isdnctrl 2>&1|grep version +o isdn4k-utils 3.1pre1 # isdnctrl 2>&1|grep version Kernel compilation ================== @@ -335,9 +335,9 @@ o -o -o +o +o +o Ip-route2 --------- diff --git a/Documentation/Configure.help b/Documentation/Configure.help index 05c0930ca..a6e9caa73 100644 --- a/Documentation/Configure.help +++ b/Documentation/Configure.help @@ -1450,15 +1450,6 @@ CONFIG_BLK_DEV_LVM want), say M here and read Documentation/modules.txt. The module will be called lvm-mod.o. -Logical Volume Manager /proc file system information -CONFIG_LVM_PROC_FS - If you say Y here, you are able to access overall Logical Volume - Manager, Volume Group, Logical and Physical Volume information in - /proc/lvm. - - To use this option, you have to check, that the "/proc file system - support" (CONFIG_PROC_FS) is enabled too. - Multiple devices driver support CONFIG_BLK_DEV_MD This driver lets you combine several hard disk partitions into one @@ -1565,20 +1556,6 @@ CONFIG_MD_RAID5 If unsure, say Y. -RAID Boot support -CONFIG_MD_BOOT - To boot with an initial raid volume (any type) you can select - autodetect, or answer Y here and appropriate options to the kernel - at boot time. - For lilo and loadlin options see the file Documentation/md.txt. - -RAID AutoDetect support -CONFIG_AUTODETECT_RAID - An alternative to "Raid Boot support" is autodetect support. - With this selected, any partitons of type 0xFD will be considered for - inclusion in a RAID array. Information in the RAID-superblock on - the partition will determine how it is included. - Support for Acer PICA 1 chipset CONFIG_ACER_PICA_61 This is a machine with a R4400 133/150 MHz CPU. To compile a Linux @@ -2086,6 +2063,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 @@ -2642,13 +2685,14 @@ CONFIG_HOTPLUG One well known example of this is PCMCIA- or PC-cards, credit-card size devices such as network cards, modems or hard drives which are - plugged into slots found on all modern laptop computers. + plugged into slots found on all modern laptop computers. Another + example, used on modern desktops as well as laptops, is USB. - Another example, used on modern desktops as well as laptops, is USB. - Enable HOTPLUG with USB and KMOD, and your kernel will automatically - call out to a user mode "policy agent" to load modules and set up - software needed to use USB devices you plug in. Get agent software - (at http://www.linux-usb.org/policy.html) and install it. + Enable HOTPLUG and KMOD, and build a modular kernel. Get agent + software (at http://linux-hotplug.sourceforge.net) and install it. + Then your kernel will automatically call out to a user mode "policy + agent" (/sbin/hotplug) to load modules and set up software needed + to use devices as you hotplug them. PCMCIA/Cardbus support CONFIG_PCMCIA @@ -10762,6 +10806,46 @@ CONFIG_MINIX_FS called minix.o. Note that the file system of your root partition (the one containing the directory /) cannot be compiled as a module. +Reiserfs support +CONFIG_REISERFS_FS + + Stores not just filenames but the files themselves in a balanced + tree. Uses journaling. + + Balanced trees are more efficient than traditional + filesystem architectural foundations. + + You can use reiserfs in all cases where you use the ext2fs file + system, and you will gain in speed and disk space. It has fewer + worst case performance situations than other file systems + because balanced trees are hardier creatures than other algorithms + are (if that is not technical enough, read www.namesys.com....:-) ) + + It is more easily extended to have features currently found in + database and keyword search systems than block allocation based + filesystems are. The next version will be so extended, and will + support plugins consistent with our motto ``It takes more than a + license to make source code open.'' + + Read www.namesys.com to learn more about reiserfs. + + Sponsored by Threshold Networks, Emusic.com, and Bigstorage.com. + + If you like it, you can pay us to add new features to it that you + need, buy a support contract, or pay us to port it to another OS. + +Enable Reiserfs consistency checks +CONFIG_REISERFS_CHECK + If you set this to yes, then ReiserFS will perform every check it + can possibly imagine of its internal consistency throughout its + operation. It will also go substantially slower. More than once we + have forgotten that this was on, and then gone despondent over the + latest benchmarks.:-) Use of this option allows our team to go all + out in checking for consistency when debugging without fear of its + effect on end users. If you are on the verge of sending in a bug + report, say yes and you might get a useful error message. Almost + everyone should say no. + Second extended fs support CONFIG_EXT2_FS This is the de facto standard Linux file system (method to organize @@ -13242,7 +13326,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 @@ -14644,6 +14728,14 @@ CONFIG_ISDN_PPP_VJ This enables Van Jacobson header compression for synchronous PPP. Say Y if the other end of the connection supports it. +CONFIG_ISDN_PPP_BSDCOMP + Support for the BSD-Compress compression method for PPP, which uses + the LZW compression method to compress each PPP packet before it is + sent over the wire. The machine at the other end of the PPP link + (usually your ISP) has to support the BSD-Compress compression + method as well for this to be useful. Even if they don't support it, + it is safe to say Y here. + Support audio via ISDN CONFIG_ISDN_AUDIO If you say Y here, the modem-emulator will support a subset of the @@ -16980,6 +17072,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 f3ae78497..c47cd632d 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. diff --git a/Documentation/usb/hotplug.txt b/Documentation/usb/hotplug.txt index a526ffc67..0b95e275b 100644 --- a/Documentation/usb/hotplug.txt +++ b/Documentation/usb/hotplug.txt @@ -1,4 +1,4 @@ -USB HOTPLUGGING +LINUX HOTPLUGGING In hotpluggable busses like USB (and Cardbus PCI), end-users plug devices into the bus with power on. In most cases, users expect the devices to become @@ -8,7 +8,7 @@ immediately usable. That means the system must do many things, including: loading a kernel module; newer drivers can use modutils to publish their device (and class) support to user utilities. - - Bind a driver to that device. That's done using the USB + - Bind a driver to that device. Bus frameworks do that using a device driver's probe() routine. - Tell other subsystems to configure the new device. Print @@ -26,6 +26,10 @@ Those triggered actions must support a system's administrative policies; such programs are called "policy agents" here. Typically they involve shell scripts that dispatch to more familiar administration tools. +Because some of those actions rely on information about drivers (metadata) +that is currently available only when the drivers are dynamically linked, +you get the best hotplugging when you configure a highly modular system. + KERNEL HOTPLUG HELPER (/sbin/hotplug) @@ -40,9 +44,14 @@ some kernel event. That name is used as the first key for further event dispatch; any other argument and environment parameters are specified by the subsystem making that invocation. -A reference implementation of a /sbin/hotplug script is available at the -http://www.linux-usb.org website, which works USB for but also knows how to -delegate to any /etc/hotplug/$TYPE.agent policy agent present. +Hotplug software and other resources is available at: + + http://linux-hotplug.sourceforge.net + +Mailing list information is also available at that site. + + +-------------------------------------------------------------------------- USB POLICY AGENT diff --git a/Documentation/usb/usb-serial.txt b/Documentation/usb/usb-serial.txt index 2fc5ac8eb..e1371097b 100644 --- a/Documentation/usb/usb-serial.txt +++ b/Documentation/usb/usb-serial.txt @@ -223,7 +223,7 @@ Generic Serial driver To enable the generic driver to recognize your device, build the driver as a module and load it by the following invocation: - insmod usb-serial vendor=0x#### product=0x#### + insmod usbserial vendor=0x#### product=0x#### where the #### is replaced with the hex representation of your device's vendor id and product id. -- cgit v1.2.3