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

linux-2.6.11-xen-sparse/arch/xen/Kconfig.drivers

@@ -49,9 +49,46 @@ source "drivers/infiniband/Kconfig"
 endif
 
 if !XEN_PHYSDEV_ACCESS
+
+menu "Character devices"
+
 config UNIX98_PTYS
 	bool
 	default y
+
+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
+	range 1 256
+	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.
+
+endmenu
+
 endif
 
 endmenu

linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32

@@ -340,6 +340,12 @@ CONFIG_NETDEVICES=y
 # CONFIG_SHAPER is not set
 # CONFIG_NETCONSOLE is not set
 CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# Character devices
+#
 
 #
 # File systems