summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjdike <jdike>2003-02-27 18:56:14 +0000
committerjdike <jdike>2003-02-27 18:56:14 +0000
commit401ac4aa613dc317ea3868536df394e54a814566 (patch)
treea8c99fbc1aae8d1376d9c9e2df905270a61d0d39
parentd812b5af82f1cbb6261a7b25f025f92ed4a77004 (diff)
downloaduml-history-401ac4aa613dc317ea3868536df394e54a814566.tar.gz
Updated UML to 2.4.20.v_2_4_20_1
Diffstat
-rw-r--r--CREDITS21
-rw-r--r--Documentation/Configure.help1534
-rw-r--r--MAINTAINERS103
-rw-r--r--Makefile12
-rw-r--r--arch/um/Makefile2
-rw-r--r--arch/um/config.in2
-rw-r--r--arch/um/fs/hostfs/hostfs_kern.c2
-rw-r--r--arch/um/fs/hppfs/hppfs_kern.c2
-rw-r--r--arch/um/kernel/sys_call_table.c38
-rw-r--r--drivers/char/Makefile23
-rw-r--r--drivers/char/tty_io.c29
-rw-r--r--include/asm-um/system-i386.h31
-rw-r--r--include/asm-um/timex.h3
-rw-r--r--include/linux/fs.h10
-rw-r--r--include/linux/kernel.h9
-rw-r--r--include/linux/kernel_stat.h16
-rw-r--r--include/linux/tty.h60
-rw-r--r--init/do_mounts.c83
-rw-r--r--kernel/panic.c2
-rw-r--r--mm/mmap.c4
-rw-r--r--mm/slab.c13
21 files changed, 1589 insertions, 410 deletions
diff --git a/CREDITS b/CREDITS
index cb14f29..64dac68 100644
--- a/CREDITS
+++ b/CREDITS
@@ -705,6 +705,11 @@ S: 3000 FORE Drive
S: Warrendale, Pennsylvania 15086
S: USA
+N: Martin Devera
+E: devik@cdi.cz
+W: http://luxik.cdi.cz/~devik/qos/
+D: HTB qdisc and random networking hacks
+
N: Alex deVries
E: adevries@thepuffingroup.com
D: Various SGI parts, bits of HAL2 and Newport, PA-RISC Linux.
@@ -1259,7 +1264,7 @@ S: 14059 Berlin
S: Germany
N: David Hinds
-E: dhinds@zen.stanford.edu
+E: dahinds@users.sourceforge.net
W: http://tao.stanford.edu/~dhinds
D: PCMCIA and CardBus stuff, PCMCIA-HOWTO, PCMCIA client drivers
S: 2019 W. Middlefield Rd #1
@@ -1330,6 +1335,12 @@ S: 998 East 900 South, Suite 26
S: Provo, Utah 84606-5607
S: USA
+N: Marcel Holtmann
+E: marcel@holtmann.org
+W: http://www.holtmann.org
+D: Author of the Linux Bluetooth Subsystem PC Card drivers
+S: Germany
+
N: Rob W. W. Hooft
E: hooft@EMBL-Heidelberg.DE
D: Shared libs for graphics-tools and for the f2c compiler
@@ -2155,7 +2166,7 @@ S: Fullarton 5063
S: South Australia
N. Wolfgang Muees
-E: wmues@nexgo.de
+E: wolfgang@iksw-muees.de
D: Auerswald USB driver
N: Ian A. Murdock
@@ -2336,8 +2347,8 @@ D: implemented kmod
D: modularized BSD Unix domain sockets
N: Martin Kasper Petersen
-E: mkp@linuxcare.com
E: mkp@mkp.net
+D: forte FM801 audio driver
D: PA-RISC port
D: XFS file system
D: kiobuf based block I/O work
@@ -3312,14 +3323,10 @@ S: D-73732 Esslingen
S: Germany
N: Leonard N. Zubkoff
-E: lnz@dandelion.com
W: http://www.dandelion.com/Linux/
D: BusLogic SCSI driver
D: Mylex DAC960 PCI RAID driver
D: Miscellaneous kernel fixes
-S: 3078 Sulphur Spring Court
-S: San Jose, California 95148
-S: USA
N: Alessandro Zummo
E: azummo@ita.flashnet.it
diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index 997f7bb..939603a 100644
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -2,10 +2,7 @@
# Eric S. Raymond <mailto:esr@thyrsus.com>
# Steven Cole <mailto:elenstev@mesatop.com>
#
-# Version 3.00: current with 2.4.19
-#
-# This version of the Linux kernel configuration help texts
-# corresponds to kernel versions 2.4.x and 2.5.x.
+# Version 3.01: current with 2.4.19+
#
# Translations of this file available on the WWW:
#
@@ -233,6 +230,22 @@ CONFIG_CRIS
network and embedded applications. For more information see the
Axis Communication site, <http://developer.axis.com/>.
+Unsynced TSC support
+CONFIG_X86_TSC_DISABLE
+ This option is used for getting Linux to run on a NUMA multi-node
+ boxes, laptops and other systems suffering from unsynced TSCs or
+ TSC drift, which can cause gettimeofday to return non-monotonic values.
+ Choosing this option will disable the CONFIG_X86_TSC optimization,
+ and allows you to then specify "notsc" as a boot option regardless of
+ which processor you have compiled for.
+
+ NOTE: If your system hangs when init should run, you are probably
+ using a i686 compiled glibc which reads the TSC without checking for
+ availability. Boot without "notsc" and install a i386 compiled glibc
+ to solve the problem.
+
+ If unsure, say N.
+
Multiquad support for NUMA systems
CONFIG_MULTIQUAD
This option is used for getting Linux to run on a (IBM/Sequent) NUMA
@@ -376,6 +389,12 @@ CONFIG_HIGHMEM64G
Select this if you have a 32-bit processor and more than 4
gigabytes of physical RAM.
+HIGHMEM I/O support
+CONFIG_HIGHIO
+ If you want to be able to do I/O to high memory pages, say Y.
+ Otherwise low memory pages are used as bounce buffers causing a
+ degrade in performance.
+
Normal floppy disk support
CONFIG_BLK_DEV_FD
If you want to use the floppy disk drive(s) of your PC under Linux,
@@ -494,7 +513,7 @@ Micro Memory MM5415 Battery Backed RAM support (EXPERIMENTAL)
CONFIG_BLK_DEV_UMEM
Saying Y here will include support for the MM5415 family of
battery backed (Non-volatile) RAM cards.
- http://www.umem.com/
+ <http://www.umem.com/>
The cards appear as block devices that can be partitioned into
as many as 15 partitions.
@@ -534,6 +553,17 @@ CONFIG_BLK_DEV_NBD
If unsure, say N.
+Per partition statistics in /proc/partitions
+CONFIG_BLK_STATS
+ If you say yes here, your kernel will keep statistical information
+ for every partition. The information includes things as numbers of
+ read and write accesses, the number of merged requests etc.
+
+ This is required for the full functionality of sar(8) and interesting
+ if you want to do performance tuning, by tweaking the elevator, e.g.
+
+ If unsure, say N.
+
ATA/IDE/MFM/RLL support
CONFIG_IDE
If you say Y here, your kernel will be able to manage low cost mass
@@ -671,6 +701,12 @@ CONFIG_BLK_DEV_IDECS
Support for outboard IDE disks, tape drives, and CD-ROM drives
connected through a PCMCIA card.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ ide-cs.o
+
Include IDE/ATAPI CD-ROM support
CONFIG_BLK_DEV_IDECD
If you have a CD-ROM drive using the ATAPI protocol, say Y. ATAPI is
@@ -817,6 +853,12 @@ CONFIG_BLK_DEV_IDESCSI
If both this SCSI emulation and native ATAPI support are compiled
into the kernel, the native support will be used.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ ide-scsi.o
+
Use the NOOP Elevator (WARNING)
CONFIG_BLK_DEV_ELEVATOR_NOOP
If you are using a raid class top-level driver above the ATA/IDE core,
@@ -1004,6 +1046,11 @@ CONFIG_BLK_DEV_3W_XXXX_RAID
Please read the comments at the top of
<file:drivers/scsi/3w-xxxx.c>.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called 3w-xxxx.o.
+
AEC62XX chipset support
CONFIG_BLK_DEV_AEC62XX
This driver adds up to 4 more EIDE devices sharing a single
@@ -1067,10 +1114,10 @@ CONFIG_AMD74XX_OVERRIDE
This effect can be also invoked by calling "idex=ata66"
If unsure, say N.
-CMD64X chipset support
+CMD64X and CMD680 chipset support
CONFIG_BLK_DEV_CMD64X
Say Y here if you have an IDE controller which uses any of these
- chipsets: CMD643, CMD646, or CMD648.
+ chipsets: CMD643, CMD646, CMD648, CMD649 or CMD680.
CY82C693 chipset support
CONFIG_BLK_DEV_CY82C693
@@ -1796,6 +1843,12 @@ CONFIG_BLK_DEV_MD
<http://www.tldp.org/docs.html#howto>. There you will also learn
where to get the supporting user space utilities raidtools.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ md.o
+
If unsure, say N.
Linear (append) mode
@@ -1885,6 +1938,12 @@ CONFIG_MD_MULTIPATH
transparent failover to the backup path(s) happens if a IO errors
arrives on the primary path.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ multipath.o
+
If unsure, say N.
Support for IDE Raid controllers
@@ -1899,6 +1958,12 @@ CONFIG_BLK_DEV_ATARAID
has its own Raid drivers, which you should use if you need better
performance.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ ataraid.o
+
Support Promise software RAID (Fasttrak(tm))
CONFIG_BLK_DEV_ATARAID_PDC
Say Y or M if you have a Promise Fasttrak (tm) Raid controller
@@ -2493,6 +2558,17 @@ CONFIG_IP_NF_MATCH_LIMIT
If you want to compile it as a module, say M here and read
<file:Documentation/modules.txt>. If unsure, say `N'.
+skb->pkt_type packet match support
+CONFIG_IP_NF_MATCH_PKTTYPE
+ This patch allows you to match packet in accrodance
+ to its "class", eg. BROADCAST, MULTICAST, ...
+
+ Typical usage:
+ iptables -A INPUT -m pkttype --pkt-type broadcast -j LOG
+
+ 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_IP_NF_MATCH_MAC
MAC matching allows you to match packets based on the source
@@ -2543,6 +2619,28 @@ CONFIG_IP_NF_MATCH_AH_ESP
If you want to compile it as a module, say M here and read
Documentation/modules.txt. If unsure, say `N'.
+DSCP match support
+CONFIG_IP_NF_MATCH_DSCP
+ This option adds a `DSCP' match, which allows you to match against
+ the IPv4 header DSCP field (DSCP codepoint).
+
+ The DSCP codepoint can have any value between 0x0 and 0x4f.
+
+ If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. If unsure, say `N'.
+
+
+
+ECN match support
+CONFIG_IP_NF_MATCH_ECN
+ This option adds a `ECN' match, which allows you to match against
+ the IPv4 and TCP header ECN fields.
+
+ If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. If unsure, say `N'.
+
+
+
TOS match support
CONFIG_IP_NF_MATCH_TOS
TOS matching allows you to match packets based on the Type Of
@@ -2551,6 +2649,18 @@ CONFIG_IP_NF_MATCH_TOS
If you want to compile it as a module, say M here and read
<file:Documentation/modules.txt>. If unsure, say `N'.
+conntrack match support
+CONFIG_IP_NF_MATCH_CONNTRACK
+ This is a general conntrack match module, a superset of the state match.
+
+ It allows matching on additional conntrack information, which is
+ useful in complex configurations, such as NAT gateways with multiple
+ internet links or tunnels.
+
+ If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. If unsure, say `N'.
+
+
Connection state match support
CONFIG_IP_NF_MATCH_STATE
Connection state matching allows you to match packets based on their
@@ -2610,7 +2720,7 @@ CONFIG_IP_NF_NAT_LOCAL
Please note that you will need a recent version (>= 1.2.6a)
of the iptables userspace program in order to use this feature.
- See http://www.iptables.org/ for download instructions.
+ See <http://www.iptables.org/> for download instructions.
If unsure, say 'N'.
@@ -2668,6 +2778,36 @@ CONFIG_IP_NF_MANGLE
If you want to compile it as a module, say M here and read
<file:Documentation/modules.txt>. If unsure, say `N'.
+DSCP target support
+CONFIG_IP_NF_TARGET_DSCP
+ This option adds a `DSCP' target, which allows you to create rules in
+ the iptables mangle table. The selected packet has the DSCP field set
+ to the hex value provided on the command line; unlike the TOS target
+ which will only set the legal values within ip.h.
+
+ The DSCP field can be set to any value between 0x0 and 0x4f. It does
+ take into account that bits 6 and 7 are used by ECN.
+
+ If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. If unsure, say `N'.
+
+
+
+ECN target support
+CONFIG_IP_NF_TARGET_ECN
+ This option adds a `ECN' target, which can be used in the iptables mangle
+ table.
+
+ You can use this target to remove the ECN bits from the IPv4 header of
+ an IP packet. This is particularly useful, if you need to work around
+ existing ECN blackholes on the internet, but don't want to disable
+ ECN support in general.
+
+ If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. If unsure, say `N'.
+
+
+
TOS target support
CONFIG_IP_NF_TARGET_TOS
This option adds a `TOS' target, which allows you to create rules in
@@ -2714,6 +2854,14 @@ CONFIG_IP_NF_TARGET_TCPMSS
If you want to compile it as a module, say M here and read
<file:Documentation/modules.txt>. If unsure, say `N'.
+Helper match support
+CONFIG_IP_NF_MATCH_HELPER
+ Helper matching allows you to match packets in dynamic connections
+ tracked by a conntrack-helper, ie. ip_conntrack_ftp
+
+ If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. If unsure, say `Y'.
+
TCPMSS match support
CONFIG_IP_NF_MATCH_TCPMSS
This option adds a `tcpmss' match, which allows you to examine the
@@ -2731,7 +2879,7 @@ CONFIG_IP_NF_TARGET_ULOG
which can only be viewed through syslog.
The appropriate userspace logging daemon (ulogd) may be obtained from
- http://www.gnumonks.org/projects/ulogd
+ <http://www.gnumonks.org/projects/ulogd>
If you want to compile it as a module, say M here and read
Documentation/modules.txt. If unsure, say `N'.
@@ -2766,6 +2914,15 @@ CONFIG_IP_NF_COMPAT_IPFWADM
If you want to compile it as a module, say M here and read
<file:Documentation/modules.txt>. If unsure, say `N'.
+EUI64 address check (EXPERIMENTAL)
+CONFIG_IP6_NF_MATCH_EUI64
+ This module performs checking on the IPv6 source address
+ Compares the last 64 bits with the EUI64 (delivered
+ from the MAC address) address
+
+ 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
@@ -2774,6 +2931,14 @@ CONFIG_IP6_NF_MATCH_MAC
If you want to compile it as a module, say M here and read
<file:Documentation/modules.txt>. If unsure, say `N'.
+length match support
+CONFIG_IP6_NF_MATCH_LENGTH
+ This option allows you to match the length of a packet against a
+ specific value or range of values.
+
+ 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
@@ -3278,6 +3443,16 @@ CONFIG_PCMCIA_SERIAL_CS
a module, say M here and read <file:Documentation/modules.txt>.
If unsure, say N.
+CONFIG_SYNCLINK_CS
+ Enable support for the SyncLink PC Card serial adapter, running
+ asynchronous and HDLC communications up to 512Kbps. The port is
+ selectable for RS-232, V.35, RS-449, RS-530, and X.21
+
+ This driver may be built as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ The module will be called synclinkmp.o. If you want to do that, say M
+ here.
+
ACP Modem (Mwave) support
CONFIG_MWAVE
The ACP modem (Mwave) for Linux is a WinModem. It is composed of a
@@ -3511,6 +3686,16 @@ CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM
When in doubt, say N.
+ACPI PCI Hotplug driver
+CONFIG_HOTPLUG_PCI_ACPI
+ Say Y here if you have a system that supports PCI Hotplug using
+ ACPI.
+
+ This code 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 acpiphp.o. If you want to compile it
+ as a module, say M here and read <file:Documentation/modules.txt>.
+
MCA support
CONFIG_MCA
MicroChannel Architecture is found in some IBM PS/2 machines and
@@ -5007,6 +5192,12 @@ CONFIG_PARPORT_PC_PCMCIA
Say Y here if you need PCMCIA support for your PC-style parallel
ports. If unsure, say N.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ parport_cs.o
+
Support foreign hardware
CONFIG_PARPORT_OTHER
Say Y here if you want to be able to load driver modules to support
@@ -5311,6 +5502,12 @@ CONFIG_NET_IPIP
be inserted in and removed from the running kernel whenever you
want). Most people won't need this and can say N.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ ipip.o
+
GRE tunnels over IP
CONFIG_NET_IPGRE
Tunneling means encapsulating data of one protocol type within
@@ -5323,6 +5520,12 @@ CONFIG_NET_IPGRE
tunneling" above). In addition, GRE allows multicast redistribution
through the tunnel.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ ip_gre.o
+
Broadcast GRE over IP
CONFIG_NET_IPGRE_BROADCAST
One application of GRE/IP is to construct a broadcast WAN (Wide Area
@@ -5404,14 +5607,6 @@ CONFIG_IPV6
It is safe to say N here for now.
-# 2.5 tree only
-IPv6: routing messages via old netlink
-CONFIG_IPV6_NETLINK
- You can say Y here to receive routing messages from the IPv6 code
- through the old netlink interface. However, a better option is to
- say Y to "Kernel/User network link driver" and to "Routing
- messages" instead.
-
Kernel httpd acceleration
CONFIG_KHTTPD
The kernel httpd acceleration daemon (kHTTPd) is a (limited) web
@@ -5653,6 +5848,12 @@ CONFIG_LTPC
This driver is experimental, which means that it may not work.
See the file <file:Documentation/networking/ltpc.txt>.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ ltpc.o
+
COPS LocalTalk PC card support
CONFIG_COPS
This allows you to use COPS AppleTalk cards to connect to LocalTalk
@@ -5662,6 +5863,12 @@ CONFIG_COPS
networking support, above.
Please read the file <file:Documentation/networking/cops.txt>.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ cops.o
+
Dayna firmware support
CONFIG_COPS_DAYNA
Support COPS compatible cards with Dayna style firmware (Dayna
@@ -5810,6 +6017,11 @@ CONFIG_BPQETHER
useful if some other computer on your local network has a direct
amateur radio connection.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called bpqether.o.
+
High-speed (DMA) SCC driver for AX.25
CONFIG_DMASCC
This is a driver for high-speed SCC boards, i.e. those supporting
@@ -5874,9 +6086,10 @@ CONFIG_YAM
port and includes some of the functions of a Terminal Node
Controller. If you have one of those, say Y here.
- If you want to compile this as a module ( = code which can be
+ If you want to compile the driver as a module ( = code which can be
inserted in and removed from the running kernel whenever you want),
- say M here and read <file:Documentation/modules.txt>.
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called yam.o.
BAYCOM picpar and par96 driver for AX.25
CONFIG_BAYCOM_PAR
@@ -6166,34 +6379,6 @@ CONFIG_PACKET_MMAP
If unsure, say N.
-# 2.5 tree only
-Kernel/User network link driver
-CONFIG_NETLINK
- This driver allows for two-way communication between the kernel and
- user processes. It does so by creating a new socket family,
- PF_NETLINK. Over this socket, the kernel can send and receive
- datagrams carrying information. It is documented on many systems in
- netlink(7).
-
- So far, the kernel uses this feature to publish some network related
- information if you say Y to "Routing messages", below. You also need
- to say Y here if you want to use arpd, a daemon that helps keep the
- internal ARP cache (a mapping between IP addresses and hardware
- addresses on the local network) small. The ethertap device, which
- lets user space programs read and write raw Ethernet frames, also
- needs the network link driver.
-
- If unsure, say Y.
-
-# 2.5 tree only
-Routing messages
-CONFIG_RTNETLINK
- If you say Y here, user space programs can receive some network
- related routing information over the netlink. 'rtmon', supplied
- with the iproute2 package (<ftp://ftp.inr.ac.ru/>), can read and
- interpret this data. Information sent to the kernel over this link
- is ignored.
-
Netlink device emulation
CONFIG_NETLINK_DEV
This option will be removed soon. Any programs that want to use
@@ -6202,6 +6387,12 @@ CONFIG_NETLINK_DEV
the real netlink socket.
This is a backward compatibility option, choose Y for now.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ netlink_dev.o
+
Asynchronous Transfer Mode (ATM)
CONFIG_ATM
ATM is a high-speed networking technology for Local Area Networks
@@ -6540,6 +6731,12 @@ CONFIG_BLK_CPQ_CISS_DA
boards supported by this driver, and for further information
on the use of this driver.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ cciss.o
+
SCSI tape drive support for Smart Array 5xxx
CONFIG_CISS_SCSI_TAPE
When enabled (Y), this option allows SCSI tape drives and SCSI medium
@@ -7048,6 +7245,11 @@ CONFIG_SCSI_AIC7XXX
intended to replace the previous aic7xxx driver maintained by Doug
Ledford since Doug is no longer maintaining that driver.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called aic7xxx.o.
+
Adaptec I2O RAID support
CONFIG_SCSI_DPT_I2O
This driver supports all of Adaptec's I2O based RAID controllers as
@@ -7244,6 +7446,11 @@ CONFIG_SCSI_CPQFCTS
Say Y here to compile in support for the Compaq StorageWorks Fibre
Channel 64-bit/66Mhz Host Bus Adapter.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called cpqfc.o.
+
DMX3191D SCSI support
CONFIG_SCSI_DMX3191D
This is support for Domex DMX3191D SCSI Host Adapters.
@@ -7401,6 +7608,11 @@ CONFIG_SCSI_NCR_D700
Unless you have an NCR manufactured machine, the chances are that
you do not have this SCSI card, so say N.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called NCR_D700.o.
+
HP LASI SCSI support for 53c700/710
CONFIG_SCSI_LASI700
This is a driver for the lasi baseboard in some parisc machines
@@ -7469,6 +7681,11 @@ CONFIG_SCSI_SYM53C8XX_2
Please read <file:drivers/scsi/sym53c8xx_2/Documentation.txt> for more
information.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called sym53c8xx.o.
+
PCI DMA addressing mode
CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE
This option only applies to PCI-SCSI chip that are PCI DAC capable
@@ -7531,6 +7748,11 @@ CONFIG_SCSI_NCR53C8XX
Please read <file:drivers/scsi/README.ncr53c8xx> for more
information.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called ncr53c8xx.o.
+
SYM53C8XX Version 1 SCSI support
CONFIG_SCSI_SYM53C8XX
This driver supports all the features of recent 53C8XX chips (used
@@ -7556,6 +7778,11 @@ CONFIG_SCSI_SYM53C8XX
Please read <file:drivers/scsi/README.ncr53c8xx> for more
information.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called sym53c8xx.o.
+
Synchronous transfer frequency in MHz
CONFIG_SCSI_NCR53C8XX_SYNC
The SCSI Parallel Interface-2 Standard defines 5 classes of transfer
@@ -8128,10 +8355,10 @@ CONFIG_SCSI_GDTH
in the kernel source in <file:drivers/scsi/gdth.c> and
<file:drivers/scsi/gdth.h.>
- This driver is also available as a module ( = code which can be
- inserted in and removed from the running kernel whenever you want).
- If you want to compile it as a module, say M here and read
- <file:Documentation/modules.txt>.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called gdth.o.
IOMEGA parallel port (ppa - older drives)
CONFIG_SCSI_PPA
@@ -8221,6 +8448,11 @@ CONFIG_SCSI_DEBUG
important data. This is primarily of use to people trying to debug
the middle and upper layers of the SCSI subsystem. If unsure, say N.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called scsi_debug.o.
+
Fibre Channel and FC4 SCSI support
CONFIG_FC4
Fibre Channel is a high speed serial protocol mainly used to
@@ -8648,9 +8880,10 @@ CONFIG_PPP_ASYNC
a modem (not a synchronous or ISDN modem) to contact your ISP, you
need this option.
- This code is also available as a module (code which can be inserted
- into and removed from the running kernel). If you want to compile
- it as a module, say M here and read <file:Documentation/modules.txt>.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called ppp_async.o.
If unsure, say Y.
@@ -8660,10 +8893,10 @@ CONFIG_PPP_SYNC_TTY
(HDLC) tty devices, such as the SyncLink adapter. These devices
are often used for high-speed leased lines like T1/E1.
- This code is also available as a module (code which can be inserted
- into and removed from the running kernel). If you want to compile
- it as a module, say M here and read
- <file:Documentation/modules.txt>.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called ppp_synctty.o.
PPP Deflate compression
CONFIG_PPP_DEFLATE
@@ -8674,10 +8907,10 @@ CONFIG_PPP_DEFLATE
Deflate compression method as well for this to be useful. Even if
they don't support it, it is safe to say Y here.
- This code is also available as a module (code which can be inserted
- into and removed from the running kernel). If you want to compile
- it as a module, say M here and read
- <file:Documentation/modules.txt>.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called ppp_deflate.o.
PPP BSD-Compress compression
CONFIG_PPP_BSDCOMP
@@ -9096,6 +9329,11 @@ CONFIG_HERMES
configure your card and that /etc/pcmcia/wireless.opts works :
<http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called hermes.o.
+
Hermes 802.11b in PLX9052 based PCI adaptor support
CONFIG_PLX_HERMES
Enable support for PCMCIA cards supported by the "Hermes" (aka
@@ -9134,6 +9372,11 @@ CONFIG_PCMCIA_HERMES
configure your card and that /etc/pcmcia/wireless.opts works:
<http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called orinoco_cs.o.
+
Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards
CONFIG_AIRO
This is the standard Linux driver to support Cisco/Aironet ISA and
@@ -9168,6 +9411,11 @@ CONFIG_AIRO_CS
for location). You also want to check out the PCMCIA-HOWTO,
available from <http://www.tldp.org/docs.html#howto>.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called airo_cs.o.
+
Aviator/Raytheon 2.4MHz wireless support
CONFIG_PCMCIA_RAYCS
Say Y here if you intend to attach an Aviator/Raytheon PCMCIA
@@ -9353,6 +9601,11 @@ CONFIG_SYNCLINK_SYNCPPP
of the Cisco HDLC/PPP driver (syncppp.c).
The SyncLink WAN driver (in character devices) must also be enabled.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called syncppp.o.
+
FarSync T-Series X.21 (and V.35/V.24) cards
CONFIG_FARSYNC
This driver supports the FarSync T-Series X.21 (and V.35/V.24) cards
@@ -9558,6 +9811,20 @@ CONFIG_NET_SCH_CBQ
whenever you want). If you want to compile it as a module, say M
here and read <file:Documentation/modules.txt>.
+CONFIG_NET_SCH_HTB
+ Say Y here if you want to use the Hierarchical Token Buckets (HTB)
+ packet scheduling algorithm for some of your network devices. See
+ URL <http://luxik.cdi.cz/~devik/qos/htb/> for complete manual and
+ in-depth articles.
+
+ HTB is very similar to the CBQ regarding its goals however is has
+ different properties and different algorithm.
+
+ This code is also available as a module called sch_htb.o ( = code
+ which can be inserted in and removed from the running kernel
+ whenever you want). If you want to compile it as a module, say M
+ here and read <file:Documentation/modules.txt>.
+
CSZ packet scheduler
CONFIG_NET_SCH_CSZ
Say Y here if you want to use the Clark-Shenker-Zhang (CSZ) packet
@@ -9839,6 +10106,11 @@ CONFIG_HOSTESS_SV11
At this point, the driver can only be compiled as a module.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called hostess_sv11.o.
+
COSA/SRP sync serial board support
CONFIG_COSA
This is a driver for COSA and SRP synchronous serial boards. These
@@ -10133,7 +10405,7 @@ CONFIG_COMX_HW_MUNICH
Read linux/Documentation/networking/slicecom.txt for help on
configuring and using SliceCOM interfaces. Further info on these cards
- can be found at http://www.itc.hu or <info@itc.hu>.
+ can be found at <http://www.itc.hu> or <info@itc.hu>.
Support for HDLC and syncPPP protocols on MultiGate boards
CONFIG_COMX_PROTO_PPP
@@ -10207,6 +10479,11 @@ CONFIG_HDLC
Generic HDLC driver currently supports raw HDLC, Cisco HDLC, Frame
Relay, synchronous Point-to-Point Protocol (PPP) and X.25.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called hdlc.o.
+
If unsure, say N here.
Raw HDLC support
@@ -10259,6 +10536,11 @@ CONFIG_N2
Note that N2csu and N2dds cards are not supported by this driver.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called n2.o.
+
If unsure, say N here.
Moxa C101 support
@@ -10267,6 +10549,11 @@ CONFIG_C101
Technologies Co., Ltd. If you have such a card,
say Y here and see <http://hq.pm.waw.pl/pub/hdlc/>
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called c101.o.
+
If unsure, say N here.
Ethernet (10 or 100Mbit)
@@ -10474,12 +10761,14 @@ CONFIG_8139TOO_PIO
in case your mainboard has memory consistency issues. If unsure,
say N.
-Support for automatic channel equalization
+Support for uncommon RTL-8139 rev. K (automatic channel equalization)
CONFIG_8139TOO_TUNE_TWISTER
- This implements a function which might come in handy in case you are
- using low quality on long cabling. It tries to match the transceiver
- to the cable characteristics. This is experimental since hardly
- documented by the manufacturer. If unsure, say N.
+ This implements a function which might come in handy in case you
+ are using low quality on long cabling. It is required for RealTek
+ RTL-8139 revision K boards, and totally unused otherwise. It tries
+ to match the transceiver to the cable characteristics. This is
+ experimental since hardly documented by the manufacturer.
+ If unsure, say Y.
Support for older RTL-8129/8130 boards
CONFIG_8139TOO_8129
@@ -10488,6 +10777,14 @@ CONFIG_8139TOO_8129
instead of an internal one. Disabling this option will save some
memory by making the code size smaller. If unsure, say Y.
+Use older RX-reset method
+CONFIG_8139_OLD_RX_RESET
+ The 8139too driver was recently updated to contain a more rapid
+ reset sequence, in the face of severe receive errors. This "new"
+ RX-reset method should be adequate for all boards. But if you
+ experience problems, you can enable this option to restore the
+ old RX-reset behavior. If unsure, say N.
+
SiS 900/7016 PCI Fast Ethernet Adapter support
CONFIG_SIS900
This is a driver for the Fast Ethernet PCI network cards based on
@@ -10609,6 +10906,16 @@ CONFIG_SUNGEM
Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0. See also
<http://www.sun.com/products-n-solutions/hardware/docs/pdf/806-3985-10.pdf>.
+ This chip is also used by Apple under the name GMAC in all their recent
+ machines starting with the first iBook. This includes all AGP capable
+ Apple machines except some early G4s and iMacs that still used a
+ Tulip chip. This driver obsoletes the GMAC driver for these machines.
+
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called sungem.o.
+
Broadcom Tigon3 support
CONFIG_TIGON3
This driver supports Broadcom Tigon3 based gigabit Ethernet cards.
@@ -10639,6 +10946,123 @@ CONFIG_DL2K
say M here and read <file:Documentation/modules.txt>. This is
recommended. The module will be called dl2k.o.
+EtherExpress Pro/100 support (e100, Alternate Intel driver)
+CONFIG_E100
+ This driver supports Intel(R) PRO/100 family of adapters, which
+ includes:
+
+ Controller Adapter Name Board IDs
+ ---------- ------------ ---------
+
+ 82558 PRO/100+ PCI Adapter 668081-xxx,
+ 689661-xxx
+ 82558 PRO/100+ Management Adapter 691334-xxx,
+ 701738-xxx,
+ 721383-xxx
+ 82558 PRO/100+ Dual Port Server Adapter 714303-xxx,
+ 711269-xxx,
+ A28276-xxx
+ 82558 PRO/100+ PCI Server Adapter 710550-xxx
+ 82550 PRO/100 S Server Adapter 752438-xxx
+ 82559 A56831-xxx,
+ A10563-xxx,
+ A12171-xxx,
+ A12321-xxx,
+ A12320-xxx,
+ A12170-xxx
+ 748568-xxx
+ 748565-xxx
+ 82550 PRO/100 S Desktop Adapter 751767-xxx
+ 82559 748592-xxx,
+ A12167-xxx,
+ A12318-xxx,
+ A12317-xxx,
+ A12165-xxx,
+ 748569-xxx
+ 82559 PRO/100+ Server Adapter 729757-xxx
+ 82559 PRO/100 S Management Adapter 748566-xxx,
+ 748564-xxx
+ 82550 PRO/100 S Dual Port Server Adapter A56831-xxx
+ 82551 PRO/100 M Desktop Adapter A80897-xxx
+ PRO/100 S Advanced Management Adapter
+ 747842-xxx,
+ 745171-xxx
+ CNR PRO/100 VE Desktop Adapter A10386-xxx,
+ A10725-xxx,
+ A23801-xxx,
+ A19716-xxx
+ PRO/100 VM Desktop Adapter A14323-xxx,
+ A19725-xxx,
+ A23801-xxx,
+ A22220-xxx,
+ A23796-xxx
+
+
+ To verify that your adapter is supported, find the board ID number
+ on the adapter. Look for a label that has a barcode and a number
+ in the format 123456-001 (six digits hyphen three digits). Match
+ this to the list of numbers above.
+
+ For more information on how to identify your adapter, go to the
+ Adapter & Driver ID Guide at:
+
+ http://support.intel.com/support/network/adapter/pro100/21397.htm
+
+ For the latest Intel PRO/100 network driver for Linux, see:
+
+ http://appsr.intel.com/scripts-df/support_intel.asp
+
+ More specific information on configuring the driver is in
+ <file:Documentation/networking/e100.txt>.
+
+ 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 e100.o. If you want to compile it as a
+ module, say M here and read <file:Documentation/modules.txt> as well
+ as <file:Documentation/networking/net-modules.txt>.
+
+Intel(R) PRO/1000 Gigabit Ethernet support
+CONFIG_E1000
+ This driver supports Intel(R) PRO/1000 gigabit ethernet family of
+ adapters, which includes:
+
+ Controller Adapter Name Board IDs
+ ---------- ------------ ---------
+ 82542 PRO/1000 Gigabit Server Adapter 700262-xxx,
+ 717037-xxx
+ 82543 PRO/1000 F Server Adapter 738640-xxx,
+ A38888-xxx
+ 82543 PRO/1000 T Server Adapter A19845-xxx,
+ A33948-xxx
+ 82544 PRO/1000 XT Server Adapter A51580-xxx
+ 82544 PRO/1000 XF Server Adapter A50484-xxx
+ 82544 PRO/1000 T Desktop Adapter A62947-xxx
+ 82540 PRO/1000 MT Desktop Adapter A78408-xxx
+ 82545 PRO/1000 MT Server Adapter A92165-xxx
+ 82546 PRO/1000 MT Dual Port Server Adapter A92111-xxx
+ 82545 PRO/1000 MF Server Adapter A91622-xxx
+ 82545 PRO/1000 MF Server Adapter(LX) A91624-xxx
+ 82546 PRO/1000 MF Dual Port Server Adapter A91620-xxx
+
+ For more information on how to identify your adapter, go to the
+ Adapter & Driver ID Guide at:
+
+ <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+
+ For general information and support, go to the Intel support
+ website at:
+
+ <http://support.intel.com>
+
+ More specific information on configuring the driver is in
+ <file:Documentation/networking/e1000.txt>.
+
+ 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 e1000.o. If you want to compile it as a
+ module, say M here and read <file:Documentation/modules.txt> as well
+ as <file:Documentation/networking/net-modules.txt>.
+
AMD LANCE and PCnet (AT1500 and NE2100) support
CONFIG_LANCE
If you have a network (Ethernet) card of this type, say Y and read
@@ -10798,10 +11222,10 @@ CONFIG_VORTEX
<file:Documentation/networking/vortex.txt> and in the comments at
the beginning of <file:drivers/net/3c59x.c>.
- If you want to compile this as a module ( = code which can be
+ If you want to compile the driver as a module ( = code which can be
inserted in and removed from the running kernel whenever you want),
- say M here and read <file:Documentation/modules.txt> as well as
- <file:Documentation/networking/net-modules.txt>.
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called 3c59x.o.
Other ISA cards
CONFIG_NET_ISA
@@ -10852,6 +11276,11 @@ CONFIG_ARCNET_1051
documentation in <file:Documentation/networking/arcnet.txt> for more
information about using arc0e and arc0s.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called rfc1051.o.
+
Enable standard ARCNet packet format (RFC 1201)
CONFIG_ARCNET_1201
This allows you to use RFC1201 with your ARCnet card via the virtual
@@ -10861,12 +11290,22 @@ CONFIG_ARCNET_1201
ARCnet documentation in <file:Documentation/networking/arcnet.txt>
for more information about using arc0.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called rfc1201.o.
+
Enable raw mode packet interface
CONFIG_ARCNET_RAW
ARCnet "raw mode" packet encapsulation, no soft headers. Unlikely
to work unless talking to a copy of the same Linux arcnet driver,
but perhaps marginally faster in that case.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called arc-rawmode.o.
+
ARCnet COM90xx (normal) chipset driver
CONFIG_ARCNET_COM90xx
This is the chipset driver for the standard COM90xx cards. If you
@@ -11115,6 +11554,11 @@ CONFIG_NATSEMI
More specific information and updates are available from
<http://www.scyld.com/network/natsemi.html>.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called natsemi.o.
+
NatSemi workaround for high errors
CONFIG_NATSEMI_CABLE_MAGIC
Some systems see lots of errors with NatSemi ethernet controllers
@@ -11171,6 +11615,11 @@ CONFIG_IBMLANA
boards with this driver should be possible, but has not been tested
up to now due to lack of hardware.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called ibmlana.o.
+
EISA, VLB, PCI and on board controllers
CONFIG_NET_PCI
This is another class of network cards which attach directly to the
@@ -11340,12 +11789,22 @@ CONFIG_FEALNX
cards. Specifications and data at
<http://www.myson.com.hk/mtd/datasheet/>.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called fealnx.o.
+
LP486E on board Ethernet
CONFIG_LP486E
Say Y here to support the 82596-based on-board Ethernet controller
for the Panther motherboard, which is one of the two shipped in the
Intel Professional Workstation.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called lp486e.o.
+
ICL EtherTeam 16i/32 support
CONFIG_ETH16I
If you have a network (Ethernet) card of this type, say Y and read
@@ -11431,6 +11890,11 @@ CONFIG_EPIC100
More specific information and updates are available from
<http://www.scyld.com/network/epic100.html>.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called epic100.o.
+
DEC LANCE Ethernet controller support
CONFIG_DECLANCE
This driver is for the series of Ethernet controllers produced by
@@ -11448,6 +11912,19 @@ CONFIG_SUNDANCE
More specific information and updates are available from
<http://www.scyld.com/network/sundance.html>.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called sundance.o.
+
+Sundance Alta memory-mapped I/O support
+CONFIG_SUNDANCE_MMIO
+ Enable memory-mapped I/O for interaction with Sundance NIC registers.
+ Do NOT enable this by default, PIO (enabled when MMIO is disabled)
+ is known to solve bugs on certain chips.
+
+ If unsure, say N.
+
Sun3/Sun3x on-board LANCE support
CONFIG_SUN3LANCE
Most Sun3 and Sun3x motherboards (including the 3/50, 3/60 and 3/80)
@@ -11795,6 +12272,11 @@ CONFIG_DEFXX
This is support for the DIGITAL series of EISA (DEFEA) and PCI
(DEFPA) controllers which can connect you to a local FDDI network.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called defxx.o.
+
SysKonnect FDDI PCI support
CONFIG_SKFP
Say Y here if you have a SysKonnect FDDI PCI adapter.
@@ -12181,6 +12663,12 @@ CONFIG_MTD
them. It will also allow you to select individual drivers for
particular hardware and users of MTD devices. If unsure, say N.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ mtdcore.o
+
MTD debugging support
CONFIG_MTD_DEBUG
This turns on low-level debugging for the entire MTD sub-system.
@@ -12193,6 +12681,12 @@ CONFIG_MTD_PARTITIONS
a separate MTD device, you require this option to be enabled. If
unsure, say 'Y'.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ mtdpart.o
+
Note, however, that you don't need this option for the DiskOnChip
devices. Partitioning on NFTL 'devices' is a different - that's the
'normal' form of partitioning used on a block device.
@@ -12213,6 +12707,12 @@ CONFIG_MTD_REDBOOT_PARTS
SA1100 map driver (CONFIG_MTD_SA1100) has an option for this, for
example.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ redboot.o
+
Compaq bootldr partition table parsing
CONFIG_MTD_BOOTLDR_PARTS
The Compaq bootldr deals with multiple 'images' in flash devices
@@ -12254,6 +12754,12 @@ CONFIG_MTD_CHAR
memory chips, and also use ioctl() to obtain information about
the device, or to erase parts of it.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ mtdchar.o
+
Caching block device access to MTD devices
CONFIG_MTD_BLOCK
Although most flash chips have an erase size too large to be useful
@@ -12274,6 +12780,12 @@ CONFIG_MTD_BLOCK
You do not need this option for use with the DiskOnChip devices. For
those, enable NFTL support (CONFIG_NFTL) instead.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ mtdblock.o
+
Readonly block device access to MTD devices
CONFIG_MTD_BLOCK_RO
This allows you to mount read-only file systems (such as cramfs)
@@ -12283,6 +12795,12 @@ CONFIG_MTD_BLOCK_RO
You do not need this option for use with the DiskOnChip devices. For
those, enable NFTL support (CONFIG_NFTL) instead.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ mtdblock_ro.o
+
FTL (Flash Translation Layer) support
CONFIG_FTL
This provides support for the original Flash Translation Layer which
@@ -12297,6 +12815,12 @@ CONFIG_FTL
permitted to copy, modify and distribute the code as you wish. Just
not use it.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ ftl.o
+
NFTL (NAND Flash Translation Layer) support
CONFIG_NFTL
This provides support for the NAND Flash Translation Layer which is
@@ -12311,6 +12835,12 @@ CONFIG_NFTL
permitted to copy, modify and distribute the code as you wish. Just
not use it.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ nftl.o
+
Write support for NFTL (EXPERIMENTAL)
CONFIG_NFTL_RW
If you're lucky, this will actually work. Don't whinge if it
@@ -12327,6 +12857,12 @@ CONFIG_MTD_CFI
option. Visit <http://www.amd.com/products/nvd/overview/cfi.html>
for more information on CFI.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ cfi_probe.o
+
CFI Advanced configuration options
CONFIG_MTD_CFI_ADV_OPTIONS
If you need to specify a specific endianness for access to flash
@@ -12419,6 +12955,12 @@ CONFIG_MTD_SHARP
commands, including some which are not CFI-compatible and hence
cannot be used with the CONFIG_MTD_CFI_INTELxxx options.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ sharp.o
+
AMD compatible flash chip support (non-CFI)
CONFIG_MTD_AMDSTD
This option enables support for flash chips using AMD-compatible
@@ -12427,16 +12969,34 @@ CONFIG_MTD_AMDSTD
It also works on AMD compatible chips that do conform to CFI.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ amd_flash.o
+
Support for RAM chips in bus mapping
CONFIG_MTD_RAM
This option enables basic support for RAM chips accessed through
a bus mapping driver.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ map_ram.o
+
Support for ROM chips in bus mapping
CONFIG_MTD_ROM
This option enables basic support for ROM chips accessed through
a bus mapping driver.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ map_rom.o
+
JEDEC device support
CONFIG_MTD_JEDEC
Enable older older JEDEC flash interface devices for self
@@ -12446,6 +13006,12 @@ CONFIG_MTD_JEDEC
chips. WARNING!!!! This code does not compile and is incomplete as
are the specific JEDEC devices drivers.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ jedec.o
+
CFI Flash device mapped on StrongARM SA11x0
CONFIG_MTD_SA1100
This enables access to the flash chips on most platforms based on
@@ -12476,6 +13042,12 @@ CONFIG_MTD_PHYSMAP
configure the physical address and size of the flash chips on
your particular board as well as the bus width.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ physmap.o
+
Physical start location of flash chip mapping
CONFIG_MTD_PHYSMAP_START
This is the physical memory location at which the flash chips
@@ -12529,6 +13101,12 @@ CONFIG_MTD_SC520CDP
Dual-in-line JEDEC chip. This 'mapping' driver supports that
arrangement, implementing three MTD devices.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ sc520cdp.o
+
Flash chip mapping on Arcom Control Systems SBC-MediaGX
CONFIG_MTD_SBC_GXX
This provides a driver for the on-board flash of Arcom Control
@@ -12626,6 +13204,12 @@ CONFIG_MTD_OCTAGON
Computer. More information on the board is available at
<http://www.octagonsystems.com/Products/5066/5066.html>.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ octagon-5066.o
+
JEDEC Flash device mapped on Tempustech VMAX SBC301
CONFIG_MTD_VMAX
This provides a 'mapping' driver which supports the way in which
@@ -12633,11 +13217,23 @@ CONFIG_MTD_VMAX
Board Computer. More information on the board is available at
<http://www.tempustech.com/tt301.htm>.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ vmax301.o
+
Support for NAND flash devices
CONFIG_MTD_NAND
This enables support for accessing all type of NAND flash
devices.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ nand.o
+
Support for software ECC algorithm
CONFIG_MTD_NAND_ECC
This enables software-based ECC for use with NAND flash chips. It
@@ -12663,6 +13259,12 @@ CONFIG_MTD_DOC1000
This provides an MTD device driver for the M-Systems DiskOnChip
1000 devices, which are obsolete so you probably want to say 'N'.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ doc1000.o
+
M-Systems Disk-On-Chip 2000 and Millennium support
CONFIG_MTD_DOC2000
This provides an MTD device driver for the M-Systems DiskOnChip
@@ -12678,6 +13280,12 @@ CONFIG_MTD_DOC2000
emulate a block device by using a kind of file system on the flash
chips.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ doc2000.o
+
Alternative Disk-On-Chip Millennium support
CONFIG_MTD_DOC2001
This provides an alternative MTD device driver for the M-Systems
@@ -12692,6 +13300,12 @@ CONFIG_MTD_DOC2001
emulate a block device by using a kind of file system on the flash
chips.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ doc2001.o
+
Probe for DiskOnChip devices
CONFIG_MTD_DOCPROBE
This isn't a real config option, it's derived.
@@ -12751,6 +13365,12 @@ CONFIG_MTD_PMC551
particularly useful on the 2.2 kernels on PPC architectures as there
was limited kernel space to deal with.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ pmc551.o
+
PMC551 256M DRAM Bugfix
CONFIG_MTD_PMC551_BUGFIX
Some of Ramix's PMC551 boards with 256M configurations have invalid
@@ -12769,12 +13389,24 @@ CONFIG_MTD_SLRAM
you can still use it for storage or swap by using this driver to
present it to the system as a Memory Technology Device.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ slram.o
+
Debugging RAM test driver
CONFIG_MTD_MTDRAM
This enables a test MTD device driver which uses vmalloc() to
provide storage. You probably want to say 'N' unless you're
testing stuff.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ mtdram.o
+
MTDRAM erase block size in KB
CONFIG_MTDRAM_ERASE_SIZE
This allows you to configure the size of the erase blocks in the
@@ -12817,6 +13449,12 @@ CONFIG_MTD_ABSENT
the system regardless of media presence. Device nodes created
with this driver will return -ENODEV upon access.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ map_absent.o
+
MTD emulation using block device
CONFIG_MTD_BLKMTD
This driver allows a block device to appear as an MTD. It would
@@ -12827,6 +13465,12 @@ CONFIG_MTD_BLKMTD
Testing MTD users (eg JFFS2) on large media and media that might
be removed during a write (using the floppy drive).
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ blkmtd.o
+
Cirrus CDB89712 evaluation board mappings
CONFIG_MTD_CDB89712
This enables access to the flash or ROM chips on the CDB89712 board.
@@ -12844,6 +13488,12 @@ CONFIG_MTD_JEDECPROBE
non-CFI Intel chips (that code is in MTD CVS and should shortly be sent
for inclusion in Linus' tree)
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ jedec_probe.o
+
BIOS flash chip on Intel L440GX boards
CONFIG_MTD_L440GX
Support for treating the BIOS flash chip on Intel L440GX motherboards
@@ -12851,6 +13501,12 @@ CONFIG_MTD_L440GX
BE VERY CAREFUL.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ l440gx.o
+
28F160xx flash driver for LART
CONFIG_MTD_LART
This enables the flash driver for LART. Please note that you do
@@ -13108,9 +13764,9 @@ CONFIG_USB_WACOM
The module will be called wacom.o. If you want to compile it as a
module, say M here and read <file:Documentation/modules.txt>.
-Aiptek 8000U tablet support
+Aiptek 6000U/8000U tablet support
CONFIG_USB_AIPTEK
- Say Y here if you want to use the USB version of the Aiptek 8000U
+ Say Y here if you want to use the USB version of the Aiptek 6000U/8000U
tablet. Make sure to say Y to "Event interface support"
(CONFIG_INPUT_EVDEV) as well.
@@ -13242,7 +13898,6 @@ CONFIG_USB_EMI26
inserted in and removed from the running kernel whenever you want).
The module will be called audio.o. If you want to compile it as a
module, say M here and read <file:Documentation/modules.txt>.
-
USB Modem (CDC ACM) support
CONFIG_USB_ACM
@@ -13418,6 +14073,14 @@ USB Keyspan USA-19W Firmware
CONFIG_USB_SERIAL_KEYSPAN_USA19W
Say Y here to include firmware for the USA-19W converter.
+USB Keyspan USA-19QW Firmware
+CONFIG_USB_SERIAL_KEYSPAN_USA19QW
+ Say Y here to include firmware for the USA-19QW converter.
+
+USB Keyspan USA-19QI Firmware
+CONFIG_USB_SERIAL_KEYSPAN_USA19QI
+ Say Y here to include firmware for the USA-19QI converter.
+
USB Keyspan USA-49W Firmware
CONFIG_USB_SERIAL_KEYSPAN_USA49W
Say Y here to include firmware for the USA-49W converter.
@@ -13710,7 +14373,7 @@ Realtek RTL8150 based USB-Ethernet device support
CONFIG_USB_RTL8150
Say Y here if you have RTL8150 based usb-ethernet adapter.
Send me (petkan@users.sourceforge.net) any comments you may have.
- You can also check for updates at http://pegasus2.sourceforge.net/
+ You can also check for updates at <http://pegasus2.sourceforge.net/>
This code is also available as a module ( = code which can be
inserted in and removed from the running kernel whenever you want).
@@ -13761,6 +14424,7 @@ USB CATC NetMate-based Ethernet device support
CONFIG_USB_CATC
Say Y if you want to use one of the following 10Mbps USB Ethernet
device based on the EL1210A chip. Supported devices are:
+ Belkin F5U011
Belkin F5U111
CATC NetMate
CATC NetMate II
@@ -13940,6 +14604,11 @@ CONFIG_USB_STORAGE_SDDR09
Say Y here to include additional code to support the Sandisk SDDR-09
SmartMedia reader in the USB Mass Storage driver.
+SanDisk SDDR-55 SmartMedia support
+CONFIG_USB_STORAGE_SDDR55
+ Say Y here to include additional code to support the Sandisk SDDR-55
+ SmartMedia reader in the USB Mass Storage driver.
+
USB Diamond Rio500 support
CONFIG_USB_RIO500
Say Y here if you want to connect a USB Rio500 mp3 player to your
@@ -13949,7 +14618,7 @@ CONFIG_USB_RIO500
This code 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 rio500.o. If you want to compile it as
- a module, say M here and read <file:Documentation/modules.txt>.
+ a module, say M here and read <file:Documenatation/modules.txt>.
USB Auerswald ISDN device support
CONFIG_USB_AUERSWALD
@@ -13959,7 +14628,26 @@ CONFIG_USB_AUERSWALD
This code 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 auerswald.o. If you want to compile it as
- a module, say M here and read <file:Documentation/modules.txt>.
+ a module, say M here and read <file:Documenatation/modules.txt>
+
+CONFIG_USB_TIGL
+ If you own a Texas Instruments graphing calculator and use a
+ TI-GRAPH LINK USB cable (aka SilverLink), then you might be
+ interested in this driver.
+
+ If you enable this driver, you will be able to communicate with
+ your calculator through a set of device nodes under /dev.
+
+ This code 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 tiglusb.o. If you want to compile it as a
+ module, say M here and read Documentation/modules.txt.
+
+ If you don't know what the SilverLink cable is or what a Texas
+ Instruments graphing calculator is, then you probably don't need this
+ driver.
+
+ If unsure, say N.
Tieman Voyager USB Braille display support
CONFIG_USB_BRLVOYAGER
@@ -13972,6 +14660,18 @@ CONFIG_USB_BRLVOYAGER
The module will be called brlvger.o. If you want to compile it as
a module, say M here and read <file:Documentation/modules.txt>.
+USBLCD support
+CONFIG_USB_LCD
+ Say Y here if you want to connect an USBLCD to your computer's
+ USB port. The USBLCD is a small USB interface board for
+ alphanumeric LCD modules. See <http://www.usblcd.de> for more
+ information.
+
+ This code 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 usblcd.o. If you want to compile it as
+ a module, say M here and read <file:Documentation/modules.txt>.
+
D-Link DSB-R100 FM radio support
CONFIG_USB_DSBR
Say Y here if you want to connect this type of radio to your
@@ -14410,6 +15110,27 @@ CONFIG_USB_BLUETOOTH
The module will be called bluetooth.o. If you want to compile it as
a module, say M here and read <file:Documentation/modules.txt>.
+USB MIDI support
+CONFIG_USB_MIDI
+ Say Y here if you want to connect a USB MIDI device to your
+ computer's USB port. This driver is for devices that comply with
+ 'Universal Serial Bus Device Class Definition for MIDI Device'.
+
+ The following devices are known to work:
+ * Steinberg USB2MIDI
+ * Roland MPU64
+ * Roland PC-300
+ * Roland SC8850
+ * Roland UM-1
+ * Roland UM-2
+ * Roland UA-100
+ * Yamaha MU1000
+
+ This code 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 usb-midi.o. If you want to compile it as a
+ module, say M here and read <file:Documentation/modules.txt>.
+
Minix fs support
CONFIG_MINIX_FS
Minix is a simple operating system used in many classes about OS's.
@@ -14467,12 +15188,13 @@ CONFIG_REISERFS_CHECK
Publish some reiserfs-specific info under /proc/fs/reiserfs
CONFIG_REISERFS_PROC_INFO
- Create under /proc/fs/reiserfs hierarchy of files, displaying
- various ReiserFS statistics and internal data on the expense of
- making your kernel or module slightly larger (+8 KB). This also
- increases amount of kernel memory required for each mount. Almost
- everyone but ReiserFS developers and people fine-tuning reiserfs or
- tracing problems should say N.
+ Create under /proc/fs/reiserfs a hierarchy of files, displaying
+ various ReiserFS statistics and internal data at the expense of making
+ your kernel or module slightly larger (+8 KB). This also increases the
+ amount of kernel memory required for each mount by 440 bytes.
+ It isn't useful to average persons, and you probably can't measure the
+ performance cost of it. If you are fine-tuning reiserfs, say Y,
+ otherwise say N.
Second extended fs support
CONFIG_EXT2_FS
@@ -14594,6 +15316,35 @@ CONFIG_BUFFER_DEBUG
Because this option adds considerably to the size of each buffer,
most people will want to say N here.
+BeOS filesystem support (BeFS) (read only)
+CONFIG_BEFS_FS
+ The BeOS File System (BeFS) is the native file system of Be, Inc's
+ BeOS. Notable features include support for arbitrary attributes
+ on files and directories, and database-like indices on selected
+ attributes. (Also note that this driver doesn't make those features
+ available at this time). It is a 64 bit filesystem, so it supports
+ extremely large volumes and files.
+
+ If you use this filesystem, you should also say Y to at least one
+ of the NLS (native language support) options below.
+
+ If you don't know what this is about, say N.
+
+ If you want to compile this as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read Documentation/modules.txt. The module will be
+ called befs.o.
+
+Debug BeFS
+CONFIG_BEFS_DEBUG
+ If you say Y here, you can use the 'debug' mount option to enable
+ debugging output from the driver. This is unlike previous versions
+ of the driver, where enabling this option would turn on debugging
+ output automatically.
+
+ Example:
+ mount -t befs /dev/hda2 /mnt -o debug
+
BFS file system support
CONFIG_BFS_FS
Boot File System (BFS) is a file system used under SCO UnixWare to
@@ -15037,13 +15788,10 @@ CONFIG_NFSD_V3
If you would like to include the NFSv3 server as well as the NFSv2
server, say Y here. If unsure, say Y.
-Provide NFS over TCP server support DEVELOPER ONLY
+Provide NFS over TCP server support EXPERIMENTAL
CONFIG_NFSD_TCP
- If you are a developer and want to work on fixing problems with
- NFS server over TCP support, say Y here. If unsure, say N.
-
- Some problems can be found by looking for FIXME in
- <file:net/sunrpc/svcsock.c>.
+ Enable NFS service over TCP connections. This the officially
+ still experimental, but seems to work well.
OS/2 HPFS file system support
CONFIG_HPFS_FS
@@ -15484,12 +16232,6 @@ CONFIG_EFI_PARTITION
were partitioned using EFI GPT. Presently only useful on the
IA-64 platform.
-/dev/guid support (EXPERIMENTAL)
-CONFIG_DEVFS_GUID
- Say Y here if you would like to access disks and partitions by
- their Globally Unique Identifiers (GUIDs) which will appear as
- symbolic links in /dev/guid.
-
Ultrix partition table support
CONFIG_ULTRIX_PARTITION
Say Y here if you would like to be able to read the hard disk
@@ -15498,9 +16240,11 @@ CONFIG_ULTRIX_PARTITION
IBM disk label and partition support
CONFIG_IBM_PARTITION
- Say Y here if you would like to be able to read the hard disk
- partition table format used by IBM DASD disks operating under CMS.
- Otherwise, say N.
+ You have to say Y here if you would like to be able to read volume
+ labels of IBM DASD disks. These can be ECKD DASD disks with
+ compatible disk layout (cdl) and standard Linux disk layout (ldl),
+ FBA DASD disks and CMS reserved minidisks.
+ Otherwise, say N and you will not be able to access these disks.
ADFS file system support
CONFIG_ADFS_FS
@@ -15528,6 +16272,25 @@ CONFIG_ADFS_FS_RW
hard drives and ADFS-formatted floppy disks. This is experimental
codes, so if you're unsure, say N.
+JFS filesystem support
+CONFIG_JFS_FS
+ This is a port of IBM's Journalling Filesystem . More information is
+ available in the file Documentation/filesystems/jfs.txt.
+
+ If you do not intend to use the JFS filesystem, say N.
+
+JFS Debugging
+CONFIG_JFS_DEBUG
+ If you are experiencing any problems with the JFS filesystem, say
+ Y here. This will result in additional debugging messages to be
+ written to the system log. Under normal circumstances, this
+ results in very little overhead.
+
+JFS Statistics
+CONFIG_JFS_STATISTICS
+ Enabling this option will cause statistics from the JFS file system
+ to be made available to the user in the /proc/fs/jfs/ directory.
+
/dev/pts file system for Unix98 PTYs
CONFIG_DEVPTS_FS
You should say Y here if you said Y to "Unix98 PTY support" above.
@@ -16640,6 +17403,17 @@ CONFIG_SYNCLINK
The module will be called synclink.o. If you want to do that, say M
here.
+CONFIG_SYNCLINKMP
+ Enable support for the SyncLink Multiport (2 or 4 ports)
+ serial adapter, running asynchronous and HDLC communications up
+ to 2.048Mbps. Each ports is independently selectable for
+ RS-232, V.35, RS-449, RS-530, and X.21
+
+ This driver may be built as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ The module will be called synclinkmp.o. If you want to do that, say M
+ here.
+
Synchronous HDLC line discipline support
CONFIG_N_HDLC
Allows synchronous HDLC communications with tty device drivers that
@@ -18082,20 +18856,6 @@ CONFIG_ADVANTECH_WDT
computer, say `Y' here to support its built-in watchdog timer
feature. See the help for CONFIG_WATCHDOG for discussion.
-W83877F Watchdog Timer
-CONFIG_W83877F_WDT
- This is the driver for the hardware watchdog on the W83877F chipset
- as used in EMACS PC-104 motherboards (and likely others). This
- watchdog simply watches your kernel to make sure it doesn't freeze,
- and if it does, it reboots your computer after a certain amount of
- time.
-
- 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 is called mixcomwd.o. If you want to compile it as a
- module, say M here and read <file:Documentation/modules.txt>. Most
- people will say N.
-
ALi M7101 Watchdog Timer
CONFIG_ALIM7101_WDT
This is the driver for the hardware watchdog on the ALi M7101 PMU
@@ -18160,11 +18920,11 @@ CONFIG_SC1200_WDT
module, say M here and read <file:Documentation/modules.txt>. Most
people will say N.
-SuperH 3/4 Watchdog
+SuperH Watchdog
CONFIG_SH_WDT
This driver adds watchdog support for the integrated watchdog in the
- SuperH 3 and 4 processors. If you have one of these processors, say Y,
- otherwise say N.
+ SuperH 3, 4 and 5 processors. If you have one of these processors, say
+ Y, otherwise say N.
This driver is also available as a module ( = code which can be
inserted in and removed from the running kernel whenever you want).
@@ -18204,6 +18964,12 @@ CONFIG_TOSHIBA
Toshiba Linux utilities web site at:
<http://www.buzzard.org.uk/toshiba/>.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ toshiba.o
+
Say Y if you intend to run this kernel on a Toshiba portable.
Say N otherwise.
@@ -18220,6 +18986,12 @@ CONFIG_I8K
You can force loading on unsupported models by passing the
parameter `force=1' to the module. Use at your own risk.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ i8k.o
+
For more information on this driver and for utilities that make
use of the module see the I8K Linux Utilities web site at:
<http://www.debian.org/~dz/i8k/>.
@@ -18255,6 +19027,12 @@ CONFIG_X86_MSR
MSR accesses are directed to a specific CPU on multi-processor
systems.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ msr.o
+
/dev/cpu/*/cpuid - CPU information support
CONFIG_X86_CPUID
This device gives processes access to the x86 CPUID instruction to
@@ -18262,6 +19040,12 @@ CONFIG_X86_CPUID
with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
/dev/cpu/31/cpuid.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ cpuid.o
+
SBC-60XX Watchdog Timer
CONFIG_60XX_WDT
This driver can be used with the watchdog timer found on some
@@ -18340,9 +19124,10 @@ CONFIG_H8
CONFIG_NVRAM
If you say Y here and create a character special file /dev/nvram
with major number 10 and minor number 144 using mknod ("man mknod"),
- you get read and write access to the 50 bytes of non-volatile memory
- in the real time clock (RTC), which is contained in every PC and
- most Ataris.
+ you get read and write access to the extra bytes of non-volatile
+ memory in the real time clock (RTC), which is contained in every PC
+ and most Ataris. The actual number of bytes varies, depending on the
+ nvram in the system, but is usually 114 (128-14 for the RTC).
This memory is conventionally called "CMOS RAM" on PCs and "NVRAM"
on Ataris. /dev/nvram may be used to view settings there, or to
@@ -19559,6 +20344,12 @@ CONFIG_SOUND_MAESTRO3
Say Y or M if you have a sound system driven by ESS's Maestro 3
PCI sound chip.
+ForteMedia FM801 driver
+CONFIG_SOUND_FORTE
+ Say Y or M if you want driver support for the ForteMedia FM801 PCI
+ audio controller (Abit AU10, Genius Sound Maker, HP Workstation
+ zx2000, and others).
+
Adlib Cards
CONFIG_SOUND_ADLIB
Includes ASB 64 4D. Information on programming AdLib cards is
@@ -19734,16 +20525,6 @@ CONFIG_MIPS_UNCACHED
hardware debugging with a logic analyzer and need to see all traffic
on the bus.
-AU1000 serial console
-CONFIG_AU1000_SERIAL_CONSOLE
- If you have an Alchemy AU1000 processor (MIPS based) and you want
- to use a console on a serial port, say Y. Otherwise, say N.
-
-AU1000 serial support
-CONFIG_AU1000_UART
- If you have an Alchemy AU1000 processor (MIPS based) and you want
- to use serial ports, say Y. Otherwise, say N.
-
AU1000 ethernet controller on SGI MIPS system
CONFIG_MIPS_AU1000_ENET
If you have an Alchemy Semi AU1000 ethernet controller
@@ -19824,6 +20605,11 @@ CONFIG_ISDN_PPP_BSDCOMP
method as well for this to be useful. Even if they don't support it,
it is safe to say Y here.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called isdn_bsdcomp.o.
+
Support audio via ISDN
CONFIG_ISDN_AUDIO
If you say Y here, the modem-emulator will support a subset of the
@@ -19858,6 +20644,11 @@ CONFIG_ISDN_DIVERSION
Please read the file <file:Documentation/isdn/README.diversion>.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called dss1_divert.o.
+
ICN 2B and 4B support
CONFIG_ISDN_DRV_ICN
This enables support for two kinds of ISDN-cards made by a German
@@ -19882,6 +20673,11 @@ CONFIG_ISDN_DRV_LOOP
You need will need the loopctrl utility from the latest isdn4k-utils
package to set up this driver.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called isdnloop.o.
+
HiSax SiemensChipSet driver support
CONFIG_ISDN_DRV_HISAX
This is a driver supporting the Siemens chipset on various
@@ -19947,7 +20743,6 @@ CONFIG_HISAX_NI1
Enable this if you like to use ISDN in US on a NI1 basic rate
interface.
-# 2.4 tree only
Maximum number of cards supported by HiSax
CONFIG_HISAX_MAX_CARDS
This is used to allocate a driver-internal structure array with one
@@ -20177,15 +20972,30 @@ CONFIG_HISAX_ELSA_CS
This enables the PCMCIA client driver for the Elsa PCMCIA MicroLink
card.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called elsa_cs.o.
+
Sedlbauer PCMCIA cards
CONFIG_HISAX_SEDLBAUER_CS
This enables the PCMCIA client driver for the Sedlbauer Speed Star
and Speed Star II cards.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called sedlbauer_cs.o.
+
CONFIG_HISAX_AVM_A1_CS
This enables the PCMCIA client driver for the AVM A1 / Fritz!Card
PCMCIA cards.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called avma1_cs.o.
+
ST5481 USB ISDN modem
CONFIG_HISAX_ST5481
This enables the driver for ST5481 based USB ISDN adapters,
@@ -20227,6 +21037,11 @@ CONFIG_ISDN_DRV_EICON_OLD
Say Y here to use your Eicon active ISDN card with ISDN4Linux
isdn module.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called eicon.o.
+
Eicon PCI DIVA Server BRI/PRI/4BRI support
CONFIG_ISDN_DRV_EICON_PCI
Say Y here if you have an Eicon Diva Server (BRI/PRI/4BRI) ISDN
@@ -20249,6 +21064,11 @@ CONFIG_ISDN_DRV_EICON_DIVAS
cards and will provide its own IDI interface. You should say N
here.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called divas.o.
+
Support AT-Fax Class 1 and 2 commands
CONFIG_ISDN_TTY_FAX
If you say Y here, the modem-emulator will support a subset of the
@@ -20277,6 +21097,11 @@ CONFIG_ISDN_CAPI_CAPI20
standardized libcapi20 to access this functionality. You should say
Y/M here.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called capi.o.
+
CAPI2.0 Middleware support
CONFIG_ISDN_CAPI_MIDDLEWARE
This option will enhance the capabilities of the /dev/capi20
@@ -20299,12 +21124,22 @@ CONFIG_ISDN_CAPI_CAPIDRV
supported by a CAPI driver, but still want to use old features like
ippp interfaces or ttyI emulation, say Y/M here.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called capidrv.o.
+
AVM B1 ISA support
CONFIG_ISDN_DRV_AVMB1_B1ISA
Enable support for the ISA version of the AVM B1 card.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called b1isa.o.
+
AVM B1 PCI support
-CONFIG_ISDN_DRV_AVMB1_B1PCI
+CONFIG_ISDN_DRV_AVMB1_B1CICI
Enable support for the PCI version of the AVM B1 card.
AVM B1 PCI V4 support
@@ -20316,25 +21151,50 @@ CONFIG_ISDN_DRV_AVMB1_T1ISA
Enable support for the AVM T1 T1B card.
Note: This is a PRI card and handle 30 B-channels.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called t1isa.o.
+
AVM B1/M1/M2 PCMCIA support
CONFIG_ISDN_DRV_AVMB1_B1PCMCIA
Enable support for the PCMCIA version of the AVM B1 card.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called b1pcmcia.o.
+
AVM B1/M1/M2 PCMCIA cs module
CONFIG_ISDN_DRV_AVMB1_AVM_CS
Enable the PCMCIA client driver for the AVM B1/M1/M2
PCMCIA cards.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called avm_cs.o.
+
AVM T1/T1-B PCI support
CONFIG_ISDN_DRV_AVMB1_T1PCI
Enable support for the AVM T1 T1B card.
Note: This is a PRI card and handle 30 B-channels.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called t1pci.o.
+
AVM C4/C2 support
CONFIG_ISDN_DRV_AVMB1_C4
Enable support for the AVM C4/C2 PCI cards.
These cards handle 4/2 BRI ISDN lines (8/4 channels).
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called c4.o.
+
Verbose reason code reporting (kernel size +=7K)
CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON
If you say Y here, the AVM B1 driver will give verbose reasons for
@@ -20349,6 +21209,11 @@ CONFIG_ISDN_DRV_ACT2000
isdn4k-utils package. Please read the file
<file:Documentation/isdn/README.act2000> for more information.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called act2000.o.
+
Auvertech TurboPAM support
CONFIG_ISDN_DRV_TPAM
This enables support for the Auvertech TurboPAM ISDN-card.
@@ -20370,6 +21235,11 @@ CONFIG_HYSDN
Please read the file <file:Documentation/isdn/README.hysdn> for more
information.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called hysdn.o.
+
HYSDN CAPI 2.0 support
CONFIG_HYSDN_CAPI
Say Y here if you like to use Hypercope's CAPI 2.0 interface.
@@ -20436,7 +21306,7 @@ CONFIG_SPARC32_COMPAT
Kernel support for 32-bit ELF binaries
CONFIG_BINFMT_ELF32
- This allows you to run 32-bit Linux/ELF binaries on your Ultra.
+ This allows you to run 32-bit Linux/ELF binaries on your machine.
Everybody wants this; say Y.
Kernel support for 32-bit (ie. SunOS) a.out binaries
@@ -20522,7 +21392,7 @@ CONFIG_SPARCAUDIO_CS4231
DBRI Lowlevel Driver
CONFIG_SPARCAUDIO_DBRI
This driver supports the DBRI audio interface found on the SS10,
- SS20, Sparcbook 3, and Voyager systems.
+ SS20, LX, Sparcbook 3, and Voyager systems.
Dummy Lowlevel Driver
CONFIG_SPARCAUDIO_DUMMY
@@ -20589,6 +21459,19 @@ CONFIG_BLUEZ_SCO
Say Y here to compile SCO support into the kernel or say M to
compile it as module (sco.o).
+BNEP protocol support
+CONFIG_BLUEZ_BNEP
+ BNEP (Bluetooth Network Encapsulation Protocol) is Ethernet
+ emulation layer on top of Bluetooth. BNEP is required for Bluetooth
+ PAN (Personal Area Network).
+
+ To use BNEP, you will need user-space utilities provided in the
+ BlueZ-PAN package.
+ For more information, see <http://bluez.sourceforge.net>.
+
+ Say Y here to compile BNEP support into the kernel or say M to
+ compile it as module (bnep.o).
+
HCI UART driver
CONFIG_BLUEZ_HCIUART
Bluetooth HCI UART driver.
@@ -20617,18 +21500,9 @@ CONFIG_BLUEZ_HCIUSB
Say Y here to compile support for Bluetooth USB devices into the
kernel or say M to compile it as module (hci_usb.o).
-HCI USB firmware download support
-CONFIG_BLUEZ_USB_FW_LOAD
- Firmware download support for Bluetooth USB devices.
- This support is required for devices like Broadcom BCM2033.
-
- HCI USB driver uses external firmware downloader program provided
- in BlueFW package.
- For more information, see <http://bluez.sf.net/>.
-
HCI USB zero packet support
CONFIG_BLUEZ_USB_ZERO_PACKET
- Support for USB zero packets.
+ Support for USB zero packets.
This option is provided only as a work around for buggy Bluetooth USB
devices. Do _not_ enable it unless you know for sure that your device
requires zero packets.
@@ -20647,11 +21521,37 @@ CONFIG_BLUEZ_HCIDTL1
Bluetooth HCI DTL1 (PC Card) driver.
This driver provides support for Bluetooth PCMCIA devices with
Nokia DTL1 interface:
- Nokia Bluetooth PC Card, Socketcom Bluetooth CF module
+ Nokia Bluetooth Card
+ Socket Bluetooth CF Card
Say Y here to compile support for HCI DTL1 devices into the
kernel or say M to compile it as module (dtl1_cs.o).
+HCI BT3C (PC Card) device driver
+CONFIG_BLUEZ_HCIBT3C
+ Bluetooth HCI BT3C (PC Card) driver.
+ This driver provides support for Bluetooth PCMCIA devices with
+ 3Com BT3C interface:
+ 3Com Bluetooth Card (3CRWB6096)
+ HP Bluetooth Card
+
+ The HCI BT3C driver uses external firmware loader program provided in
+ the BlueFW package. For more information, see <http://bluez.sf.net>.
+
+ Say Y here to compile support for HCI BT3C devices into the
+ kernel or say M to compile it as module (bt3c_cs.o).
+
+HCI BlueCard (PC Card) device driver
+CONFIG_BLUEZ_HCIBLUECARD
+ Bluetooth HCI BlueCard (PC Card) driver.
+ This driver provides support for Bluetooth PCMCIA devices with
+ Anycom BlueCard interface:
+ Anycom Bluetooth PC Card
+ Anycom Bluetooth CF Card
+
+ Say Y here to compile support for HCI BlueCard devices into the
+ kernel or say M to compile it as module (bluecard_cs.o).
+
# The following options are for Linux when running on the Hitachi
# SuperH family of RISC microprocessors.
@@ -20680,6 +21580,11 @@ CONFIG_CF_AREA5
"Area6" will work for most boards. For ADX, select "Area5".
+Disable data cache
+CONFIG_DCACHE_DISABLE
+ This option allows you to run the kernel with data cache disabled.
+ Say Y if you experience CPM lock-ups.
+
#
# m68k-specific kernel options
# Documented by Chris Lawrence <mailto:quango@themall.net> et al.
@@ -21084,12 +21989,6 @@ CONFIG_TT_DMA_EMUL
Hades. This increases the SCSI transfer rates at least ten times
compared to PIO transfers.
-Sun3 NCR5380 OBIO SCSI
-CONFIG_SUN3_SCSI
- This option will enable support for the OBIO (onboard io) NCR5380
- SCSI controller found in the Sun 3/50 and 3/60. Note that this
- driver does not provide support for VME SCSI boards.
-
Sun3x ESP SCSI
CONFIG_SUN3X_ESP
This option will enable support for the ESP SCSI controller found
@@ -21143,11 +22042,6 @@ CONFIG_SUN3_SCSI
General Linux information on the Sun 3 series (now discontinued)
is at <http://www.angelfire.com/ca2/tech68k/sun3.html>.
-Sun3x ESP SCSI driver
-CONFIG_SUN3X_ESP
- The ESP was an on-board SCSI controller used on Sun 3/80
- machines. Say Y here to compile in support for it.
-
PCMCIA NE2000 and compatibles support
CONFIG_APNE
If you have a PCMCIA NE2000 compatible adapter, say Y. Otherwise,
@@ -21158,19 +22052,6 @@ CONFIG_APNE
want). The module is called apne.o. If you want to compile it as a
module, say M here and read <file:Documentation/modules.txt>.
-Sun3/Sun3x on-board LANCE support
-CONFIG_SUN3LANCE
- This driver enables support for the on-board LANCE ethernet adapter
- found on the Sun 3/50, 3/60, and 3/80 workstations. If you have
- one of these workstations, and would like Ethernet, say Y.
- Otherwise, say N.
-
-Sun3 on-board Intel 82586 support
-CONFIG_SUN3_82586
- This driver enables support for the on-board Intel 82586 based Ethernet
- adapter found on Sun 3/1xx and 3/2xx motherboards. Note that this driver
- does not support 82586-based adapters on additional VME boards.
-
Atari Lance support
CONFIG_ATARILANCE
Say Y to include support for several Atari Ethernet adapters based
@@ -21507,6 +22388,8 @@ CONFIG_ALL_PPC
Select APUS if configuring for a PowerUP Amiga. More information is
available at: <http://linux-apus.sourceforge.net/>.
+ Note that Total Impact briQ is handled as a CHRP machine.
+
Synergy-Gemini
CONFIG_GEMINI
Select Gemini if configuring for a Synergy Microsystems' Gemini
@@ -21865,7 +22748,7 @@ CONFIG_EST8260
CU824:
VMEBus Board with PCI extension with MPC8240 CPU
- Manufacturer: MicroSys GmbH, http://www.microsys.de/
+ Manufacturer: MicroSys GmbH, <http://www.microsys.de/>
Date of Release: early 2001 (?)
End of life: -
URL: <http://www.microsys.de/html/cu824.html>
@@ -22551,7 +23434,7 @@ CONFIG_IPL
IPL device on another question, that pops up, when you select
CONFIG_IPL.
-IPL from a /390 tape unit
+IPL from a S/390 tape unit
CONFIG_IPL_TAPE
Select this option if you want to IPL the image from a Tape.
@@ -22560,18 +23443,22 @@ CONFIG_IPL_VM
Select this option if you are running under VM/ESA and want
to IPL the image from the emulated card reader.
-Support for DASD hard disks
-CONFIG_DASD
- Enable this option if you want to access DASDs directly utilizing
- S/390s channel subsystem commands. This is necessary for running
- natively on a single image or an LPAR.
+CONFIG_PFAULT
+ Select this option, if you want to use PFAULT pseudo page fault
+ handling under VM. If running native or in LPAR, this option
+ has no effect. If your VM does not support PFAULT, PAGEEX
+ pseudo page fault handling will be used.
+ Note that VM 4.2 supports PFAULT but has a bug in its
+ implementation that causes some problems.
+ Everybody who wants to run Linux under VM != VM4.2 should select
+ this option.
-Enable DASD fast write
-CONFIG_DASD_FAST_IO
- Enable fast I/O for DASDs. That means that the next I/O command
- is already issued at interrupt time, if an I/O request is pending.
- This option gives significant speedup of I/O, because we don't
- schedule the bottom-halves as often as Intel.
+CONFIG_SHARED_KERNEL
+ Select this option, if you want to share the text segment of the
+ Linux kernel between different VM guests. This reduces memory
+ usage with lots of guests but greatly increases kernel size.
+ You should only select this option if you know what you are
+ doing and want to exploit this feature.
Support for IBM-style disk-labels (S/390)
CONFIG_S390_PARTITION
@@ -22580,18 +23467,40 @@ CONFIG_S390_PARTITION
attached to another IBM mainframe operation system (OS/390,
VM/ESA, VSE/ESA).
+Support for DASD hard disks
+CONFIG_DASD
+ Enable this option if you want to access DASDs directly utilizing
+ S/390s channel subsystem commands. This is necessary for running
+ natively on a single image or an LPAR.
+
Support for ECKD hard disks
CONFIG_DASD_ECKD
- ECKD devices are the most commonly used devices. You should enable
- this option unless you are very sure you have no ECKD device.
+ ECKD (Extended Count Key Data) devices are the most commonly used
+ devices on S/390s. You should enable this option unless you are
+ very sure you have no ECKD device.
-CKD devices
-CONFIG_DASD_CKD
- CKD devices are currently unsupported.
+ECKD demand loading
+CONFIG_DASD_AUTO_ECKD
+ This option enables demand loading of the ECKD module.
Support for FBA hard disks
CONFIG_DASD_FBA
- FBA devices are currently unsupported.
+ Select this option if you want to use FBA (Fixed Block) devices.
+ If you are not sure what it is, say "Y".
+
+FBA demand loading
+CONFIG_DASD_AUTO_FBA
+ This option enables demand loading of the FBA module.
+
+Support for DIAG access to CMS reserved Disks
+CONFIG_DASD_DIAG
+ Select this option if you want to use CMS reserved Disks under VM
+ with the Diagnose250 command. If you are not running under VM or
+ unsure what it is, say "N".
+
+DIAG demand loading
+CONFIG_DASD_AUTO_DIAG
+ This option enables demand loading of the DIAG module.
Merge some code into the kernel to make the image IPLable
CONFIG_IPLABLE
@@ -22629,6 +23538,16 @@ CONFIG_HWC_CONSOLE
Include support for using an IBM HWC line-mode terminal as the Linux
system console.
+Control Program Identification
+CONFIG_HWC_CPI
+ Allows for Control Program Identification via the HWC interface,
+ i.e. provides a mean to pass an OS instance name (system name)
+ to the machine.
+
+ This option should only be selected as a module since the
+ system name has to be passed as module parameter. The module
+ will be called hwc_cpi.o.
+
S/390 tape device support
CONFIG_S390_TAPE
Select this option if you want to access channel-attached tape
@@ -22637,8 +23556,9 @@ CONFIG_S390_TAPE
least one of the tape interface options and one of the tape
hardware options in order to access a tape device.
This option is also available as a module. The module will be
- called tape390.o and include all selected interfaces and
- hardware drivers.
+ called tape390.o and include all selected interfaces.
+ The hardware drivers will be seperate modules.
+ If unsure, say "Y".
Support for tape character devices
CONFIG_S390_TAPE_CHAR
@@ -22659,14 +23579,23 @@ CONFIG_S390_TAPE_BLOCK
Support for 3490 tape hardware
CONFIG_S390_TAPE_3490
- Select this option if you want to access IBM 3480 magnetic
+ Select this option if you want to access IBM 3490 magnetic
tape subsystems and 100% compatibles.
+ This option is also available as a module. The module will be
+ called tape3490.o. If CONFIG_S390_TAPE is selected as a module,
+ this hardware driver cannot be built-in but is only available
+ as a module.
It is safe to say "Y" here.
Support for 3480 tape hardware
CONFIG_S390_TAPE_3480
- Select this option if you want to access IBM 3490 magnetic
+ Select this option if you want to access IBM 3480 magnetic
tape subsystems and 100% compatibles.
+ This option is also available as a module. The module will be
+ called tape3480.o. If CONFIG_S390_TAPE is selected as a module,
+ this hardware driver cannot be built-in but is only available
+ as a module.
+ It is safe to say "Y" here.
CTC device support
CONFIG_CTC
@@ -22677,12 +23606,6 @@ CONFIG_CTC
available. This option is also available as a module which will be
called ctc.o. If you do not know what it is, it's safe to say "Y".
-Support for DIAG access to CMS reserved Disks
-CONFIG_DASD_DIAG
- Select this option if you want to use CMS reserved Disks under VM
- with the Diagnose250 command. If you are not running under VM or
- unsure what it is, say "N".
-
XPRAM disk support
CONFIG_BLK_DEV_XPRAM
Select this option if you want to use your expanded storage on S/390
@@ -22705,6 +23628,20 @@ CONFIG_IUCV
vehicle networking under VM or VIF. This option is also available
as a module which will be called iucv.o. If unsure, say "Y".
+Process warning machine checks
+CONFIG_MACHCHK_WARNING
+ Select this option if you want the machine check handler on IBM S/390 or
+ zSeries to process warning machine checks (e.g. on power failures).
+ If unsure, say "Y".
+
+Use chscs for Common I/O
+CONFIG_CHSC
+ Select this option if you want the s390 common I/O layer to use information
+ obtained by channel subsystem calls. This will enable Linux to process link
+ failures and resource accessibility events. Moreover, if you have procfs
+ enabled, you'll be able to toggle chpids logically offline and online. Even
+ if you don't understand what this means, you should say "Y".
+
Kernel support for 31 bit ELF binaries
CONFIG_S390_SUPPORT
Select this option if you want to enable your system kernel to
@@ -22761,6 +23698,12 @@ CONFIG_BLK_CPQ_DA
supported by this driver, and for further information on the use of
this driver.
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The module will be called
+ cpqarray.o
+
Show crashed user process info
CONFIG_PROCESS_DEBUG
Say Y to print all process fault locations to the console. This is
@@ -23167,6 +24110,11 @@ CONFIG_DS1620
It is recommended to be used on a NetWinder, but it is not a
necessity.
+Check for stack overflows
+CONFIG_DEBUG_STACKOVERFLOW
+ This option make do_IRQ() check for enough stack space beeing left.
+ This is safe to enable.
+
Debug high memory support
CONFIG_DEBUG_HIGHMEM
This options enables addition error checking for high memory systems.
@@ -23375,13 +24323,24 @@ CONFIG_NWFLASH
SRM environment variables in procfs
CONFIG_SRM_ENV
- If you enable this option, a subdirectory called srm_environment
- will give you access to the most important SRM environment
- variables. If you've got an Alpha style system supporting
- SRC, then it is a good idea to say Yes or Module to this driver.
+ If you enable this option, a subdirectory inside /proc called
+ /proc/srm_environment will give you access to the all important
+ SRM environment variables (those which have a name) and also
+ to all others (by their internal number).
+
+ SRM is something like a BIOS for Alpha machines. There are some
+ other such BIOSes, like AlphaBIOS, which this driver cannot
+ support (hey, that's not SRM!).
+
+ Despite the fact that this driver doesn't work on all Alphas (but
+ only on those which have SRM as their firmware), it's save to
+ build it even if your particular machine doesn't know about SRM
+ (or if you intend to compile a generic kernel). It will simply
+ not create those subdirectory in /proc (and give you some warning,
+ of course).
This driver is also available as a module and will be called
- srm_env.o if you build it as a module.
+ srm_env.o then.
Footbridge internal watchdog
CONFIG_21285_WATCHDOG
@@ -23602,6 +24561,11 @@ CONFIG_NS83820
This driver supports the use of zero copy on tx, checksum
validation on rx, and 64 bit addressing.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called ns83820.o.
+
Toshiba Type-O IR Port device driver
CONFIG_TOSHIBA_FIR
Say Y here if you want to build support for the Toshiba Type-O IR
@@ -23658,6 +24622,11 @@ CONFIG_ESI_DONGLE
used by IrTTY. To activate support for ESI dongles you will have to
start irattach like this: "irattach -d esi".
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called esi.o.
+
ACTiSYS IR-220L and IR220L+ dongle
CONFIG_ACTISYS_DONGLE
Say Y here if you want to build support for the ACTiSYS IR-220L and
@@ -23668,6 +24637,11 @@ CONFIG_ACTISYS_DONGLE
dongles you will have to start irattach like this:
"irattach -d actisys" or "irattach -d actisys+".
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called actisys.o.
+
Tekram IrMate 210B dongle
CONFIG_TEKRAM_DONGLE
Say Y here if you want to build support for the Tekram IrMate 210B
@@ -23677,6 +24651,11 @@ CONFIG_TEKRAM_DONGLE
by IrTTY. To activate support for Tekram dongles you will have to
start irattach like this: "irattach -d tekram".
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called tekram.o.
+
Greenwich GIrBIL dongle
CONFIG_GIRBIL_DONGLE
Say Y here if you want to build support for the Greenwich GIrBIL
@@ -23686,6 +24665,11 @@ CONFIG_GIRBIL_DONGLE
used by IrTTY. To activate support for Greenwich dongles you will
have to insert "irattach -d girbil" in the /etc/irda/drivers script.
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called girbil.o.
+
Parallax LiteLink dongle
CONFIG_LITELINK_DONGLE
Say Y here if you want to build support for the Parallax Litelink
@@ -23695,6 +24679,23 @@ CONFIG_LITELINK_DONGLE
used by IrTTY. To activate support for Parallax dongles you will
have to start irattach like this "irattach -d litelink".
+ If you want to compile the driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module
+ will be called litelink.o.
+
+Microchip MCP2120 dongle
+CONFIG_MCP2120_DONGLE
+ Say Y here if you want to build support for the Microchip MCP2120
+ dongle. If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The MCP2120 dongle attaches to
+ the normal 9-pin serial port connector, and can currently only be
+ used by IrTTY. To activate support for MCP2120 dongles you will
+ have to insert "irattach -d mcp2120" in the /etc/irda/drivers script.
+
+ You must build this dongle yourself. For more information see:
+ <http://www.eyetap.org/~tangf/irda_sir_linux.html>
+
Old Belkin dongle
CONFIG_OLD_BELKIN_DONGLE
Say Y here if you want to build support for the Adaptec Airport 1000
@@ -23702,6 +24703,30 @@ CONFIG_OLD_BELKIN_DONGLE
and read <file:Documentation/modules.txt>. The module will be
called old_belkin.o. Some information is contained in the comments
at the top of <file:drivers/net/irda/old_belkin.c>.
+
+ACTiSYS IR-200L dongle (Experimental)
+CONFIG_ACT200L_DONGLE
+ Say Y here if you want to build support for the ACTiSYS IR-200L
+ dongle. If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. The ACTiSYS IR-200L dongle attaches to
+ the normal 9-pin serial port connector, and can currently only be
+ used by IrTTY. To activate support for ACTiSYS IR-200L dongles
+ you will have to start irattach like this: "irattach -d act200l".
+
+Mobile Action MA600 dongle (Experimental)
+CONFIG_MA600_DONGLE
+ Say Y here if you want to build support for the Mobile Action MA600
+ dongle. If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The MA600 dongle attaches to
+ the normal 9-pin serial port connector, and can currently only be
+ tested on IrCOMM. To activate support for MA600 dongles you will
+ have to insert "irattach -d ma600" in the /etc/irda/drivers script.
+ Note: irutils 0.9.15 requires no modification. irutils 0.9.9 needs
+ modification. For more information, download the following tar gzip
+ file.
+
+ There is a pre-compiled module on
+ <http://engsvr.ust.hk/~eetwl95/download/ma600-2.4.x.tar.gz>
VME (Motorola and BVM) support
CONFIG_VME
@@ -24553,15 +25578,19 @@ CONFIG_IA64_GENERIC
As of the time of this writing, most hardware is DIG compliant,
so the "DIG-compliant" option is usually the right choice.
- HP-simulator For the HP simulator
- (<http://software.hp.com/ia64linux/>).
+ HP-simulator For the HP simulator (<http://software.hp.com/ia64linux/>).
+ HP-zx1 For HP zx1 Platforms.
SN1 For SGI SN1 Platforms.
SN2 For SGI SN2 Platforms.
- DIG-compliant For DIG ("Developer's Interface Guide") compliant
- system.
+ DIG-compliant For DIG ("Developer's Interface Guide") compliant systems.
If you don't know what to do, choose "generic".
+CONFIG_IA64_HP_ZX1
+ Build a kernel that runs on HP zx1-based systems. This adds support
+ for the zx1 IOMMU and makes root bus bridges appear in PCI config space
+ (required for zx1 agpgart support).
+
CONFIG_IA64_SGI_SN_SIM
Build a kernel that runs on both the SGI simulator AND on hardware.
There is a very slight performance penalty on hardware for including this
@@ -24609,16 +25638,6 @@ CONFIG_DISABLE_VHPT
can select this option to disable the VHPT for debugging. If you're
unsure, answer N.
-Enable McKinley A-step specific code
-CONFIG_MCKINLEY_ASTEP_SPECIFIC
- Select this option to build a kernel for an IA64 McKinley system
- with any A-stepping CPU.
-
-Enable McKinley A0/A1-step specific code
-CONFIG_MCKINLEY_A0_SPECIFIC
- Select this option to build a kernel for an IA64 McKinley system
- with an A0 or A1 stepping CPU.
-
Turn on compare-and-exchange bug checking (slow!)
CONFIG_IA64_DEBUG_CMPXCHG
Selecting this option turns on bug checking for the IA64
@@ -24643,9 +25662,7 @@ Print possible IA64 hazards to console
CONFIG_IA64_PRINT_HAZARDS
Selecting this option prints more information for Illegal Dependency
Faults, that is, for Read after Write, Write after Write or Write
- after Read violations. This option is ignored if you are compiling
- for an Itanium A step processor (CONFIG_ITANIUM_ASTEP_SPECIFIC). If
- you're unsure, select Y.
+ after Read violations. If you're unsure, select Y.
Performance monitor support
CONFIG_PERFMON
@@ -24679,15 +25696,6 @@ CONFIG_IA32_SUPPORT
the IA32 instruction set. Say Y here to build in kernel support for
this. If in doubt, say Y.
-/proc/efi/vars support
-CONFIG_EFI_VARS
- If you say Y here, you are able to get EFI (Extensible Firmware
- Interface) variable information in /proc/efi/vars. You may read,
- write, create, and destroy EFI variables through this interface.
-
- To use this option, you have to check that the "/proc file system
- support" (CONFIG_PROC_FS) is enabled, too.
-
Physical memory granularity (16 MB)
CONFIG_IA64_GRANULE_16MB
IA64 identity-mapped regions use a large page size. We'll call such
@@ -24795,6 +25803,18 @@ CONFIG_XMON
Include in-kernel hooks for the xmon kernel monitor/debugger
supported by the PPC port.
+Include BDI2000 debugger support
+CONFIG_BDI_SWITCH
+ Include in-kernel support for the Abatron BDI2000 debugger. To
+ learn more about the Abatron BDI2000, visit the web page at
+ <http://www.abatron.ch/>.
+
+Add additional CFLAGS to the kernel build
+CONFIG_MORE_COMPILE_OPTIONS
+ If you want to add additional CFLAGS to the kernel build, such as
+ -g for KGDB, XMON or the BDI2000, enable this option and then
+ enter what you would like to add in the next question.
+
Include kgdb kernel debugger
CONFIG_KWDB
Include in-kernel hooks for kdb, the source level debugger for the
@@ -25151,7 +26171,7 @@ CONFIG_VLAN_8021Q
ethernet interface does, including firewalling, bridging, and of course
IP traffic. You will need the 'vconfig' tool from the VLAN project in
order to effectively use VLANs. See the VLAN web page for more
- information: http://www.candelatech.com/~greear/vlan.html If unsure,
+ information: <http://www.candelatech.com/~greear/vlan.html> If unsure,
you can safely say 'N'.
ARC console support
@@ -25173,14 +26193,6 @@ CONFIG_BLK_DEV_IT8172
<http://www.ite.com.tw/ia/brief_it8172bsp.htm>; picture of the
board at <http://www.mvista.com/allies/semiconductor/ite.html>.
-Use chscs for Common I/O
-CONFIG_CHSC
- Select this option if you want the s390 common I/O layer to use information
- obtained by channel subsystem calls. This will enable Linux to process link
- failures and resource accessibility events. Moreover, if you have procfs
- enabled, you'll be able to toggle chpids logically offline and online. Even
- if you don't understand what this means, you should say "Y".
-
Support ARM926T processor
CONFIG_CPU_ARM926T
This is a variant of the ARM920. It has slightly different
@@ -25200,21 +26212,6 @@ CONFIG_CPU_FREQ
written) to implement the policy. If you don't understand what this
is all about, it's safe to say 'N'.
-Automatic activation of DIAG module
-CONFIG_DASD_AUTO_DIAG
- Enable this option if you want your DIAG discipline module loaded
- on DASD driver startup.
-
-Automatic activation of ECKD module
-CONFIG_DASD_AUTO_ECKD
- Enable this option if you want your ECKD discipline module loaded
- on DASD driver startup.
-
-Automatic activation of FBA module
-CONFIG_DASD_AUTO_FBA
- Enable this option if you want your FBA discipline module loaded
- on DASD driver startup.
-
SiS
CONFIG_DRM_SIS
Choose this option if you have a SIS graphics card. AGP support is
@@ -25308,16 +26305,6 @@ CONFIG_HOTPLUG_PCI_IBM
When in doubt, say N.
-Control-Program Identification
-CONFIG_HWC_CPI
- This option enables the hardware console interface for system
- identification This is commonly used for workload management and
- gives you a nice name for the system on the service element.
- Please select this option as a module since built-in operation is
- completely untested.
- You should only select this option if you know what you are doing,
- need this feature and intend to run your kernel in LPAR.
-
Enable autotest (llsc). Option to run cache test instead of booting
CONFIG_IA64_SGI_AUTOTEST
Build a kernel used for hardware validation. If you include the
@@ -25393,37 +26380,12 @@ CONFIG_IT8172_TUNING
Say Y here to support tuning the ITE8172's IDE interface. This makes
it possible to set DMA channel or PIO opration and the transfer rate.
-Process warning machine checks
-CONFIG_MACHCHK_WARNING
- Select this option if you want the machine check handler on IBM S/390 or
- zSeries to process warning machine checks (e.g. on power failures).
- If unsure, say "Y".
-
-Pseudo page fault support
-CONFIG_PFAULT
- Select this option, if you want to use PFAULT pseudo page fault
- handling under VM. If running native or in LPAR, this option
- has no effect. If your VM does not support PFAULT, PAGEEX
- pseudo page fault handling will be used.
- Note that VM 4.2 supports PFAULT but has a bug in its
- implementation that causes some problems.
- Everybody who wants to run Linux under VM != VM4.2 should select
- this option.
-
Enable protocol mode for the L1 console
CONFIG_SERIAL_SGI_L1_PROTOCOL
Uses protocol mode instead of raw mode for the level 1 console on the
SGI SN (Scalable NUMA) platform for IA64. If you are compiling for
an SGI SN box then Y is the recommended value, otherwise say N.
-VM shared kernel support
-CONFIG_SHARED_KERNEL
- Select this option, if you want to share the text segment of the
- Linux kernel between different VM guests. This reduces memory
- usage with lots of guests but greatly increases kernel size.
- You should only select this option if you know what you are
- doing and want to exploit this feature.
-
New bus configuration (EXPERIMENTAL)
CONFIG_TULIP_MWI
This configures your Tulip card specifically for the card and
diff --git a/MAINTAINERS b/MAINTAINERS
index 0c6914b..ed55fad 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,3 +1,4 @@
+
List of maintainers and how to submit kernel changes
Please try to follow the guidelines below. This will make things
@@ -241,6 +242,12 @@ L: linux-hams@vger.kernel.org
W: http://www.ife.ee.ethz.ch/~sailer/ham/ham.html
S: Maintained
+BEFS FILE SYSTEM
+P: Will Dyson
+M: will@cs.earlham.edu
+W: http://cs.earlham.edu/~will/software/linux/kernel/BeFS.html
+S: Maintained
+
BERKSHIRE PRODUCTS PC WATCHDOG DRIVER
P: Kenji Hollis
M: kenji@bitgate.com
@@ -266,6 +273,12 @@ M: maxk@qualcomm.com
W: http://bluez.sf.net
S: Maintained
+BLUETOOTH SUBSYSTEM (PC Card Drivers)
+P: Marcel Holtmann
+M: marcel@holtmann.org
+W: http://www.holtmann.org/linux/bluetooth/
+S: Maintained
+
BTTV VIDEO4LINUX DRIVER
P: Gerd Knorr
M: kraxel@bytesex.org
@@ -529,8 +542,8 @@ S: Maintained
EMU10K1 SOUND DRIVER
P: Rui Sousa
M: rui.p.m.sousa@clix.pt
-L: emu10k1-devel@opensource.creative.com
-W: http://opensource.creative.com/
+L: emu10k1-devel@lists.sourceforge.net
+W: http://sourceforge.net/projects/emu10k1/
S: Maintained
ETHEREXPRESS-16 NETWORK DRIVER
@@ -626,8 +639,8 @@ W: http://www.nyx.net/~arobinso
S: Maintained
HFS FILESYSTEM
-P: Adrian Sun
-M: asun@cobaltnet.com
+P: Oliver Neukum
+M: oliver@neukum.org
L: linux-kernel@vger.kernel.org
S: Maintained
@@ -704,8 +717,10 @@ W: http://www.uni-mainz.de/~langm000/linux.html
S: Maintained
IBM ServeRAID RAID DRIVER
-P: Keith Mitchell
-M: ipslinux@us.ibm.com
+P: Jack Hammer
+M: ipslinux@adaptec.com
+P: David Jeffery
+M: ipslinux@adaptec.com
W: http://www.developer.ibm.com/welcome/netfinity/serveraid.html
S: Supported
@@ -796,7 +811,7 @@ S: Maintained
IOC3 DRIVER
P: Ralf Baechle
M: ralf@oss.sgi.com
-L: linux-mips@oss.sgi.com
+L: linux-mips@linux-mips.org
S: Maintained
IP MASQUERADING:
@@ -852,6 +867,13 @@ L: jffs-dev@axis.com
W: http://sources.redhat.com/jffs2/
S: Maintained
+JFS FILESYSTEM
+P: Dave Kleikamp
+M: shaggy@austin.ibm.com
+L: jfs-discussion@oss.software.ibm.com
+W: http://oss.software.ibm.com/developerworks/opensource/jfs/
+S: Supported
+
JOYSTICK DRIVER
P: Vojtech Pavlik
M: vojtech@suse.cz
@@ -1001,7 +1023,7 @@ MIPS
P: Ralf Baechle
M: ralf@gnu.org
W: http://oss.sgi.com/mips/mips-howto.html
-L: linux-mips@oss.sgi.com
+L: linux-mips@linux-mips.org
S: Maintained
MISCELLANEOUS MCA-SUPPORT
@@ -1056,20 +1078,17 @@ M: James.Bottomley@HansenPartnership.com
L: linux-scsi@vger.kernel.org
S: Maintained
-NETFILTER
+NETFILTER/IPTABLES
P: Rusty Russell
-M: rusty@rustcorp.com.au
P: Marc Boucher
-M: marc@mbsi.ca
P: James Morris
-M: jamesm@intercode.com.au
P: Harald Welte
-M: laforge@gnumonks.org
P: Jozsef Kadlecsik
-M: kadlec@blackhole.kfki.hu
+M: coreteam@netfilter.org
W: http://www.netfilter.org/
W: http://www.iptables.org/
-L: netfilter@lists.samba.org
+L: netfilter@lists.netfilter.org
+L: netfilter-devel@lists.netfilter.org
S: Supported
NETROM NETWORK LAYER
@@ -1095,14 +1114,11 @@ NETWORKING [GENERAL]
P: Networking Team
M: netdev@oss.sgi.com
L: linux-net@vger.kernel.org
-W: http://www.uk.linux.org/NetNews.html (2.0 only)
S: Maintained
NETWORKING [IPv4/IPv6]
P: David S. Miller
M: davem@redhat.com
-P: Andi Kleen
-M: ak@muc.de
P: Alexey Kuznetsov
M: kuznet@ms2.inr.ac.ru
P: Pekka Savola (ipv6)
@@ -1236,7 +1252,7 @@ S: Maintained
PCMCIA SUBSYSTEM
P: David Hinds
-M: dhinds@zen.stanford.edu
+M: dahinds@users.sourceforge.net
L: linux-kernel@vger.kernel.org
W: http://pcmcia-cs.sourceforge.net
S: Maintained
@@ -1257,7 +1273,7 @@ S: Maintained
PHILIPS NINO PALM PC
P: Steven Hill
M: sjhill@realitydiluted.com
-L: linux-mips@oss.sgi.com
+L: linux-mips@linux-mips.org
W: http://www.realitydiluted.com/projects/nino
S: Maintained
@@ -1269,6 +1285,15 @@ L: pnp-devel@ferret.lmh.ox.ac.uk
W: http://www-jcr.lmh.ox.ac.uk/~pnp/
S: Maintained
+POWERVR2 FRAMEBUFFER DRIVER
+P: M. R. Brown
+M: mrbrown@0xd6.org
+P: Paul Mundt
+M: lethal@0xd6.org
+L: linux-fbdev-devel@lists.sourceforge.net
+W: http://www.linuxdc.org
+S: Maintained
+
PPP PROTOCOL DRIVERS AND COMPRESSORS
P: Paul Mackerras
M: paulus@samba.org
@@ -1353,10 +1378,10 @@ L: linux-kernel@vger.kernel.org
S: Maintained
RME96XX MULTICHANNEL SOUND DRIVER
-P: Guenter Geiger
-M: geiger@epy.co.at
-L: linux-kernel@vger.kernel.org
-S: Maintained
+P: Guenter Geiger
+M: geiger@epy.co.at
+L: linux-kernel@vger.kernel.org
+S: Maintained
RTLINUX REALTIME LINUX
P: Victor Yodaiken
@@ -1530,6 +1555,13 @@ W: http://www.m17n.org/linux-sh/
W: http://www.rr.iij4u.or.jp/~kkojima/linux-sh4.html
S: Maintained
+SUPERH WATCHDOG
+P: Paul Mundt
+M: lethal@0xd6.org
+L: linuxsh-dev@lists.sourceforge.net
+W: http://www.linuxsh.org
+S: Maintained
+
SVGA HANDLING
P: Martin Mares
M: mj@ucw.cz
@@ -1541,6 +1573,20 @@ P: Christoph Hellwig
M: hch@infradead.org
S: Maintained
+TI GRAPH LINK USB (SilverLink) CABLE DRIVER
+P: Romain Lievin
+M: roms@lpg.ticalc.org
+P: Julien Blache
+M: jb@technologeek.org
+S: Maintained
+
+TIEMAN VOYAGER USB BRAILLE DISPLAY DRIVER
+P: Stephane Dalton
+M: sdalton@videotron.ca
+P: Stéphane Doyon
+M: s.doyon@videotron.ca
+S: Maintained
+
TIEMAN VOYAGER USB BRAILLE DISPLAY DRIVER
P: Stephane Dalton
M: sdalton@videotron.ca
@@ -1635,7 +1681,7 @@ S: Maintained
USB AUERSWALD DRIVER
P: Wolfgang Muees
-M: wmues@nexgo.de
+M: wolfgang@iksw-muees.de
L: linux-usb-users@lists.sourceforge.net
L: linux-usb-devel@lists.sourceforge.net
S: Maintained
@@ -1864,6 +1910,13 @@ P: Ingo Molnar
M: mingo@redhat.com
S: Maintained
+X86-64 port
+P: Andi Kleen
+M: ak@suse.de
+L: discuss@x86-64.org
+W: http://www.x86-64.org
+S: Maintained
+
YAM DRIVER FOR AX.25
P: Jean-Paul Roubelat
M: jpr@f6fbb.org
diff --git a/Makefile b/Makefile
index a57277b..baba73b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
VERSION = 2
PATCHLEVEL = 4
-SUBLEVEL = 19
+SUBLEVEL = 20
EXTRAVERSION =
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
@@ -178,7 +178,7 @@ DRIVERS-$(CONFIG_DIO) += drivers/dio/dio.a
DRIVERS-$(CONFIG_SBUS) += drivers/sbus/sbus_all.o
DRIVERS-$(CONFIG_ZORRO) += drivers/zorro/driver.o
DRIVERS-$(CONFIG_FC4) += drivers/fc4/fc4.a
-DRIVERS-$(CONFIG_PPC) += drivers/macintosh/macintosh.o
+DRIVERS-$(CONFIG_PPC32) += drivers/macintosh/macintosh.o
DRIVERS-$(CONFIG_MAC) += drivers/macintosh/macintosh.o
DRIVERS-$(CONFIG_ISAPNP) += drivers/pnp/pnp.o
DRIVERS-$(CONFIG_SGI_IP22) += drivers/sgi/sgi.a
@@ -188,11 +188,13 @@ DRIVERS-$(CONFIG_HAMRADIO) += drivers/net/hamradio/hamradio.o
DRIVERS-$(CONFIG_TC) += drivers/tc/tc.a
DRIVERS-$(CONFIG_USB) += drivers/usb/usbdrv.o
DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o
+DRIVERS-$(CONFIG_HIL) += drivers/hil/hil.o
DRIVERS-$(CONFIG_I2O) += drivers/message/i2o/i2o.o
DRIVERS-$(CONFIG_IRDA) += drivers/net/irda/irda.o
DRIVERS-$(CONFIG_I2C) += drivers/i2c/i2c.o
DRIVERS-$(CONFIG_PHONE) += drivers/telephony/telephony.o
DRIVERS-$(CONFIG_MD) += drivers/md/mddev.o
+DRIVERS-$(CONFIG_GSC) += drivers/gsc/gscbus.o
DRIVERS-$(CONFIG_BLUEZ) += drivers/bluetooth/bluetooth.o
DRIVERS-$(CONFIG_HOTPLUG_PCI) += drivers/hotplug/vmlinux-obj.o
DRIVERS-$(CONFIG_ISDN_BOOL) += drivers/isdn/vmlinux-obj.o
@@ -266,7 +268,7 @@ include arch/$(ARCH)/Makefile
# 'kbuild_2_4_nostdinc :=' or -I/usr/include for kernel code and you are not UML
# then your code is broken! KAO.
-kbuild_2_4_nostdinc := -nostdinc $(shell $(CC) -print-search-dirs | sed -ne 's/install: \(.*\)/-I \1include/gp')
+kbuild_2_4_nostdinc := -nostdinc -iwithprefix include
export kbuild_2_4_nostdinc
export CPPFLAGS CFLAGS CFLAGS_KERNEL AFLAGS AFLAGS_KERNEL
@@ -377,7 +379,7 @@ fs lib mm ipc kernel drivers net: dummy
TAGS: dummy
{ find include/asm-${ARCH} -name '*.h' -print ; \
find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print ; \
- find $(SUBDIRS) init arch/${ARCH} -name '*.[chS]' ; } | grep -v SCCS | etags -
+ find $(SUBDIRS) init arch/${ARCH} -name '*.[chS]' ; } | grep -v SCCS | grep -v '\.svn' | etags -
# Exuberant ctags works better with -I
tags: dummy
@@ -495,7 +497,7 @@ sums:
dep-files: scripts/mkdep archdep include/linux/version.h
scripts/mkdep -- init/*.c > .depend
- scripts/mkdep -- `find $(FINDHPATH) -name SCCS -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend
+ scripts/mkdep -- `find $(FINDHPATH) \( -name SCCS -o -name .svn \) -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend
$(MAKE) $(patsubst %,_sfdep_%,$(SUBDIRS)) _FASTDEP_ALL_SUB_DIRS="$(SUBDIRS)"
ifdef CONFIG_MODVERSIONS
$(MAKE) update-modverfile
diff --git a/arch/um/Makefile b/arch/um/Makefile
index aaf350f..27d9f50 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -25,7 +25,7 @@ ifneq ($(MAKEFILE-y),)
include $(addprefix $(ARCH_DIR)/,$(MAKEFILE-y))
endif
-EXTRAVERSION := $(EXTRAVERSION)-51um
+EXTRAVERSION := $(EXTRAVERSION)-1um
include/linux/version.h: arch/$(ARCH)/Makefile
diff --git a/arch/um/config.in b/arch/um/config.in
index c470ed5..e738e57 100644
--- a/arch/um/config.in
+++ b/arch/um/config.in
@@ -88,6 +88,8 @@ source drivers/md/Config.in
source drivers/mtd/Config.in
+source lib/Config.in
+
mainmenu_option next_comment
comment 'Kernel hacking'
bool 'Debug memory allocations' CONFIG_DEBUG_SLAB
diff --git a/arch/um/fs/hostfs/hostfs_kern.c b/arch/um/fs/hostfs/hostfs_kern.c
index 2b63356..a9a692b 100644
--- a/arch/um/fs/hostfs/hostfs_kern.c
+++ b/arch/um/fs/hostfs/hostfs_kern.c
@@ -435,7 +435,7 @@ static struct inode *get_inode(struct super_block *sb, struct dentry *dentry,
char *name;
int type, err = -ENOMEM, rdev;
- inode = get_empty_inode();
+ inode = new_inode(sb);
if(inode == NULL)
goto out;
diff --git a/arch/um/fs/hppfs/hppfs_kern.c b/arch/um/fs/hppfs/hppfs_kern.c
index 68c0d53..2925495 100644
--- a/arch/um/fs/hppfs/hppfs_kern.c
+++ b/arch/um/fs/hppfs/hppfs_kern.c
@@ -625,7 +625,7 @@ static struct inode *get_inode(struct super_block *sb, struct dentry *dentry,
struct inode *inode;
int err = -ENOMEM;
- inode = get_empty_inode();
+ inode = new_inode(sb);
if(inode == NULL)
goto out;
diff --git a/arch/um/kernel/sys_call_table.c b/arch/um/kernel/sys_call_table.c
index b27f05e..22f488e 100644
--- a/arch/um/kernel/sys_call_table.c
+++ b/arch/um/kernel/sys_call_table.c
@@ -219,6 +219,18 @@ extern syscall_handler_t sys_getdents64;
extern syscall_handler_t sys_gettid;
extern syscall_handler_t sys_readahead;
extern syscall_handler_t sys_tkill;
+extern syscall_handler_t sys_setxattr;
+extern syscall_handler_t sys_lsetxattr;
+extern syscall_handler_t sys_fsetxattr;
+extern syscall_handler_t sys_getxattr;
+extern syscall_handler_t sys_lgetxattr;
+extern syscall_handler_t sys_fgetxattr;
+extern syscall_handler_t sys_listxattr;
+extern syscall_handler_t sys_llistxattr;
+extern syscall_handler_t sys_flistxattr;
+extern syscall_handler_t sys_removexattr;
+extern syscall_handler_t sys_lremovexattr;
+extern syscall_handler_t sys_fremovexattr;
extern syscall_handler_t um_mount;
extern syscall_handler_t um_time;
@@ -393,7 +405,7 @@ syscall_handler_t *sys_call_table[] = {
[ __NR_sched_getparam ] = sys_sched_getparam,
[ __NR_sched_setscheduler ] = sys_sched_setscheduler,
[ __NR_sched_getscheduler ] = sys_sched_getscheduler,
- [ __NR_sched_yield ] = (syscall_handler_t *) sys_sched_yield,
+ [ __NR_sched_yield ] = (syscall_handler_t *) yield,
[ __NR_sched_get_priority_max ] = sys_sched_get_priority_max,
[ __NR_sched_get_priority_min ] = sys_sched_get_priority_min,
[ __NR_sched_rr_get_interval ] = sys_sched_rr_get_interval,
@@ -438,18 +450,18 @@ syscall_handler_t *sys_call_table[] = {
[ __NR_security ] = sys_ni_syscall,
[ __NR_gettid ] = sys_gettid,
[ __NR_readahead ] = sys_readahead,
- [ __NR_setxattr ] = sys_ni_syscall,
- [ __NR_lsetxattr ] = sys_ni_syscall,
- [ __NR_fsetxattr ] = sys_ni_syscall,
- [ __NR_getxattr ] = sys_ni_syscall,
- [ __NR_lgetxattr ] = sys_ni_syscall,
- [ __NR_fgetxattr ] = sys_ni_syscall,
- [ __NR_listxattr ] = sys_ni_syscall,
- [ __NR_llistxattr ] = sys_ni_syscall,
- [ __NR_flistxattr ] = sys_ni_syscall,
- [ __NR_removexattr ] = sys_ni_syscall,
- [ __NR_lremovexattr ] = sys_ni_syscall,
- [ __NR_fremovexattr ] = sys_ni_syscall,
+ [ __NR_setxattr ] = sys_setxattr,
+ [ __NR_lsetxattr ] = sys_lsetxattr,
+ [ __NR_fsetxattr ] = sys_fsetxattr,
+ [ __NR_getxattr ] = sys_getxattr,
+ [ __NR_lgetxattr ] = sys_lgetxattr,
+ [ __NR_fgetxattr ] = sys_fgetxattr,
+ [ __NR_listxattr ] = sys_listxattr,
+ [ __NR_llistxattr ] = sys_llistxattr,
+ [ __NR_flistxattr ] = sys_flistxattr,
+ [ __NR_removexattr ] = sys_removexattr,
+ [ __NR_lremovexattr ] = sys_lremovexattr,
+ [ __NR_fremovexattr ] = sys_fremovexattr,
[ __NR_tkill ] = sys_tkill,
[ __NR_sendfile64 ] = sys_ni_syscall,
[ __NR_futex ] = sys_ni_syscall,
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 66215b6..b8279b6 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -24,7 +24,7 @@ obj-y += mem.o tty_io.o n_tty.o tty_ioctl.o raw.o pty.o misc.o random.o
export-objs := busmouse.o console.o keyboard.o sysrq.o \
misc.o pty.o random.o selection.o serial.o \
sonypi.o tty_io.o tty_ioctl.o generic_serial.o \
- au1000_gpio.o
+ au1000_gpio.o hp_psaux.o nvram.o
mod-subdirs := joystick ftape drm drm-4.0 pcmcia
@@ -71,6 +71,21 @@ ifdef CONFIG_Q40
SERIAL = serial.o
endif
+ifdef CONFIG_APOLLO
+ KEYBD += dn_keyb.o
+endif
+
+ifeq ($(ARCH),parisc)
+ ifdef CONFIG_GSC_PS2
+ KEYBD = hp_psaux.o hp_keyb.o
+ else
+ KEYBD =
+ endif
+ ifdef CONFIG_PDC_CONSOLE
+ CONSOLE += pdc_console.o
+ endif
+endif
+
ifeq ($(ARCH),arm)
ifneq ($(CONFIG_PC_KEYMAP),y)
KEYMAP =
@@ -156,6 +171,7 @@ else
obj-$(CONFIG_PCI) += keyboard.o $(KEYMAP)
endif
+obj-$(CONFIG_HIL) += hp_keyb.o
obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o
obj-$(CONFIG_ATARI_DSP56K) += dsp56k.o
obj-$(CONFIG_ROCKETPORT) += rocket.o
@@ -172,6 +188,7 @@ obj-$(CONFIG_RISCOM8) += riscom8.o
obj-$(CONFIG_ISI) += isicom.o
obj-$(CONFIG_ESPSERIAL) += esp.o
obj-$(CONFIG_SYNCLINK) += synclink.o
+obj-$(CONFIG_SYNCLINKMP) += synclinkmp.o
obj-$(CONFIG_N_HDLC) += n_hdlc.o
obj-$(CONFIG_SPECIALIX) += specialix.o
obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
@@ -183,6 +200,7 @@ obj-$(CONFIG_SERIAL167) += serial167.o
obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o
obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o
obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o
+obj-$(CONFIG_HVC_CONSOLE) += hvc_console.o
obj-$(CONFIG_SERIAL_TX3912) += generic_serial.o serial_tx3912.o
obj-$(CONFIG_TXX927_SERIAL) += serial_txx927.o
@@ -219,6 +237,7 @@ obj-$(CONFIG_I8K) += i8k.o
obj-$(CONFIG_DS1620) += ds1620.o
obj-$(CONFIG_INTEL_RNG) += i810_rng.o
obj-$(CONFIG_AMD_RNG) += amd768_rng.o
+obj-$(CONFIG_AMD_PM768) += amd76x_pm.o
obj-$(CONFIG_ITE_GPIO) += ite_gpio.o
obj-$(CONFIG_AU1000_GPIO) += au1000_gpio.o
@@ -264,10 +283,12 @@ obj-$(CONFIG_MACHZ_WDT) += machzwd.o
obj-$(CONFIG_SH_WDT) += shwdt.o
obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
obj-$(CONFIG_ALIM7101_WDT) += alim7101_wdt.o
+#obj-$(CONFIG_ALIM1535_WDT) += alim1535d_wdt.o
obj-$(CONFIG_INDYDOG) += indydog.o
obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o
obj-$(CONFIG_WAFER_WDT) += wafer5823wdt.o
obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
+obj-$(CONFIG_AMD7XX_TCO) += amd7xx_tco.o
subdir-$(CONFIG_MWAVE) += mwave
ifeq ($(CONFIG_MWAVE),y)
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index d006678..5c98eef 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -106,6 +106,8 @@
extern void con_init_devfs (void);
#endif
+extern void disable_early_printk(void);
+
#define CONSOLE_DEV MKDEV(TTY_MAJOR,0)
#define TTY_DEV MKDEV(TTYAUX_MAJOR,0)
#define SYSCONS_DEV MKDEV(TTYAUX_MAJOR,1)
@@ -1687,6 +1689,21 @@ static int send_break(struct tty_struct *tty, int duration)
return 0;
}
+static int tty_generic_brk(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg)
+{
+ if (cmd == TCSBRK && arg)
+ {
+ /* tcdrain case */
+ int retval = tty_check_change(tty);
+ if (retval)
+ return retval;
+ tty_wait_until_sent(tty, 0);
+ if (signal_pending(current))
+ return -EINTR;
+ }
+ return 0;
+}
+
/*
* Split this up, as gcc can choke on it otherwise..
*/
@@ -1720,11 +1737,12 @@ int tty_ioctl(struct inode * inode, struct file * file,
/* the driver doesn't support them. */
case TCSBRK:
case TCSBRKP:
- if (!tty->driver.ioctl)
- return 0;
- retval = tty->driver.ioctl(tty, file, cmd, arg);
+ retval = -ENOIOCTLCMD;
+ if (tty->driver.ioctl)
+ retval = tty->driver.ioctl(tty, file, cmd, arg);
+ /* Not driver handled */
if (retval == -ENOIOCTLCMD)
- retval = 0;
+ retval = tty_generic_brk(tty, file, cmd, arg);
return retval;
}
}
@@ -2212,6 +2230,9 @@ void __init console_init(void)
* set up the console device so that later boot sequences can
* inform about problems etc..
*/
+#ifdef CONFIG_EARLY_PRINTK
+ disable_early_printk();
+#endif
#ifdef CONFIG_VT
con_init();
#endif
diff --git a/include/asm-um/system-i386.h b/include/asm-um/system-i386.h
index bb77d41..4d71ed3 100644
--- a/include/asm-um/system-i386.h
+++ b/include/asm-um/system-i386.h
@@ -3,4 +3,35 @@
#include "asm/system-generic.h"
+static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
+ unsigned long new, int size)
+{
+ unsigned long prev;
+ switch (size) {
+ case 1:
+ __asm__ __volatile__(LOCK_PREFIX "cmpxchgb %b1,%2"
+ : "=a"(prev)
+ : "q"(new), "m"(*__xg(ptr)), "0"(old)
+ : "memory");
+ return prev;
+ case 2:
+ __asm__ __volatile__(LOCK_PREFIX "cmpxchgw %w1,%2"
+ : "=a"(prev)
+ : "q"(new), "m"(*__xg(ptr)), "0"(old)
+ : "memory");
+ return prev;
+ case 4:
+ __asm__ __volatile__(LOCK_PREFIX "cmpxchgl %1,%2"
+ : "=a"(prev)
+ : "q"(new), "m"(*__xg(ptr)), "0"(old)
+ : "memory");
+ return prev;
+ }
+ return old;
+}
+
+#define cmpxchg(ptr,o,n)\
+ ((__typeof__(*(ptr)))__cmpxchg((ptr),(unsigned long)(o),\
+ (unsigned long)(n),sizeof(*(ptr))))
+
#endif
diff --git a/include/asm-um/timex.h b/include/asm-um/timex.h
index 564eb79..024d22d 100644
--- a/include/asm-um/timex.h
+++ b/include/asm-um/timex.h
@@ -12,4 +12,7 @@ static inline cycles_t get_cycles (void)
return 0;
}
+#define vxtime_lock() do ; while (0)
+#define vxtime_unlock() do ; while (0)
+
#endif
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 79629b6..6e07121 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -206,6 +206,7 @@ extern void update_atime (struct inode *);
extern void buffer_init(unsigned long);
extern void inode_init(unsigned long);
extern void mnt_init(unsigned long);
+extern void files_init(unsigned long mempages);
/* bh state bits */
enum bh_state_bits {
@@ -599,6 +600,7 @@ struct file_lock {
void (*fl_remove)(struct file_lock *); /* lock removal callback */
struct fasync_struct * fl_fasync; /* for lease break notifications */
+ unsigned long fl_break_time; /* for nonblocking lease breaks */
union {
struct nfs_lock_info nfs_fl;
@@ -868,6 +870,10 @@ struct inode_operations {
int (*revalidate) (struct dentry *);
int (*setattr) (struct dentry *, struct iattr *);
int (*getattr) (struct dentry *, struct iattr *);
+ int (*setxattr) (struct dentry *, const char *, void *, size_t, int);
+ ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
+ ssize_t (*listxattr) (struct dentry *, char *, size_t);
+ int (*removexattr) (struct dentry *, const char *);
};
struct seq_file;
@@ -999,7 +1005,6 @@ extern int unregister_filesystem(struct file_system_type *);
extern struct vfsmount *kern_mount(struct file_system_type *);
extern int may_umount(struct vfsmount *);
extern long do_mount(char *, char *, char *, unsigned long, void *);
-extern void umount_tree(struct vfsmount *);
#define kern_umount mntput
@@ -1055,7 +1060,7 @@ static inline int locks_verify_truncate(struct inode *inode,
static inline int get_lease(struct inode *inode, unsigned int mode)
{
- if (inode->i_flock && (inode->i_flock->fl_flags & FL_LEASE))
+ if (inode->i_flock)
return __get_lease(inode, mode);
return 0;
}
@@ -1331,6 +1336,7 @@ extern loff_t default_llseek(struct file *file, loff_t offset, int origin);
extern int FASTCALL(__user_walk(const char *, unsigned, struct nameidata *));
extern int FASTCALL(path_init(const char *, unsigned, struct nameidata *));
extern int FASTCALL(path_walk(const char *, struct nameidata *));
+extern int FASTCALL(path_lookup(const char *, unsigned, struct nameidata *));
extern int FASTCALL(link_path_walk(const char *, struct nameidata *));
extern void path_release(struct nameidata *);
extern int follow_down(struct vfsmount **, struct dentry **);
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 290516b..df8eeb4 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -12,6 +12,7 @@
#include <linux/stddef.h>
#include <linux/types.h>
#include <linux/compiler.h>
+#include <asm/byteorder.h>
/* Optimization barrier */
/* The "volatile" is due to gcc bugs */
@@ -107,6 +108,8 @@ extern int oops_in_progress; /* If set, an oops, panic(), BUG() or die() is in
extern int tainted;
extern const char *print_tainted(void);
+extern void dump_stack(void);
+
#if DEBUG
#define pr_debug(fmt,arg...) \
printk(KERN_DEBUG fmt,##arg)
@@ -128,11 +131,17 @@ extern const char *print_tainted(void);
((unsigned char *)&addr)[2], \
((unsigned char *)&addr)[3]
+#if defined(__LITTLE_ENDIAN)
#define HIPQUAD(addr) \
((unsigned char *)&addr)[3], \
((unsigned char *)&addr)[2], \
((unsigned char *)&addr)[1], \
((unsigned char *)&addr)[0]
+#elif defined(__BIG_ENDIAN)
+#define HIPQUAD NIPQUAD
+#else
+#error "Please fix asm/byteorder.h"
+#endif /* __LITTLE_ENDIAN */
/*
* min()/max() macros that also do
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h
index 0cd1407..ec6c32d 100644
--- a/include/linux/kernel_stat.h
+++ b/include/linux/kernel_stat.h
@@ -26,7 +26,9 @@ struct kernel_stat {
unsigned int dk_drive_wblk[DK_MAX_MAJOR][DK_MAX_DISK];
unsigned int pgpgin, pgpgout;
unsigned int pswpin, pswpout;
-#if !defined(CONFIG_ARCH_S390)
+#if defined (__hppa__)
+ unsigned int irqs[NR_IRQ_REGS][IRQ_PER_REGION];
+#elif !defined(CONFIG_ARCH_S390)
unsigned int irqs[NR_CPUS][NR_IRQS];
#endif
unsigned int context_swtch;
@@ -34,12 +36,22 @@ struct kernel_stat {
extern struct kernel_stat kstat;
-#if !defined(CONFIG_ARCH_S390)
+extern unsigned long nr_context_switches(void);
+
+#if defined (__hppa__)
/*
* Number of interrupts per specific IRQ source, since bootup
*/
static inline int kstat_irqs (int irq)
{
+ return kstat.irqs[IRQ_REGION(irq)][IRQ_OFFSET(irq)];
+}
+#elif !defined(CONFIG_ARCH_S390)
+/*
+ * Number of interrupts per specific IRQ source, since bootup
+ */
+extern inline int kstat_irqs (int irq)
+{
int i, sum=0;
for (i = 0 ; i < smp_num_cpus ; i++)
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 89a2b2e..d362c39 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -57,38 +57,38 @@
*/
struct screen_info {
- unsigned char orig_x; /* 0x00 */
- unsigned char orig_y; /* 0x01 */
- unsigned short dontuse1; /* 0x02 -- EXT_MEM_K sits here */
- unsigned short orig_video_page; /* 0x04 */
- unsigned char orig_video_mode; /* 0x06 */
- unsigned char orig_video_cols; /* 0x07 */
- unsigned short unused2; /* 0x08 */
- unsigned short orig_video_ega_bx; /* 0x0a */
- unsigned short unused3; /* 0x0c */
- unsigned char orig_video_lines; /* 0x0e */
- unsigned char orig_video_isVGA; /* 0x0f */
- unsigned short orig_video_points; /* 0x10 */
+ u8 orig_x; /* 0x00 */
+ u8 orig_y; /* 0x01 */
+ u16 dontuse1; /* 0x02 -- EXT_MEM_K sits here */
+ u16 orig_video_page; /* 0x04 */
+ u8 orig_video_mode; /* 0x06 */
+ u8 orig_video_cols; /* 0x07 */
+ u16 unused2; /* 0x08 */
+ u16 orig_video_ega_bx; /* 0x0a */
+ u16 unused3; /* 0x0c */
+ u8 orig_video_lines; /* 0x0e */
+ u8 orig_video_isVGA; /* 0x0f */
+ u16 orig_video_points; /* 0x10 */
/* VESA graphic mode -- linear frame buffer */
- unsigned short lfb_width; /* 0x12 */
- unsigned short lfb_height; /* 0x14 */
- unsigned short lfb_depth; /* 0x16 */
- unsigned long lfb_base; /* 0x18 */
- unsigned long lfb_size; /* 0x1c */
- unsigned short dontuse2, dontuse3; /* 0x20 -- CL_MAGIC and CL_OFFSET here */
- unsigned short lfb_linelength; /* 0x24 */
- unsigned char red_size; /* 0x26 */
- unsigned char red_pos; /* 0x27 */
- unsigned char green_size; /* 0x28 */
- unsigned char green_pos; /* 0x29 */
- unsigned char blue_size; /* 0x2a */
- unsigned char blue_pos; /* 0x2b */
- unsigned char rsvd_size; /* 0x2c */
- unsigned char rsvd_pos; /* 0x2d */
- unsigned short vesapm_seg; /* 0x2e */
- unsigned short vesapm_off; /* 0x30 */
- unsigned short pages; /* 0x32 */
+ u16 lfb_width; /* 0x12 */
+ u16 lfb_height; /* 0x14 */
+ u16 lfb_depth; /* 0x16 */
+ u32 lfb_base; /* 0x18 */
+ u32 lfb_size; /* 0x1c */
+ u16 dontuse2, dontuse3; /* 0x20 -- CL_MAGIC and CL_OFFSET here */
+ u16 lfb_linelength; /* 0x24 */
+ u8 red_size; /* 0x26 */
+ u8 red_pos; /* 0x27 */
+ u8 green_size; /* 0x28 */
+ u8 green_pos; /* 0x29 */
+ u8 blue_size; /* 0x2a */
+ u8 blue_pos; /* 0x2b */
+ u8 rsvd_size; /* 0x2c */
+ u8 rsvd_pos; /* 0x2d */
+ u16 vesapm_seg; /* 0x2e */
+ u16 vesapm_off; /* 0x30 */
+ u16 pages; /* 0x32 */
/* 0x34 -- 0x3f reserved for future expansion */
};
diff --git a/init/do_mounts.c b/init/do_mounts.c
index ae9aee4..c77668c 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -20,16 +20,17 @@
extern int get_filesystem_list(char * buf);
-asmlinkage long sys_mount(char *dev_name, char *dir_name, char *type,
+extern asmlinkage long sys_mount(char *dev_name, char *dir_name, char *type,
unsigned long flags, void *data);
-asmlinkage long sys_mkdir(char *name, int mode);
-asmlinkage long sys_chdir(char *name);
-asmlinkage long sys_chroot(char *name);
-asmlinkage long sys_unlink(char *name);
-asmlinkage long sys_symlink(char *old, char *new);
-asmlinkage long sys_mknod(char *name, int mode, dev_t dev);
-asmlinkage long sys_umount(char *name, int flags);
-asmlinkage long sys_ioctl(int fd, int cmd, unsigned long arg);
+extern asmlinkage long sys_mkdir(const char *name, int mode);
+extern asmlinkage long sys_chdir(const char *name);
+extern asmlinkage long sys_fchdir(int fd);
+extern asmlinkage long sys_chroot(const char *name);
+extern asmlinkage long sys_unlink(const char *name);
+extern asmlinkage long sys_symlink(const char *old, const char *new);
+extern asmlinkage long sys_mknod(const char *name, int mode, dev_t dev);
+extern asmlinkage long sys_umount(char *name, int flags);
+extern asmlinkage long sys_ioctl(int fd, int cmd, unsigned long arg);
#ifdef CONFIG_BLK_DEV_INITRD
unsigned int real_root_dev; /* do_proc_dointvec cannot handle kdev_t */
@@ -196,6 +197,13 @@ static struct dev_name_struct {
{ "ida/c0d13p",0x48D0 },
{ "ida/c0d14p",0x48E0 },
{ "ida/c0d15p",0x48F0 },
+ { "ida/c1d0p",0x4900 },
+ { "ida/c2d0p",0x4A00 },
+ { "ida/c3d0p",0x4B00 },
+ { "ida/c4d0p",0x4C00 },
+ { "ida/c5d0p",0x4D00 },
+ { "ida/c6d0p",0x4E00 },
+ { "ida/c7d0p",0x4F00 },
#endif
#if defined(CONFIG_BLK_CPQ_CISS_DA) || defined(CONFIG_BLK_CPQ_CISS_DA_MODULE)
{ "cciss/c0d0p",0x6800 },
@@ -214,6 +222,13 @@ static struct dev_name_struct {
{ "cciss/c0d13p",0x68D0 },
{ "cciss/c0d14p",0x68E0 },
{ "cciss/c0d15p",0x68F0 },
+ { "cciss/c1d0p",0x6900 },
+ { "cciss/c2d0p",0x6A00 },
+ { "cciss/c3d0p",0x6B00 },
+ { "cciss/c4d0p",0x6C00 },
+ { "cciss/c5d0p",0x6D00 },
+ { "cciss/c6d0p",0x6E00 },
+ { "cciss/c7d0p",0x6F00 },
#endif
{ "ataraid/d0p",0x7200 },
{ "ataraid/d1p",0x7210 },
@@ -245,7 +260,8 @@ static struct dev_name_struct {
kdev_t __init name_to_kdev_t(char *line)
{
- int base = 0;
+ int base = 0, offs;
+ char *end;
if (strncmp(line,"/dev/",5) == 0) {
struct dev_name_struct *dev = root_dev_names;
@@ -260,7 +276,10 @@ kdev_t __init name_to_kdev_t(char *line)
dev++;
} while (dev->name);
}
- return to_kdev_t(base + simple_strtoul(line,NULL,base?10:16));
+ offs = simple_strtoul(line, &end, base?10:16);
+ if (*end)
+ offs = 0;
+ return to_kdev_t(base + offs);
}
static int __init root_dev_setup(char *line)
@@ -546,7 +565,8 @@ static int __init rd_load_image(char *from)
#ifdef CONFIG_BLK_DEV_RAM
int in_fd, out_fd;
- int nblocks, rd_blocks, devblocks, i;
+ unsigned long rd_blocks, devblocks;
+ int nblocks, i;
char *buf;
unsigned short rotate = 0;
#if !defined(CONFIG_ARCH_S390) && !defined(CONFIG_PPC_ISERIES)
@@ -757,18 +777,17 @@ static void __init mount_root(void)
}
#ifdef CONFIG_BLK_DEV_INITRD
+static int old_fd, root_fd;
static int do_linuxrc(void * shell)
{
static char *argv[] = { "linuxrc", NULL, };
extern char * envp_init[];
- sys_chdir("/root");
- sys_mount(".", "/", NULL, MS_MOVE, NULL);
- sys_chroot(".");
-
- mount_devfs_fs ();
-
- close(0);close(1);close(2);
+ close(old_fd);
+ close(root_fd);
+ close(0);
+ close(1);
+ close(2);
setsid();
(void) open("/dev/console",O_RDWR,0);
(void) dup(0);
@@ -786,19 +805,29 @@ static void __init handle_initrd(void)
int i, pid;
create_dev("/dev/root.old", ram0, NULL);
+ /* mount initrd on rootfs' /root */
mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
sys_mkdir("/old", 0700);
- sys_chdir("/old");
+ root_fd = open("/", 0, 0);
+ old_fd = open("/old", 0, 0);
+ /* move initrd over / and chdir/chroot in initrd root */
+ sys_chdir("/root");
+ sys_mount(".", "/", NULL, MS_MOVE, NULL);
+ sys_chroot(".");
+ mount_devfs_fs ();
pid = kernel_thread(do_linuxrc, "/linuxrc", SIGCHLD);
if (pid > 0) {
- while (pid != wait(&i)) {
- current->policy |= SCHED_YIELD;
- schedule();
- }
+ while (pid != wait(&i))
+ yield();
}
- sys_mount("..", ".", NULL, MS_MOVE, NULL);
+ /* move initrd to rootfs' /old */
+ sys_fchdir(old_fd);
+ sys_mount("/", ".", NULL, MS_MOVE, NULL);
+ /* switch root and cwd back to / of rootfs */
+ sys_fchdir(root_fd);
+ sys_chroot(".");
sys_umount("/old/dev", 0);
if (real_root_dev == ram0) {
@@ -878,7 +907,7 @@ out:
mount_devfs_fs ();
}
-#ifdef BUILD_CRAMDISK
+#if defined(BUILD_CRAMDISK) && defined(CONFIG_BLK_DEV_RAM)
/*
* gzip declarations
@@ -1023,4 +1052,4 @@ static int __init crd_load(int in_fd, int out_fd)
return result;
}
-#endif /* BUILD_CRAMDISK */
+#endif /* BUILD_CRAMDISK && CONFIG_BLK_DEV_RAM */
diff --git a/kernel/panic.c b/kernel/panic.c
index a8faf03..d140a48 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -96,7 +96,7 @@ NORET_TYPE void panic(const char * fmt, ...)
#endif
sti();
for(;;) {
-#if defined(__i386__) && defined(CONFIG_VT)
+#if defined(CONFIG_X86) && defined(CONFIG_VT)
extern void panic_blink(void);
panic_blink();
#endif
diff --git a/mm/mmap.c b/mm/mmap.c
index 731f4d9..98889ad 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -909,6 +909,7 @@ no_mmaps:
end_index = pgd_index(last);
if (end_index > start_index) {
clear_page_tables(mm, start_index, end_index - start_index);
+ flush_tlb_pgtables(mm, first & PGDIR_MASK, last & PGDIR_MASK);
}
}
@@ -1153,13 +1154,14 @@ void exit_mmap(struct mm_struct * mm)
kmem_cache_free(vm_area_cachep, mpnt);
mpnt = next;
}
- flush_tlb_mm(mm);
/* This is just debugging */
if (mm->map_count)
BUG();
clear_page_tables(mm, FIRST_USER_PGD_NR, USER_PTRS_PER_PGD);
+
+ flush_tlb_mm(mm);
}
/* Insert vm structure into process list sorted by address
diff --git a/mm/slab.c b/mm/slab.c
index 6afc358..0fbf7b1 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -123,7 +123,7 @@
* Bufctl's are used for linking objs within a slab
* linked offsets.
*
- * This implementaion relies on "struct page" for locating the cache &
+ * This implementation relies on "struct page" for locating the cache &
* slab an object belongs to.
* This allows the bufctl structure to be small (one int), but limits
* the number of objects a slab (not a cache) can contain when off-slab
@@ -970,8 +970,6 @@ int kmem_cache_shrink(kmem_cache_t *cachep)
if (!cachep || in_interrupt() || !is_chained_kmem_cache(cachep))
BUG();
- drain_cpu_caches(cachep);
-
spin_lock_irq(&cachep->spinlock);
ret = __kmem_cache_shrink_locked(cachep);
spin_unlock_irq(&cachep->spinlock);
@@ -1608,6 +1606,15 @@ void kfree (const void *objp)
local_irq_restore(flags);
}
+unsigned int kmem_cache_size(kmem_cache_t *cachep)
+{
+#if DEBUG
+ if (cachep->flags & SLAB_RED_ZONE)
+ return (cachep->objsize - 2*BYTES_PER_WORD);
+#endif
+ return cachep->objsize;
+}
+
kmem_cache_t * kmem_find_general_cachep (size_t size, int gfpflags)
{
cache_sizes_t *csizep = cache_sizes;
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-22 04:26:57 +0000