ia64/xen-unstable

changeset 742:cdf93771d86e

bitkeeper revision 1.442 (3f6b2e49JtzRepcvZIm043BgqTyXfw)

Support building of agpgart module for XFree86
author iap10@labyrinth.cl.cam.ac.uk
date Fri Sep 19 16:26:49 2003 +0000 (2003-09-19)
parents eaff535a8422
children 86ea0e2fba1d
files xenolinux-2.4.22-sparse/arch/xeno/config.in xenolinux-2.4.22-sparse/arch/xeno/defconfig xenolinux-2.4.22-sparse/arch/xeno/kernel/i386_ksyms.c xenolinux-2.4.22-sparse/mkbuildtree
line diff
     1.1 --- a/xenolinux-2.4.22-sparse/arch/xeno/config.in	Fri Sep 19 16:26:16 2003 +0000
     1.2 +++ b/xenolinux-2.4.22-sparse/arch/xeno/config.in	Fri Sep 19 16:26:49 2003 +0000
     1.3 @@ -123,32 +123,28 @@ fi
     1.4  dep_bool '  Initial RAM disk (initrd) support' CONFIG_BLK_DEV_INITRD $CONFIG_BLK_DEV_RAM
     1.5  bool 'Per partition statistics in /proc/partitions' CONFIG_BLK_STATS
     1.6  bool 'XenoLinux virtual block device support' CONFIG_XENOLINUX_BLOCK
     1.7 -endmenu
     1.8 +#endmenu
     1.9  define_bool CONFIG_BLK_DEV_IDE_MODES n
    1.10  define_bool CONFIG_BLK_DEV_HD n
    1.11 +endmenu
    1.12 +
    1.13 +source drivers/char/Config.in
    1.14  
    1.15  
    1.16 +source fs/Config.in
    1.17 +
    1.18  mainmenu_option next_comment
    1.19 -comment 'Character devices'
    1.20 +comment 'Console drivers'
    1.21  
    1.22  bool 'Xen console support' CONFIG_XEN_CONSOLE
    1.23 -comment 'The options below are alpha-stage and will probably not work'
    1.24 -bool 'Virtual terminal' CONFIG_VT
    1.25 +
    1.26  if [ "$CONFIG_VT" = "y" ]; then
    1.27 -   bool '  Support for console on virtual terminal' CONFIG_VT_CONSOLE
    1.28 -   bool '  Support for VGA Video' CONFIG_VGA_CONSOLE
    1.29 -   bool '  Support for Dummy Video (for testing)' CONFIG_DUMMY_CONSOLE
    1.30 -   bool '  PS/2 mouse (aka "auxiliary device") support' CONFIG_PSMOUSE
    1.31 +   bool 'VGA text console' CONFIG_VGA_CONSOLE
    1.32 +   bool 'Dummy console' CONFIG_DUMMY_CONSOLE 
    1.33 +#   bool 'Video mode selection support' CONFIG_VIDEO_SELECT
    1.34  fi
    1.35 -
    1.36 -bool 'Unix98 PTY support' CONFIG_UNIX98_PTYS
    1.37 -if [ "$CONFIG_UNIX98_PTYS" = "y" ]; then
    1.38 -   int 'Maximum number of Unix98 PTYs in use (0-2048)' CONFIG_UNIX98_PTY_COUNT 256
    1.39 -fi
    1.40 -
    1.41  endmenu
    1.42  
    1.43 -source fs/Config.in
    1.44  
    1.45  mainmenu_option next_comment
    1.46  comment 'Kernel hacking'
     2.1 --- a/xenolinux-2.4.22-sparse/arch/xeno/defconfig	Fri Sep 19 16:26:16 2003 +0000
     2.2 +++ b/xenolinux-2.4.22-sparse/arch/xeno/defconfig	Fri Sep 19 16:26:49 2003 +0000
     2.3 @@ -69,6 +69,23 @@ CONFIG_PACKET_MMAP=y
     2.4  # CONFIG_NETLINK_DEV is not set
     2.5  CONFIG_NETFILTER=y
     2.6  # CONFIG_NETFILTER_DEBUG is not set
     2.7 +CONFIG_FILTER=y
     2.8 +CONFIG_UNIX=y
     2.9 +CONFIG_INET=y
    2.10 +# CONFIG_IP_MULTICAST is not set
    2.11 +# CONFIG_IP_ADVANCED_ROUTER is not set
    2.12 +CONFIG_IP_PNP=y
    2.13 +CONFIG_IP_PNP_DHCP=y
    2.14 +# CONFIG_IP_PNP_BOOTP is not set
    2.15 +# CONFIG_IP_PNP_RARP is not set
    2.16 +# CONFIG_NET_IPIP is not set
    2.17 +# CONFIG_NET_IPGRE is not set
    2.18 +# CONFIG_INET_ECN is not set
    2.19 +# CONFIG_SYN_COOKIES is not set
    2.20 +
    2.21 +#
    2.22 +#   IP: Netfilter Configuration
    2.23 +#
    2.24  CONFIG_IP_NF_CONNTRACK=y
    2.25  CONFIG_IP_NF_FTP=y
    2.26  # CONFIG_IP_NF_AMANDA is not set
    2.27 @@ -93,11 +110,11 @@ CONFIG_IP_NF_MATCH_STATE=y
    2.28  CONFIG_IP_NF_MATCH_CONNTRACK=y
    2.29  CONFIG_IP_NF_FILTER=y
    2.30  CONFIG_IP_NF_TARGET_REJECT=y
    2.31 -CONFIG_IP_NF_TARGET_REDIRECT=y
    2.32  CONFIG_IP_NF_NAT=y
    2.33 -# CONFIG_IP_NF_NAT_LOCAL is not set
    2.34  CONFIG_IP_NF_NAT_NEEDED=y
    2.35  CONFIG_IP_NF_TARGET_MASQUERADE=y
    2.36 +CONFIG_IP_NF_TARGET_REDIRECT=y
    2.37 +# CONFIG_IP_NF_NAT_LOCAL is not set
    2.38  CONFIG_IP_NF_NAT_IRC=y
    2.39  CONFIG_IP_NF_NAT_FTP=y
    2.40  CONFIG_IP_NF_NAT_TFTP=y
    2.41 @@ -106,19 +123,6 @@ CONFIG_IP_NF_TARGET_LOG=y
    2.42  CONFIG_IP_NF_TARGET_ULOG=y
    2.43  # CONFIG_IP_NF_TARGET_TCPMSS is not set
    2.44  # CONFIG_IP_NF_ARPTABLES is not set
    2.45 -CONFIG_FILTER=y
    2.46 -CONFIG_UNIX=y
    2.47 -CONFIG_INET=y
    2.48 -# CONFIG_IP_MULTICAST is not set
    2.49 -# CONFIG_IP_ADVANCED_ROUTER is not set
    2.50 -CONFIG_IP_PNP=y
    2.51 -CONFIG_IP_PNP_DHCP=y
    2.52 -# CONFIG_IP_PNP_BOOTP is not set
    2.53 -# CONFIG_IP_PNP_RARP is not set
    2.54 -# CONFIG_NET_IPIP is not set
    2.55 -# CONFIG_NET_IPGRE is not set
    2.56 -# CONFIG_INET_ECN is not set
    2.57 -# CONFIG_SYN_COOKIES is not set
    2.58  # CONFIG_VLAN_8021Q is not set
    2.59  
    2.60  #
    2.61 @@ -130,7 +134,6 @@ CONFIG_IP_PNP_DHCP=y
    2.62  #
    2.63  # Appletalk devices
    2.64  #
    2.65 -# CONFIG_DEV_APPLETALK is not set
    2.66  # CONFIG_DECNET is not set
    2.67  # CONFIG_BRIDGE is not set
    2.68  
    2.69 @@ -147,14 +150,6 @@ CONFIG_IP_PNP_DHCP=y
    2.70  #
    2.71  # Block devices
    2.72  #
    2.73 -# CONFIG_BLK_DEV_FD is not set
    2.74 -# CONFIG_BLK_DEV_XD is not set
    2.75 -# CONFIG_PARIDE is not set
    2.76 -# CONFIG_BLK_CPQ_DA is not set
    2.77 -# CONFIG_BLK_CPQ_CISS_DA is not set
    2.78 -# CONFIG_CISS_SCSI_TAPE is not set
    2.79 -# CONFIG_BLK_DEV_DAC960 is not set
    2.80 -# CONFIG_BLK_DEV_UMEM is not set
    2.81  CONFIG_BLK_DEV_LOOP=y
    2.82  CONFIG_BLK_DEV_NBD=y
    2.83  CONFIG_BLK_DEV_RAM=y
    2.84 @@ -166,20 +161,23 @@ CONFIG_XENOLINUX_BLOCK=y
    2.85  # CONFIG_BLK_DEV_HD is not set
    2.86  
    2.87  #
    2.88 -# Console drivers
    2.89 +# Character devices
    2.90  #
    2.91 -CONFIG_VGA_CONSOLE=y
    2.92 -# CONFIG_VIDEO_SELECT is not set
    2.93 -CONFIG_DUMMY_CONSOLE=y
    2.94 -
    2.95 +CONFIG_VT=y
    2.96 +CONFIG_VT_CONSOLE=y
    2.97 +# CONFIG_SERIAL is not set
    2.98 +# CONFIG_SERIAL_NONSTANDARD is not set
    2.99 +CONFIG_UNIX98_PTYS=y
   2.100 +CONFIG_UNIX98_PTY_COUNT=256
   2.101 +# CONFIG_PRINTER is not set
   2.102 +# CONFIG_PPDEV is not set
   2.103 +# CONFIG_TIPAR is not set
   2.104 +# CONFIG_HVC_CONSOLE is not set
   2.105  
   2.106  #
   2.107 -# Character devices
   2.108 +# I2C support
   2.109  #
   2.110 -CONFIG_XEN_CONSOLE=y
   2.111 -CONFIG_VT=y
   2.112 -CONFIG_VT_CONSOLE=y
   2.113 -# CONFIG_UNIX98_PTYS is not set
   2.114 +# CONFIG_I2C is not set
   2.115  
   2.116  #
   2.117  # Mice
   2.118 @@ -191,6 +189,52 @@ CONFIG_PSMOUSE=y
   2.119  # CONFIG_PC110_PAD is not set
   2.120  # CONFIG_MK712_MOUSE is not set
   2.121  
   2.122 +#
   2.123 +# Joysticks
   2.124 +#
   2.125 +# CONFIG_INPUT_GAMEPORT is not set
   2.126 +# CONFIG_INPUT_SERIO is not set
   2.127 +
   2.128 +#
   2.129 +# Joysticks
   2.130 +#
   2.131 +# CONFIG_INPUT_IFORCE_USB is not set
   2.132 +# CONFIG_INPUT_DB9 is not set
   2.133 +# CONFIG_INPUT_GAMECON is not set
   2.134 +# CONFIG_INPUT_TURBOGRAFX is not set
   2.135 +# CONFIG_QIC02_TAPE is not set
   2.136 +# CONFIG_IPMI_HANDLER is not set
   2.137 +
   2.138 +#
   2.139 +# Watchdog Cards
   2.140 +#
   2.141 +# CONFIG_WATCHDOG is not set
   2.142 +# CONFIG_SCx200_GPIO is not set
   2.143 +# CONFIG_AMD_RNG is not set
   2.144 +# CONFIG_INTEL_RNG is not set
   2.145 +# CONFIG_AMD_PM768 is not set
   2.146 +# CONFIG_NVRAM is not set
   2.147 +# CONFIG_RTC is not set
   2.148 +# CONFIG_DTLK is not set
   2.149 +# CONFIG_R3964 is not set
   2.150 +# CONFIG_APPLICOM is not set
   2.151 +
   2.152 +#
   2.153 +# Ftape, the floppy tape device driver
   2.154 +#
   2.155 +# CONFIG_FTAPE is not set
   2.156 +CONFIG_AGP=m
   2.157 +CONFIG_AGP_INTEL=y
   2.158 +CONFIG_AGP_I810=y
   2.159 +CONFIG_AGP_VIA=y
   2.160 +CONFIG_AGP_AMD=y
   2.161 +CONFIG_AGP_AMD_8151=y
   2.162 +CONFIG_AGP_SIS=y
   2.163 +CONFIG_AGP_ALI=y
   2.164 +CONFIG_AGP_SWORKS=y
   2.165 +CONFIG_AGP_NVIDIA=y
   2.166 +# CONFIG_DRM is not set
   2.167 +# CONFIG_MWAVE is not set
   2.168  
   2.169  #
   2.170  # File systems
   2.171 @@ -199,15 +243,6 @@ CONFIG_PSMOUSE=y
   2.172  CONFIG_AUTOFS_FS=y
   2.173  CONFIG_AUTOFS4_FS=y
   2.174  # CONFIG_REISERFS_FS is not set
   2.175 -# CONFIG_REISERFS_CHECK is not set
   2.176 -# CONFIG_REISERFS_PROC_INFO is not set
   2.177 -# CONFIG_ADFS_FS is not set
   2.178 -# CONFIG_ADFS_FS_RW is not set
   2.179 -# CONFIG_AFFS_FS is not set
   2.180 -# CONFIG_HFS_FS is not set
   2.181 -# CONFIG_BEFS_FS is not set
   2.182 -# CONFIG_BEFS_DEBUG is not set
   2.183 -# CONFIG_BFS_FS is not set
   2.184  CONFIG_EXT3_FS=y
   2.185  CONFIG_JBD=y
   2.186  # CONFIG_JBD_DEBUG is not set
   2.187 @@ -215,7 +250,6 @@ CONFIG_FAT_FS=y
   2.188  CONFIG_MSDOS_FS=y
   2.189  CONFIG_UMSDOS_FS=y
   2.190  CONFIG_VFAT_FS=y
   2.191 -# CONFIG_EFS_FS is not set
   2.192  # CONFIG_JFFS_FS is not set
   2.193  # CONFIG_JFFS2_FS is not set
   2.194  # CONFIG_CRAMFS is not set
   2.195 @@ -225,52 +259,33 @@ CONFIG_ISO9660_FS=y
   2.196  CONFIG_JOLIET=y
   2.197  CONFIG_ZISOFS=y
   2.198  # CONFIG_JFS_FS is not set
   2.199 -# CONFIG_JFS_DEBUG is not set
   2.200 -# CONFIG_JFS_STATISTICS is not set
   2.201  # CONFIG_MINIX_FS is not set
   2.202  # CONFIG_VXFS_FS is not set
   2.203  # CONFIG_NTFS_FS is not set
   2.204 -# CONFIG_NTFS_RW is not set
   2.205  # CONFIG_HPFS_FS is not set
   2.206  CONFIG_PROC_FS=y
   2.207 -# CONFIG_DEVFS_FS is not set
   2.208 -# CONFIG_DEVFS_MOUNT is not set
   2.209 -# CONFIG_DEVFS_DEBUG is not set
   2.210  # CONFIG_DEVPTS_FS is not set
   2.211  # CONFIG_QNX4FS_FS is not set
   2.212 -# CONFIG_QNX4FS_RW is not set
   2.213  # CONFIG_ROMFS_FS is not set
   2.214  CONFIG_EXT2_FS=y
   2.215  # CONFIG_SYSV_FS is not set
   2.216  # CONFIG_UDF_FS is not set
   2.217 -# CONFIG_UDF_RW is not set
   2.218  # CONFIG_UFS_FS is not set
   2.219 -# CONFIG_UFS_FS_WRITE is not set
   2.220  
   2.221  #
   2.222  # Network File Systems
   2.223  #
   2.224  # CONFIG_CODA_FS is not set
   2.225 -# CONFIG_INTERMEZZO_FS is not set
   2.226  CONFIG_NFS_FS=y
   2.227  CONFIG_NFS_V3=y
   2.228  CONFIG_ROOT_NFS=y
   2.229  CONFIG_NFSD=y
   2.230  CONFIG_NFSD_V3=y
   2.231 -# CONFIG_NFSD_TCP is not set
   2.232  CONFIG_SUNRPC=y
   2.233  CONFIG_LOCKD=y
   2.234  CONFIG_LOCKD_V4=y
   2.235  # CONFIG_SMB_FS is not set
   2.236  # CONFIG_NCP_FS is not set
   2.237 -# CONFIG_NCPFS_PACKET_SIGNING is not set
   2.238 -# CONFIG_NCPFS_IOCTL_LOCKING is not set
   2.239 -# CONFIG_NCPFS_STRONG is not set
   2.240 -# CONFIG_NCPFS_NFS_NS is not set
   2.241 -# CONFIG_NCPFS_OS2_NS is not set
   2.242 -# CONFIG_NCPFS_SMALLDOS is not set
   2.243 -# CONFIG_NCPFS_NLS is not set
   2.244 -# CONFIG_NCPFS_EXTRAS is not set
   2.245  CONFIG_ZISOFS_FS=y
   2.246  
   2.247  #
   2.248 @@ -338,6 +353,13 @@ CONFIG_NLS_ISO8859_1=y
   2.249  # CONFIG_NLS_UTF8 is not set
   2.250  
   2.251  #
   2.252 +# Console drivers
   2.253 +#
   2.254 +CONFIG_XEN_CONSOLE=y
   2.255 +CONFIG_VGA_CONSOLE=y
   2.256 +CONFIG_DUMMY_CONSOLE=y
   2.257 +
   2.258 +#
   2.259  # Kernel hacking
   2.260  #
   2.261  CONFIG_DEBUG_KERNEL=y
   2.262 @@ -349,6 +371,7 @@ CONFIG_DEBUG_KERNEL=y
   2.263  # CONFIG_DEBUG_BUGVERBOSE is not set
   2.264  CONFIG_KALLSYMS=y
   2.265  # CONFIG_FRAME_POINTER is not set
   2.266 +
   2.267  #
   2.268  # ACPI Support
   2.269  #
     3.1 --- a/xenolinux-2.4.22-sparse/arch/xeno/kernel/i386_ksyms.c	Fri Sep 19 16:26:16 2003 +0000
     3.2 +++ b/xenolinux-2.4.22-sparse/arch/xeno/kernel/i386_ksyms.c	Fri Sep 19 16:26:49 2003 +0000
     3.3 @@ -56,6 +56,8 @@ EXPORT_SYMBOL(boot_cpu_data);
     3.4  EXPORT_SYMBOL(dump_thread);
     3.5  EXPORT_SYMBOL(dump_fpu);
     3.6  EXPORT_SYMBOL(dump_extended_fpu);
     3.7 +EXPORT_SYMBOL(__ioremap);
     3.8 +EXPORT_SYMBOL(iounmap);
     3.9  EXPORT_SYMBOL(enable_irq);
    3.10  EXPORT_SYMBOL(disable_irq);
    3.11  EXPORT_SYMBOL(disable_irq_nosync);
     4.1 --- a/xenolinux-2.4.22-sparse/mkbuildtree	Fri Sep 19 16:26:16 2003 +0000
     4.2 +++ b/xenolinux-2.4.22-sparse/mkbuildtree	Fri Sep 19 16:26:49 2003 +0000
     4.3 @@ -135,6 +135,7 @@ ln -sf ../asm-i386/mtrr.h
     4.4  ln -sf ../asm-i386/namei.h 
     4.5  ln -sf ../asm-i386/param.h 
     4.6  ln -sf ../asm-i386/parport.h 
     4.7 +ln -sf ../asm-i386/pci.h
     4.8  ln -sf ../asm-i386/pgtable-3level.h 
     4.9  ln -sf ../asm-i386/poll.h 
    4.10  ln -sf ../asm-i386/posix_types.h