ia64/xen-unstable

changeset 4789:9309936ac00f

bitkeeper revision 1.1389.5.27 (427c8e04Cw1QmPRFKoyXwgtFXzwXjA)

Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@firebug.cl.cam.ac.uk
date Sat May 07 09:44:36 2005 +0000 (2005-05-07)
parents 4c2795394ccd 330e761256ad
children c08ca4f9f375
files linux-2.6.11-xen-sparse/arch/xen/Kconfig.drivers linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/Kconfig.drivers	Sat May 07 09:19:14 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/Kconfig.drivers	Sat May 07 09:44:36 2005 +0000
     1.3 @@ -49,9 +49,46 @@ source "drivers/infiniband/Kconfig"
     1.4  endif
     1.5  
     1.6  if !XEN_PHYSDEV_ACCESS
     1.7 +
     1.8 +menu "Character devices"
     1.9 +
    1.10  config UNIX98_PTYS
    1.11  	bool
    1.12  	default y
    1.13 +
    1.14 +config LEGACY_PTYS
    1.15 +	bool "Legacy (BSD) PTY support"
    1.16 +	default y
    1.17 +	---help---
    1.18 +	  A pseudo terminal (PTY) is a software device consisting of two
    1.19 +	  halves: a master and a slave. The slave device behaves identical to
    1.20 +	  a physical terminal; the master device is used by a process to
    1.21 +	  read data from and write data to the slave, thereby emulating a
    1.22 +	  terminal. Typical programs for the master side are telnet servers
    1.23 +	  and xterms.
    1.24 +
    1.25 +	  Linux has traditionally used the BSD-like names /dev/ptyxx
    1.26 +	  for masters and /dev/ttyxx for slaves of pseudo
    1.27 +	  terminals. This scheme has a number of problems, including
    1.28 +	  security.  This option enables these legacy devices; on most
    1.29 +	  systems, it is safe to say N.
    1.30 +
    1.31 +
    1.32 +config LEGACY_PTY_COUNT
    1.33 +	int "Maximum number of legacy PTY in use"
    1.34 +	depends on LEGACY_PTYS
    1.35 +	range 1 256
    1.36 +	default "256"
    1.37 +	---help---
    1.38 +	  The maximum number of legacy PTYs that can be used at any one time.
    1.39 +	  The default is 256, and should be more than enough.  Embedded
    1.40 +	  systems may want to reduce this to save memory.
    1.41 +
    1.42 +	  When not in use, each legacy PTY occupies 12 bytes on 32-bit
    1.43 +	  architectures and 24 bytes on 64-bit architectures.
    1.44 +
    1.45 +endmenu
    1.46 +
    1.47  endif
    1.48  
    1.49  endmenu
     2.1 --- a/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32	Sat May 07 09:19:14 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32	Sat May 07 09:44:36 2005 +0000
     2.3 @@ -340,6 +340,12 @@ CONFIG_NETDEVICES=y
     2.4  # CONFIG_SHAPER is not set
     2.5  # CONFIG_NETCONSOLE is not set
     2.6  CONFIG_UNIX98_PTYS=y
     2.7 +CONFIG_LEGACY_PTYS=y
     2.8 +CONFIG_LEGACY_PTY_COUNT=256
     2.9 +
    2.10 +#
    2.11 +# Character devices
    2.12 +#
    2.13  
    2.14  #
    2.15  # File systems