linux-cvs-patches
[Top] [All Lists]

CVS Update@linux-mips.org: linux

To: linux-cvs-patches@linux-mips.org
Subject: CVS Update@linux-mips.org: linux
From: ralf@linux-mips.org
Date: Thu, 15 Sep 2005 17:24:40 +0100
Reply-to: linux-mips@linux-mips.org
Sender: linux-cvs-patches-bounce@linux-mips.org
CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ralf@ftp.linux-mips.org 05/09/15 17:24:34

Added files:
        arch/um        : Kconfig.char Kconfig.i386 Kconfig.net 
                         Kconfig.scsi Kconfig.x86_64 

Log message:
        These were dropped from the rc1 merge by accident.

diff -urN linux/arch/um/Kconfig.char linux/arch/um/Kconfig.char
--- linux/arch/um/Kconfig.char  1970/01/01 00:00:00
+++ linux/arch/um/Kconfig.char  2005-09-15 17:24:34.484357000 +0100     1.1
@@ -0,0 +1,214 @@
+
+menu "Character Devices"
+
+config STDERR_CONSOLE
+       bool "stderr console"
+       default y
+       help
+       console driver which dumps all printk messages to stderr.
+
+config STDIO_CONSOLE
+       bool
+       default y
+
+config SSL
+       bool "Virtual serial line"
+       help
+        The User-Mode Linux environment allows you to create virtual serial
+        lines on the UML that are usually made to show up on the host as
+        ttys or ptys.
+
+        See <http://user-mode-linux.sourceforge.net/input.html> for more
+        information and command line examples of how to use this facility.
+
+        Unless you have a specific reason for disabling this, say Y.
+
+config NULL_CHAN
+       bool "null channel support"
+       help
+        This option enables support for attaching UML consoles and serial
+        lines to a device similar to /dev/null.  Data written to it disappears
+        and there is never any data to be read.
+
+config PORT_CHAN
+       bool "port channel support"
+       help
+        This option enables support for attaching UML consoles and serial
+        lines to host portals.  They may be accessed with 'telnet <host>
+        <port number>'.  Any number of consoles and serial lines may be
+        attached to a single portal, although what UML device you get when
+        you telnet to that portal will be unpredictable.
+        It is safe to say 'Y' here.
+
+config PTY_CHAN
+       bool "pty channel support"
+       help
+        This option enables support for attaching UML consoles and serial
+        lines to host pseudo-terminals.  Access to both traditional
+        pseudo-terminals (/dev/pty*) and pts pseudo-terminals are controlled
+        with this option.  The assignment of UML devices to host devices
+        will be announced in the kernel message log.
+        It is safe to say 'Y' here.
+
+config TTY_CHAN
+       bool "tty channel support"
+       help
+        This option enables support for attaching UML consoles and serial
+        lines to host terminals.  Access to both virtual consoles
+        (/dev/tty*) and the slave side of pseudo-terminals (/dev/ttyp* and
+        /dev/pts/*) are controlled by this option.
+        It is safe to say 'Y' here.
+
+config XTERM_CHAN
+       bool "xterm channel support"
+       help
+        This option enables support for attaching UML consoles and serial
+        lines to xterms.  Each UML device so assigned will be brought up in
+        its own xterm.
+        If you disable this option, then CONFIG_PT_PROXY will be disabled as
+        well, since UML's gdb currently requires an xterm.
+        It is safe to say 'Y' here.
+
+config NOCONFIG_CHAN
+       bool
+       default !(XTERM_CHAN && TTY_CHAN && PTY_CHAN && PORT_CHAN && NULL_CHAN)
+
+config CON_ZERO_CHAN
+       string "Default main console channel initialization"
+       default "fd:0,fd:1"
+       help
+        This is the string describing the channel to which the main console
+        will be attached by default.  This value can be overridden from the
+        command line.  The default value is "fd:0,fd:1", which attaches the
+        main console to stdin and stdout.
+        It is safe to leave this unchanged.
+
+config CON_CHAN
+       string "Default console channel initialization"
+       default "xterm"
+       help
+        This is the string describing the channel to which all consoles
+        except the main console will be attached by default.  This value can
+        be overridden from the command line.  The default value is "xterm",
+        which brings them up in xterms.
+        It is safe to leave this unchanged, although you may wish to change
+        this if you expect the UML that you build to be run in environments
+        which don't have X or xterm available.
+
+config SSL_CHAN
+       string "Default serial line channel initialization"
+       default "pty"
+       help
+        This is the string describing the channel to which the serial lines
+        will be attached by default.  This value can be overridden from the
+        command line.  The default value is "pty", which attaches them to
+        traditional pseudo-terminals.
+        It is safe to leave this unchanged, although you may wish to change
+        this if you expect the UML that you build to be run in environments
+        which don't have a set of /dev/pty* devices.
+
+config UNIX98_PTYS
+       bool "Unix98 PTY support"
+       ---help---
+         A pseudo terminal (PTY) is a software device consisting of two
+         halves: a master and a slave. The slave device behaves identical to
+         a physical terminal; the master device is used by a process to
+         read data from and write data to the slave, thereby emulating a
+         terminal. Typical programs for the master side are telnet servers
+         and xterms.
+
+         Linux has traditionally used the BSD-like names /dev/ptyxx for
+         masters and /dev/ttyxx for slaves of pseudo terminals. This scheme
+         has a number of problems. The GNU C library glibc 2.1 and later,
+         however, supports the Unix98 naming standard: in order to acquire a
+         pseudo terminal, a process opens /dev/ptmx; the number of the pseudo
+         terminal is then made available to the process and the pseudo
+         terminal slave can be accessed as /dev/pts/<number>. What was
+         traditionally /dev/ttyp2 will then be /dev/pts/2, for example.
+
+         All modern Linux systems use the Unix98 ptys.  Say Y unless
+         you're on an embedded system and want to conserve memory.
+
+config LEGACY_PTYS
+       bool "Legacy (BSD) PTY support"
+       default y
+       ---help---
+         A pseudo terminal (PTY) is a software device consisting of two
+         halves: a master and a slave. The slave device behaves identical to
+         a physical terminal; the master device is used by a process to
+         read data from and write data to the slave, thereby emulating a
+         terminal. Typical programs for the master side are telnet servers
+         and xterms.
+
+         Linux has traditionally used the BSD-like names /dev/ptyxx
+         for masters and /dev/ttyxx for slaves of pseudo
+         terminals. This scheme has a number of problems, including
+         security.  This option enables these legacy devices; on most
+         systems, it is safe to say N.
+
+
+config LEGACY_PTY_COUNT
+       int "Maximum number of legacy PTY in use"
+       depends on LEGACY_PTYS
+       default "256"
+       ---help---
+         The maximum number of legacy PTYs that can be used at any one time.
+         The default is 256, and should be more than enough.  Embedded
+         systems may want to reduce this to save memory.
+
+         When not in use, each legacy PTY occupies 12 bytes on 32-bit
+         architectures and 24 bytes on 64-bit architectures.
+
+config WATCHDOG
+       bool "Watchdog Timer Support"
+
+config WATCHDOG_NOWAYOUT
+       bool "Disable watchdog shutdown on close"
+       depends on WATCHDOG
+
+config SOFT_WATCHDOG
+       tristate "Software Watchdog"
+       depends on WATCHDOG
+
+config UML_WATCHDOG
+       tristate "UML watchdog"
+       depends on WATCHDOG
+
+config UML_SOUND
+       tristate "Sound support"
+       help
+        This option enables UML sound support.  If enabled, it will pull in
+        soundcore and the UML hostaudio relay, which acts as a intermediary
+        between the host's dsp and mixer devices and the UML sound system.
+        It is safe to say 'Y' here.
+
+config SOUND
+       tristate
+       default UML_SOUND
+
+config HOSTAUDIO
+       tristate
+       default UML_SOUND
+
+config UML_RANDOM
+       tristate "Hardware random number generator"
+       help
+       This option enables UML's "hardware" random number generator.  It
+       attaches itself to the host's /dev/random, supplying as much entropy
+       as the host has, rather than the small amount the UML gets from its
+       own drivers.  It registers itself as a standard hardware random number
+       generator, major 10, minor 183, and the canonical device name is
+       /dev/hwrng.
+       The way to make use of this is to install the rng-tools package
+       (check your distro, or download from
+       http://sourceforge.net/projects/gkernel/).  rngd periodically reads
+       /dev/hwrng and injects the entropy into /dev/random.
+
+config MMAPPER
+       tristate "iomem emulation driver"
+       help
+       This driver allows a host file to be used as emulated IO memory inside
+       UML.
+
+endmenu
+
diff -urN linux/arch/um/Kconfig.i386 linux/arch/um/Kconfig.i386
--- linux/arch/um/Kconfig.i386  1970/01/01 00:00:00
+++ linux/arch/um/Kconfig.i386  2005-09-15 17:24:34.502278000 +0100     1.1
@@ -0,0 +1,44 @@
+config UML_X86
+       bool
+       default y
+
+config 64BIT
+       bool
+       default n
+
+config SEMAPHORE_SLEEPERS
+       bool
+       default y
+
+config TOP_ADDR
+       hex
+       default 0xc0000000 if !HOST_2G_2G
+       default 0x80000000 if HOST_2G_2G
+
+config 3_LEVEL_PGTABLES
+       bool "Three-level pagetables"
+       default n
+       help
+       Three-level pagetables will let UML have more than 4G of physical
+       memory.  All the memory that can't be mapped directly will be treated
+       as high memory.
+
+config STUB_CODE
+       hex
+       default 0xbfffe000
+
+config STUB_DATA
+       hex
+       default 0xbffff000
+
+config STUB_START
+       hex
+       default STUB_CODE
+
+config ARCH_HAS_SC_SIGNALS
+       bool
+       default y
+
+config ARCH_REUSE_HOST_VSYSCALL_AREA
+       bool
+       default y
diff -urN linux/arch/um/Kconfig.net linux/arch/um/Kconfig.net
--- linux/arch/um/Kconfig.net   1970/01/01 00:00:00
+++ linux/arch/um/Kconfig.net   2005-09-15 17:24:34.535163000 +0100     1.1
@@ -0,0 +1,180 @@
+
+menu "UML Network Devices"
+       depends on NET
+
+# UML virtual driver
+config UML_NET
+       bool "Virtual network device"
+       help
+        While the User-Mode port cannot directly talk to any physical
+        hardware devices, this choice and the following transport options
+        provide one or more virtual network devices through which the UML
+        kernels can talk to each other, the host, and with the host's help,
+        machines on the outside world.
+
+        For more information, including explanations of the networking and
+        sample configurations, see
+        <http://user-mode-linux.sourceforge.net/networking.html>.
+
+        If you'd like to be able to enable networking in the User-Mode
+        linux environment, say Y; otherwise say N.  Note that you must
+        enable at least one of the following transport options to actually
+        make use of UML networking.
+
+config UML_NET_ETHERTAP
+       bool "Ethertap transport"
+       depends on UML_NET
+       help
+        The Ethertap User-Mode Linux network transport allows a single
+        running UML to exchange packets with its host over one of the
+        host's Ethertap devices, such as /dev/tap0.  Additional running
+        UMLs can use additional Ethertap devices, one per running UML.
+        While the UML believes it's on a (multi-device, broadcast) virtual
+        Ethernet network, it's in fact communicating over a point-to-point
+        link with the host.
+
+        To use this, your host kernel must have support for Ethertap
+        devices.  Also, if your host kernel is 2.4.x, it must have
+        CONFIG_NETLINK_DEV configured as Y or M.
+
+        For more information, see
+        <http://user-mode-linux.sourceforge.net/networking.html>  That site
+        has examples of the UML command line to use to enable Ethertap
+        networking.
+
+        If you'd like to set up an IP network with the host and/or the
+        outside world, say Y to this, the Daemon Transport and/or the
+        Slip Transport.  You'll need at least one of them, but may choose
+        more than one without conflict.  If you don't need UML networking,
+        say N.
+
+config UML_NET_TUNTAP
+       bool "TUN/TAP transport"
+       depends on UML_NET
+       help
+        The UML TUN/TAP network transport allows a UML instance to exchange
+        packets with the host over a TUN/TAP device.  This option will only
+        work with a 2.4 host, unless you've applied the TUN/TAP patch to
+        your 2.2 host kernel.
+
+        To use this transport, your host kernel must have support for TUN/TAP
+        devices, either built-in or as a module.
+
+config UML_NET_SLIP
+       bool "SLIP transport"
+       depends on UML_NET
+       help
+        The slip User-Mode Linux network transport allows a running UML to
+        network with its host over a point-to-point link.  Unlike Ethertap,
+        which can carry any Ethernet frame (and hence even non-IP packets),
+        the slip transport can only carry IP packets.
+
+        To use this, your host must support slip devices.
+
+        For more information, see
+        <http://user-mode-linux.sourceforge.net/networking.html>.  That site
+        has examples of the UML command line to use to enable slip
+        networking, and details of a few quirks with it.
+
+        The Ethertap Transport is preferred over slip because of its
+        limitations.  If you prefer slip, however, say Y here.  Otherwise
+        choose the Multicast transport (to network multiple UMLs on
+        multiple hosts), Ethertap (to network with the host and the
+        outside world), and/or the Daemon transport (to network multiple
+        UMLs on a single host).  You may choose more than one without
+        conflict.  If you don't need UML networking, say N.
+
+config UML_NET_DAEMON
+       bool "Daemon transport"
+       depends on UML_NET
+       help
+        This User-Mode Linux network transport allows one or more running
+        UMLs on a single host to communicate with each other, but not to
+        the host.
+
+        To use this form of networking, you'll need to run the UML
+        networking daemon on the host.
+
+        For more information, see
+        <http://user-mode-linux.sourceforge.net/networking.html>  That site
+        has examples of the UML command line to use to enable Daemon
+        networking.
+
+        If you'd like to set up a network with other UMLs on a single host,
+        say Y.  If you need a network between UMLs on multiple physical
+        hosts, choose the Multicast Transport.  To set up a network with
+        the host and/or other IP machines, say Y to the Ethertap or Slip
+        transports.  You'll need at least one of them, but may choose
+        more than one without conflict.  If you don't need UML networking,
+        say N.
+
+config UML_NET_MCAST
+       bool "Multicast transport"
+       depends on UML_NET
+       help
+        This Multicast User-Mode Linux network transport allows multiple
+        UMLs (even ones running on different host machines!) to talk to
+        each other over a virtual ethernet network.  However, it requires
+        at least one UML with one of the other transports to act as a
+        bridge if any of them need to be able to talk to their hosts or any
+        other IP machines.
+
+        To use this, your host kernel(s) must support IP Multicasting.
+
+        For more information, see
+        <http://user-mode-linux.sourceforge.net/networking.html>  That site
+        has examples of the UML command line to use to enable Multicast
+        networking, and notes about the security of this approach.
+
+        If you need UMLs on multiple physical hosts to communicate as if
+        they shared an Ethernet network, say Y.  If you need to communicate
+        with other IP machines, make sure you select one of the other
+        transports (possibly in addition to Multicast; they're not
+        exclusive).  If you don't need to network UMLs say N to each of
+        the transports.
+
+config UML_NET_PCAP
+       bool "pcap transport"
+       depends on UML_NET && EXPERIMENTAL
+       help
+       The pcap transport makes a pcap packet stream on the host look
+       like an ethernet device inside UML.  This is useful for making
+       UML act as a network monitor for the host.  You must have libcap
+       installed in order to build the pcap transport into UML.
+
+        For more information, see
+        <http://user-mode-linux.sourceforge.net/networking.html>  That site
+        has examples of the UML command line to use to enable this option.
+
+       If you intend to use UML as a network monitor for the host, say
+       Y here.  Otherwise, say N.
+
+config UML_NET_SLIRP
+       bool "SLiRP transport"
+       depends on UML_NET
+       help
+        The SLiRP User-Mode Linux network transport allows a running UML
+        to network by invoking a program that can handle SLIP encapsulated
+        packets.  This is commonly (but not limited to) the application
+        known as SLiRP, a program that can re-socket IP packets back onto
+        the host on which it is run.  Only IP packets are supported,
+        unlike other network transports that can handle all Ethernet
+        frames.  In general, slirp allows the UML the same IP connectivity
+        to the outside world that the host user is permitted, and unlike
+        other transports, SLiRP works without the need of root level
+        privleges, setuid binaries, or SLIP devices on the host.  This
+        also means not every type of connection is possible, but most
+        situations can be accomodated with carefully crafted slirp
+        commands that can be passed along as part of the network device's
+        setup string.  The effect of this transport on the UML is similar
+        that of a host behind a firewall that masquerades all network
+        connections passing through it (but is less secure).
+
+        To use this you should first have slirp compiled somewhere
+        accessible on the host, and have read its documentation.  If you
+        don't need UML networking, say N.
+
+        Startup example: "eth0=slirp,FE:FD:01:02:03:04,/usr/local/bin/slirp"
+
+endmenu
+
diff -urN linux/arch/um/Kconfig.scsi linux/arch/um/Kconfig.scsi
--- linux/arch/um/Kconfig.scsi  1970/01/01 00:00:00
+++ linux/arch/um/Kconfig.scsi  2005-09-15 17:24:34.555633000 +0100     1.1
@@ -0,0 +1,58 @@
+comment "SCSI support type (disk, tape, CD-ROM)"
+       depends on SCSI
+
+config BLK_DEV_SD
+       tristate "SCSI disk support"
+       depends on SCSI
+
+config SD_EXTRA_DEVS
+       int "Maximum number of SCSI disks that can be loaded as modules"
+       depends on BLK_DEV_SD
+       default "40"
+
+config CHR_DEV_ST
+       tristate "SCSI tape support"
+       depends on SCSI
+
+config BLK_DEV_SR
+       tristate "SCSI CD-ROM support"
+       depends on SCSI
+
+config BLK_DEV_SR_VENDOR
+       bool "Enable vendor-specific extensions (for SCSI CDROM)"
+       depends on BLK_DEV_SR
+
+config SR_EXTRA_DEVS
+       int "Maximum number of CDROM devices that can be loaded as modules"
+       depends on BLK_DEV_SR
+       default "2"
+
+config CHR_DEV_SG
+       tristate "SCSI generic support"
+       depends on SCSI
+
+comment "Some SCSI devices (e.g. CD jukebox) support multiple LUNs"
+       depends on SCSI
+
+#if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+config SCSI_DEBUG_QUEUES
+       bool "Enable extra checks in new queueing code"
+       depends on SCSI
+
+#fi
+config SCSI_MULTI_LUN
+       bool "Probe all LUNs on each SCSI device"
+       depends on SCSI
+
+config SCSI_CONSTANTS
+       bool "Verbose SCSI error reporting (kernel size +=12K)"
+       depends on SCSI
+
+config SCSI_LOGGING
+       bool "SCSI logging facility"
+       depends on SCSI
+
+config SCSI_DEBUG
+       tristate "SCSI debugging host simulator (EXPERIMENTAL)"
+       depends on SCSI
+
diff -urN linux/arch/um/Kconfig.x86_64 linux/arch/um/Kconfig.x86_64
--- linux/arch/um/Kconfig.x86_64        1970/01/01 00:00:00
+++ linux/arch/um/Kconfig.x86_64        2005-09-15 17:24:34.569230000 +0100     
1.1
@@ -0,0 +1,43 @@
+config UML_X86
+       bool
+       default y
+
+config 64BIT
+       bool
+       default y
+
+config SEMAPHORE_SLEEPERS
+       bool
+       default y
+
+config TOP_ADDR
+       hex
+       default 0x80000000
+
+config 3_LEVEL_PGTABLES
+       bool
+       default y
+
+config STUB_CODE
+       hex
+       default 0x7fbfffe000
+
+config STUB_DATA
+       hex
+       default 0x7fbffff000
+
+config STUB_START
+       hex
+       default STUB_CODE
+
+config ARCH_HAS_SC_SIGNALS
+       bool
+       default n
+
+config ARCH_REUSE_HOST_VSYSCALL_AREA
+       bool
+       default n
+
+config SMP_BROKEN
+       bool
+       default y

<Prev in Thread] Current Thread [Next in Thread>