ia64/xen-unstable

changeset 8735:f20c10ecef94

Updates ia64 to 2.6.15.
Booted dom0 and domU on an rx2600.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
author cl349@firebug.cl.cam.ac.uk
date Thu Feb 02 10:59:20 2006 +0000 (2006-02-02)
parents 927f9348206b
children 8aeb417387ca
files buildconfigs/linux-defconfig_xen0_ia64 buildconfigs/linux-defconfig_xenU_ia64 linux-2.6-xen-sparse/arch/ia64/Kconfig linux-2.6-xen-sparse/arch/ia64/Makefile linux-2.6-xen-sparse/arch/ia64/kernel/entry.S linux-2.6-xen-sparse/arch/ia64/kernel/head.S linux-2.6-xen-sparse/arch/ia64/kernel/setup.c linux-2.6-xen-sparse/arch/ia64/xen/xenentry.S linux-2.6-xen-sparse/arch/ia64/xen/xenivt.S linux-2.6-xen-sparse/include/asm-ia64/pal.h linux-2.6-xen-sparse/include/asm-ia64/processor.h linux-2.6-xen-sparse/include/asm-ia64/system.h linux-2.6-xen-sparse/lib/Makefile
line diff
     1.1 --- a/buildconfigs/linux-defconfig_xen0_ia64	Wed Feb 01 14:27:35 2006 -0700
     1.2 +++ b/buildconfigs/linux-defconfig_xen0_ia64	Thu Feb 02 10:59:20 2006 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  #
     1.5  # Automatically generated make config: don't edit
     1.6 -# Linux kernel version: 2.6.12.6-xen0
     1.7 -# Wed Dec 21 11:17:02 2005
     1.8 +# Linux kernel version: 2.6.15-xen0
     1.9 +# Wed Feb  1 13:18:15 2006
    1.10  #
    1.11  
    1.12  #
    1.13 @@ -16,6 +16,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
    1.14  # General setup
    1.15  #
    1.16  CONFIG_LOCALVERSION=""
    1.17 +CONFIG_LOCALVERSION_AUTO=y
    1.18  CONFIG_SWAP=y
    1.19  CONFIG_SYSVIPC=y
    1.20  CONFIG_POSIX_MQUEUE=y
    1.21 @@ -28,6 +29,8 @@ CONFIG_KOBJECT_UEVENT=y
    1.22  CONFIG_IKCONFIG=y
    1.23  CONFIG_IKCONFIG_PROC=y
    1.24  # CONFIG_CPUSETS is not set
    1.25 +CONFIG_INITRAMFS_SOURCE=""
    1.26 +CONFIG_CC_OPTIMIZE_FOR_SIZE=y
    1.27  # CONFIG_EMBEDDED is not set
    1.28  CONFIG_KALLSYMS=y
    1.29  CONFIG_KALLSYMS_ALL=y
    1.30 @@ -58,11 +61,29 @@ CONFIG_KMOD=y
    1.31  CONFIG_STOP_MACHINE=y
    1.32  
    1.33  #
    1.34 +# Block layer
    1.35 +#
    1.36 +
    1.37 +#
    1.38 +# IO Schedulers
    1.39 +#
    1.40 +CONFIG_IOSCHED_NOOP=y
    1.41 +CONFIG_IOSCHED_AS=y
    1.42 +CONFIG_IOSCHED_DEADLINE=y
    1.43 +CONFIG_IOSCHED_CFQ=y
    1.44 +CONFIG_DEFAULT_AS=y
    1.45 +# CONFIG_DEFAULT_DEADLINE is not set
    1.46 +# CONFIG_DEFAULT_CFQ is not set
    1.47 +# CONFIG_DEFAULT_NOOP is not set
    1.48 +CONFIG_DEFAULT_IOSCHED="anticipatory"
    1.49 +
    1.50 +#
    1.51  # Processor type and features
    1.52  #
    1.53  CONFIG_IA64=y
    1.54  CONFIG_64BIT=y
    1.55  CONFIG_MMU=y
    1.56 +CONFIG_SWIOTLB=y
    1.57  CONFIG_RWSEM_XCHGADD_ALGORITHM=y
    1.58  CONFIG_GENERIC_CALIBRATE_DELAY=y
    1.59  CONFIG_TIME_INTERPOLATION=y
    1.60 @@ -77,6 +98,7 @@ CONFIG_XEN_BLKDEV_FRONTEND=y
    1.61  CONFIG_XEN_VT=y
    1.62  CONFIG_VT=y
    1.63  CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
    1.64 +CONFIG_DMA_IS_DMA32=y
    1.65  # CONFIG_IA64_GENERIC is not set
    1.66  CONFIG_IA64_DIG=y
    1.67  # CONFIG_IA64_HP_ZX1 is not set
    1.68 @@ -89,23 +111,38 @@ CONFIG_MCKINLEY=y
    1.69  # CONFIG_IA64_PAGE_SIZE_8KB is not set
    1.70  CONFIG_IA64_PAGE_SIZE_16KB=y
    1.71  # CONFIG_IA64_PAGE_SIZE_64KB is not set
    1.72 +CONFIG_PGTABLE_3=y
    1.73 +# CONFIG_PGTABLE_4 is not set
    1.74 +# CONFIG_HZ_100 is not set
    1.75 +CONFIG_HZ_250=y
    1.76 +# CONFIG_HZ_1000 is not set
    1.77 +CONFIG_HZ=250
    1.78  CONFIG_IA64_L1_CACHE_SHIFT=7
    1.79 -# CONFIG_NUMA is not set
    1.80 -CONFIG_VIRTUAL_MEM_MAP=n
    1.81  CONFIG_IA64_CYCLONE=y
    1.82  CONFIG_IOSAPIC=y
    1.83 -CONFIG_FORCE_MAX_ZONEORDER=18
    1.84 +CONFIG_FORCE_MAX_ZONEORDER=11
    1.85  CONFIG_SMP=y
    1.86  CONFIG_NR_CPUS=4
    1.87  CONFIG_HOTPLUG_CPU=y
    1.88  # CONFIG_SCHED_SMT is not set
    1.89  # CONFIG_PREEMPT is not set
    1.90 -CONFIG_HAVE_DEC_LOCK=y
    1.91 +CONFIG_SELECT_MEMORY_MODEL=y
    1.92 +CONFIG_FLATMEM_MANUAL=y
    1.93 +# CONFIG_DISCONTIGMEM_MANUAL is not set
    1.94 +# CONFIG_SPARSEMEM_MANUAL is not set
    1.95 +CONFIG_FLATMEM=y
    1.96 +CONFIG_FLAT_NODE_MEM_MAP=y
    1.97 +# CONFIG_SPARSEMEM_STATIC is not set
    1.98 +CONFIG_SPLIT_PTLOCK_CPUS=4
    1.99 +CONFIG_ARCH_SELECT_MEMORY_MODEL=y
   1.100 +CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
   1.101 +CONFIG_ARCH_FLATMEM_ENABLE=y
   1.102 +CONFIG_ARCH_SPARSEMEM_ENABLE=y
   1.103 +# CONFIG_VIRTUAL_MEM_MAP is not set
   1.104  # CONFIG_IA32_SUPPORT is not set
   1.105  CONFIG_IA64_MCA_RECOVERY=y
   1.106  CONFIG_PERFMON=y
   1.107  CONFIG_IA64_PALINFO=y
   1.108 -CONFIG_ACPI_DEALLOCATE_IRQ=y
   1.109  
   1.110  #
   1.111  # Firmware Drivers
   1.112 @@ -119,35 +156,35 @@ CONFIG_BINFMT_MISC=y
   1.113  # Power management and ACPI
   1.114  #
   1.115  CONFIG_PM=y
   1.116 -CONFIG_ACPI=y
   1.117 +CONFIG_PM_LEGACY=y
   1.118 +# CONFIG_PM_DEBUG is not set
   1.119  
   1.120  #
   1.121  # ACPI (Advanced Configuration and Power Interface) Support
   1.122  #
   1.123 -CONFIG_ACPI_BOOT=y
   1.124 -CONFIG_ACPI_INTERPRETER=y
   1.125 +CONFIG_ACPI=y
   1.126  CONFIG_ACPI_BUTTON=y
   1.127 -# CONFIG_ACPI_VIDEO is not set
   1.128  CONFIG_ACPI_FAN=y
   1.129  CONFIG_ACPI_PROCESSOR=y
   1.130 -# CONFIG_ACPI_HOTPLUG_CPU is not set
   1.131 +CONFIG_ACPI_HOTPLUG_CPU=y
   1.132  CONFIG_ACPI_THERMAL=y
   1.133  CONFIG_ACPI_BLACKLIST_YEAR=0
   1.134  # CONFIG_ACPI_DEBUG is not set
   1.135 -CONFIG_ACPI_BUS=y
   1.136  CONFIG_ACPI_POWER=y
   1.137 -CONFIG_ACPI_PCI=y
   1.138  CONFIG_ACPI_SYSTEM=y
   1.139 -# CONFIG_ACPI_CONTAINER is not set
   1.140 +CONFIG_ACPI_CONTAINER=y
   1.141 +
   1.142 +#
   1.143 +# CPU Frequency scaling
   1.144 +#
   1.145 +# CONFIG_CPU_FREQ is not set
   1.146  
   1.147  #
   1.148  # Bus options (PCI, PCMCIA)
   1.149  #
   1.150  CONFIG_PCI=y
   1.151  CONFIG_PCI_DOMAINS=y
   1.152 -# CONFIG_PCI_MSI is not set
   1.153  CONFIG_PCI_LEGACY_PROC=y
   1.154 -CONFIG_PCI_NAMES=y
   1.155  # CONFIG_PCI_DEBUG is not set
   1.156  
   1.157  #
   1.158 @@ -166,6 +203,103 @@ CONFIG_HOTPLUG_PCI_ACPI=y
   1.159  # CONFIG_PCCARD is not set
   1.160  
   1.161  #
   1.162 +# Networking
   1.163 +#
   1.164 +CONFIG_NET=y
   1.165 +
   1.166 +#
   1.167 +# Networking options
   1.168 +#
   1.169 +CONFIG_PACKET=y
   1.170 +# CONFIG_PACKET_MMAP is not set
   1.171 +CONFIG_UNIX=y
   1.172 +# CONFIG_NET_KEY is not set
   1.173 +CONFIG_INET=y
   1.174 +CONFIG_IP_MULTICAST=y
   1.175 +# CONFIG_IP_ADVANCED_ROUTER is not set
   1.176 +CONFIG_IP_FIB_HASH=y
   1.177 +# CONFIG_IP_PNP is not set
   1.178 +# CONFIG_NET_IPIP is not set
   1.179 +# CONFIG_NET_IPGRE is not set
   1.180 +# CONFIG_IP_MROUTE is not set
   1.181 +CONFIG_ARPD=y
   1.182 +CONFIG_SYN_COOKIES=y
   1.183 +# CONFIG_INET_AH is not set
   1.184 +# CONFIG_INET_ESP is not set
   1.185 +# CONFIG_INET_IPCOMP is not set
   1.186 +# CONFIG_INET_TUNNEL is not set
   1.187 +CONFIG_INET_DIAG=y
   1.188 +CONFIG_INET_TCP_DIAG=y
   1.189 +# CONFIG_TCP_CONG_ADVANCED is not set
   1.190 +CONFIG_TCP_CONG_BIC=y
   1.191 +
   1.192 +#
   1.193 +# IP: Virtual Server Configuration
   1.194 +#
   1.195 +# CONFIG_IP_VS is not set
   1.196 +# CONFIG_IPV6 is not set
   1.197 +CONFIG_NETFILTER=y
   1.198 +# CONFIG_NETFILTER_DEBUG is not set
   1.199 +CONFIG_BRIDGE_NETFILTER=y
   1.200 +
   1.201 +#
   1.202 +# Core Netfilter Configuration
   1.203 +#
   1.204 +# CONFIG_NETFILTER_NETLINK is not set
   1.205 +# CONFIG_NF_CONNTRACK is not set
   1.206 +
   1.207 +#
   1.208 +# IP: Netfilter Configuration
   1.209 +#
   1.210 +# CONFIG_IP_NF_CONNTRACK is not set
   1.211 +# CONFIG_IP_NF_QUEUE is not set
   1.212 +# CONFIG_IP_NF_IPTABLES is not set
   1.213 +CONFIG_IP_NF_ARPTABLES=y
   1.214 +# CONFIG_IP_NF_ARPFILTER is not set
   1.215 +# CONFIG_IP_NF_ARP_MANGLE is not set
   1.216 +
   1.217 +#
   1.218 +# Bridge: Netfilter Configuration
   1.219 +#
   1.220 +# CONFIG_BRIDGE_NF_EBTABLES is not set
   1.221 +
   1.222 +#
   1.223 +# DCCP Configuration (EXPERIMENTAL)
   1.224 +#
   1.225 +# CONFIG_IP_DCCP is not set
   1.226 +
   1.227 +#
   1.228 +# SCTP Configuration (EXPERIMENTAL)
   1.229 +#
   1.230 +# CONFIG_IP_SCTP is not set
   1.231 +# CONFIG_ATM is not set
   1.232 +CONFIG_BRIDGE=y
   1.233 +# CONFIG_VLAN_8021Q is not set
   1.234 +# CONFIG_DECNET is not set
   1.235 +# CONFIG_LLC2 is not set
   1.236 +# CONFIG_IPX is not set
   1.237 +# CONFIG_ATALK is not set
   1.238 +# CONFIG_X25 is not set
   1.239 +# CONFIG_LAPB is not set
   1.240 +# CONFIG_NET_DIVERT is not set
   1.241 +# CONFIG_ECONET is not set
   1.242 +# CONFIG_WAN_ROUTER is not set
   1.243 +
   1.244 +#
   1.245 +# QoS and/or fair queueing
   1.246 +#
   1.247 +# CONFIG_NET_SCHED is not set
   1.248 +
   1.249 +#
   1.250 +# Network testing
   1.251 +#
   1.252 +# CONFIG_NET_PKTGEN is not set
   1.253 +# CONFIG_HAMRADIO is not set
   1.254 +# CONFIG_IRDA is not set
   1.255 +# CONFIG_BT is not set
   1.256 +# CONFIG_IEEE80211 is not set
   1.257 +
   1.258 +#
   1.259  # Device Drivers
   1.260  #
   1.261  
   1.262 @@ -174,10 +308,15 @@ CONFIG_HOTPLUG_PCI_ACPI=y
   1.263  #
   1.264  CONFIG_STANDALONE=y
   1.265  CONFIG_PREVENT_FIRMWARE_BUILD=y
   1.266 -# CONFIG_FW_LOADER is not set
   1.267 +CONFIG_FW_LOADER=y
   1.268  # CONFIG_DEBUG_DRIVER is not set
   1.269  
   1.270  #
   1.271 +# Connector - unified userspace <-> kernelspace linker
   1.272 +#
   1.273 +# CONFIG_CONNECTOR is not set
   1.274 +
   1.275 +#
   1.276  # Memory Technology Devices (MTD)
   1.277  #
   1.278  # CONFIG_MTD is not set
   1.279 @@ -209,16 +348,7 @@ CONFIG_BLK_DEV_RAM=y
   1.280  CONFIG_BLK_DEV_RAM_COUNT=16
   1.281  CONFIG_BLK_DEV_RAM_SIZE=4096
   1.282  CONFIG_BLK_DEV_INITRD=y
   1.283 -CONFIG_INITRAMFS_SOURCE=""
   1.284  # CONFIG_CDROM_PKTCDVD is not set
   1.285 -
   1.286 -#
   1.287 -# IO Schedulers
   1.288 -#
   1.289 -CONFIG_IOSCHED_NOOP=y
   1.290 -CONFIG_IOSCHED_AS=y
   1.291 -CONFIG_IOSCHED_DEADLINE=y
   1.292 -CONFIG_IOSCHED_CFQ=y
   1.293  # CONFIG_ATA_OVER_ETH is not set
   1.294  
   1.295  #
   1.296 @@ -264,6 +394,7 @@ CONFIG_BLK_DEV_CMD64X=y
   1.297  # CONFIG_BLK_DEV_HPT366 is not set
   1.298  # CONFIG_BLK_DEV_SC1200 is not set
   1.299  CONFIG_BLK_DEV_PIIX=y
   1.300 +# CONFIG_BLK_DEV_IT821X is not set
   1.301  # CONFIG_BLK_DEV_NS87415 is not set
   1.302  # CONFIG_BLK_DEV_PDC202XX_OLD is not set
   1.303  # CONFIG_BLK_DEV_PDC202XX_NEW is not set
   1.304 @@ -281,6 +412,7 @@ CONFIG_IDEDMA_AUTO=y
   1.305  #
   1.306  # SCSI device support
   1.307  #
   1.308 +# CONFIG_RAID_ATTRS is not set
   1.309  CONFIG_SCSI=y
   1.310  CONFIG_SCSI_PROC_FS=y
   1.311  
   1.312 @@ -293,6 +425,7 @@ CONFIG_CHR_DEV_OSST=y
   1.313  CONFIG_BLK_DEV_SR=y
   1.314  CONFIG_BLK_DEV_SR_VENDOR=y
   1.315  CONFIG_CHR_DEV_SG=y
   1.316 +# CONFIG_CHR_DEV_SCH is not set
   1.317  
   1.318  #
   1.319  # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
   1.320 @@ -307,10 +440,12 @@ CONFIG_SCSI_LOGGING=y
   1.321  CONFIG_SCSI_SPI_ATTRS=y
   1.322  CONFIG_SCSI_FC_ATTRS=y
   1.323  # CONFIG_SCSI_ISCSI_ATTRS is not set
   1.324 +CONFIG_SCSI_SAS_ATTRS=y
   1.325  
   1.326  #
   1.327  # SCSI low-level drivers
   1.328  #
   1.329 +# CONFIG_ISCSI_TCP is not set
   1.330  # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
   1.331  # CONFIG_SCSI_3W_9XXX is not set
   1.332  # CONFIG_SCSI_ACARD is not set
   1.333 @@ -320,6 +455,7 @@ CONFIG_SCSI_FC_ATTRS=y
   1.334  # CONFIG_SCSI_AIC79XX is not set
   1.335  # CONFIG_MEGARAID_NEWGEN is not set
   1.336  # CONFIG_MEGARAID_LEGACY is not set
   1.337 +# CONFIG_MEGARAID_SAS is not set
   1.338  # CONFIG_SCSI_SATA is not set
   1.339  # CONFIG_SCSI_DMX3191D is not set
   1.340  # CONFIG_SCSI_FUTURE_DOMAIN is not set
   1.341 @@ -335,13 +471,13 @@ CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
   1.342  CONFIG_SCSI_QLOGIC_FC=y
   1.343  # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
   1.344  CONFIG_SCSI_QLOGIC_1280=y
   1.345 -# CONFIG_SCSI_QLOGIC_1280_1040 is not set
   1.346  CONFIG_SCSI_QLA2XXX=y
   1.347  CONFIG_SCSI_QLA21XX=y
   1.348  CONFIG_SCSI_QLA22XX=y
   1.349  CONFIG_SCSI_QLA2300=y
   1.350  CONFIG_SCSI_QLA2322=y
   1.351  # CONFIG_SCSI_QLA6312 is not set
   1.352 +# CONFIG_SCSI_QLA24XX is not set
   1.353  # CONFIG_SCSI_LPFC is not set
   1.354  # CONFIG_SCSI_DC395x is not set
   1.355  # CONFIG_SCSI_DC390T is not set
   1.356 @@ -358,7 +494,10 @@ CONFIG_MD=y
   1.357  # Fusion MPT device support
   1.358  #
   1.359  CONFIG_FUSION=y
   1.360 -CONFIG_FUSION_MAX_SGE=40
   1.361 +CONFIG_FUSION_SPI=y
   1.362 +# CONFIG_FUSION_FC is not set
   1.363 +CONFIG_FUSION_SAS=y
   1.364 +CONFIG_FUSION_MAX_SGE=128
   1.365  # CONFIG_FUSION_CTL is not set
   1.366  
   1.367  #
   1.368 @@ -372,92 +511,8 @@ CONFIG_FUSION_MAX_SGE=40
   1.369  # CONFIG_I2O is not set
   1.370  
   1.371  #
   1.372 -# Networking support
   1.373 -#
   1.374 -CONFIG_NET=y
   1.375 -
   1.376 -#
   1.377 -# Networking options
   1.378 -#
   1.379 -CONFIG_PACKET=y
   1.380 -# CONFIG_PACKET_MMAP is not set
   1.381 -CONFIG_UNIX=y
   1.382 -# CONFIG_NET_KEY is not set
   1.383 -CONFIG_INET=y
   1.384 -CONFIG_IP_MULTICAST=y
   1.385 -# CONFIG_IP_ADVANCED_ROUTER is not set
   1.386 -# CONFIG_IP_PNP is not set
   1.387 -# CONFIG_NET_IPIP is not set
   1.388 -# CONFIG_NET_IPGRE is not set
   1.389 -# CONFIG_IP_MROUTE is not set
   1.390 -CONFIG_ARPD=y
   1.391 -CONFIG_SYN_COOKIES=y
   1.392 -# CONFIG_INET_AH is not set
   1.393 -# CONFIG_INET_ESP is not set
   1.394 -# CONFIG_INET_IPCOMP is not set
   1.395 -# CONFIG_INET_TUNNEL is not set
   1.396 -CONFIG_IP_TCPDIAG=y
   1.397 -# CONFIG_IP_TCPDIAG_IPV6 is not set
   1.398 -
   1.399 -#
   1.400 -# IP: Virtual Server Configuration
   1.401 -#
   1.402 -# CONFIG_IP_VS is not set
   1.403 -# CONFIG_IPV6 is not set
   1.404 -CONFIG_NETFILTER=y
   1.405 -# CONFIG_NETFILTER_DEBUG is not set
   1.406 -CONFIG_BRIDGE_NETFILTER=y
   1.407 -
   1.408 -#
   1.409 -# IP: Netfilter Configuration
   1.410 +# Network device support
   1.411  #
   1.412 -# CONFIG_IP_NF_CONNTRACK is not set
   1.413 -# CONFIG_IP_NF_CONNTRACK_MARK is not set
   1.414 -# CONFIG_IP_NF_QUEUE is not set
   1.415 -# CONFIG_IP_NF_IPTABLES is not set
   1.416 -CONFIG_IP_NF_ARPTABLES=y
   1.417 -# CONFIG_IP_NF_ARPFILTER is not set
   1.418 -# CONFIG_IP_NF_ARP_MANGLE is not set
   1.419 -
   1.420 -#
   1.421 -# Bridge: Netfilter Configuration
   1.422 -#
   1.423 -# CONFIG_BRIDGE_NF_EBTABLES is not set
   1.424 -
   1.425 -#
   1.426 -# SCTP Configuration (EXPERIMENTAL)
   1.427 -#
   1.428 -# CONFIG_IP_SCTP is not set
   1.429 -# CONFIG_ATM is not set
   1.430 -CONFIG_BRIDGE=y
   1.431 -# CONFIG_VLAN_8021Q is not set
   1.432 -# CONFIG_DECNET is not set
   1.433 -# CONFIG_LLC2 is not set
   1.434 -# CONFIG_IPX is not set
   1.435 -# CONFIG_ATALK is not set
   1.436 -# CONFIG_X25 is not set
   1.437 -# CONFIG_LAPB is not set
   1.438 -# CONFIG_NET_DIVERT is not set
   1.439 -# CONFIG_ECONET is not set
   1.440 -# CONFIG_WAN_ROUTER is not set
   1.441 -
   1.442 -#
   1.443 -# QoS and/or fair queueing
   1.444 -#
   1.445 -# CONFIG_NET_SCHED is not set
   1.446 -# CONFIG_NET_CLS_ROUTE is not set
   1.447 -
   1.448 -#
   1.449 -# Network testing
   1.450 -#
   1.451 -# CONFIG_NET_PKTGEN is not set
   1.452 -CONFIG_NETPOLL=y
   1.453 -# CONFIG_NETPOLL_RX is not set
   1.454 -# CONFIG_NETPOLL_TRAP is not set
   1.455 -CONFIG_NET_POLL_CONTROLLER=y
   1.456 -# CONFIG_HAMRADIO is not set
   1.457 -# CONFIG_IRDA is not set
   1.458 -# CONFIG_BT is not set
   1.459  CONFIG_NETDEVICES=y
   1.460  CONFIG_DUMMY=y
   1.461  # CONFIG_BONDING is not set
   1.462 @@ -478,12 +533,18 @@ CONFIG_ARCNET=y
   1.463  # CONFIG_ARCNET_COM20020 is not set
   1.464  
   1.465  #
   1.466 +# PHY device support
   1.467 +#
   1.468 +# CONFIG_PHYLIB is not set
   1.469 +
   1.470 +#
   1.471  # Ethernet (10 or 100Mbit)
   1.472  #
   1.473  CONFIG_NET_ETHERNET=y
   1.474  CONFIG_MII=y
   1.475  # CONFIG_HAPPYMEAL is not set
   1.476  # CONFIG_SUNGEM is not set
   1.477 +# CONFIG_CASSINI is not set
   1.478  # CONFIG_NET_VENDOR_3COM is not set
   1.479  
   1.480  #
   1.481 @@ -499,6 +560,7 @@ CONFIG_TULIP_NAPI_HW_MITIGATION=y
   1.482  # CONFIG_DE4X5 is not set
   1.483  # CONFIG_WINBOND_840 is not set
   1.484  # CONFIG_DM9102 is not set
   1.485 +# CONFIG_ULI526X is not set
   1.486  # CONFIG_HP100 is not set
   1.487  CONFIG_NET_PCI=y
   1.488  # CONFIG_PCNET32 is not set
   1.489 @@ -530,6 +592,8 @@ CONFIG_E1000=y
   1.490  # CONFIG_HAMACHI is not set
   1.491  # CONFIG_YELLOWFIN is not set
   1.492  # CONFIG_R8169 is not set
   1.493 +# CONFIG_SIS190 is not set
   1.494 +# CONFIG_SKGE is not set
   1.495  # CONFIG_SK98LIN is not set
   1.496  # CONFIG_VIA_VELOCITY is not set
   1.497  CONFIG_TIGON3=y
   1.498 @@ -538,6 +602,7 @@ CONFIG_TIGON3=y
   1.499  #
   1.500  # Ethernet (10000 Mbit)
   1.501  #
   1.502 +# CONFIG_CHELSIO_T1 is not set
   1.503  # CONFIG_IXGB is not set
   1.504  # CONFIG_S2IO is not set
   1.505  
   1.506 @@ -562,6 +627,10 @@ CONFIG_TIGON3=y
   1.507  # CONFIG_NET_FC is not set
   1.508  # CONFIG_SHAPER is not set
   1.509  CONFIG_NETCONSOLE=y
   1.510 +CONFIG_NETPOLL=y
   1.511 +# CONFIG_NETPOLL_RX is not set
   1.512 +# CONFIG_NETPOLL_TRAP is not set
   1.513 +CONFIG_NET_POLL_CONTROLLER=y
   1.514  
   1.515  #
   1.516  # ISDN subsystem
   1.517 @@ -630,9 +699,7 @@ CONFIG_GAMEPORT=y
   1.518  # CONFIG_GAMEPORT_NS558 is not set
   1.519  # CONFIG_GAMEPORT_L4 is not set
   1.520  # CONFIG_GAMEPORT_EMU10K1 is not set
   1.521 -# CONFIG_GAMEPORT_VORTEX is not set
   1.522  # CONFIG_GAMEPORT_FM801 is not set
   1.523 -# CONFIG_GAMEPORT_CS461X is not set
   1.524  
   1.525  #
   1.526  # Character devices
   1.527 @@ -642,6 +709,7 @@ CONFIG_HW_CONSOLE=y
   1.528  CONFIG_SERIAL_NONSTANDARD=y
   1.529  # CONFIG_ROCKETPORT is not set
   1.530  # CONFIG_CYCLADES is not set
   1.531 +# CONFIG_DIGIEPCA is not set
   1.532  # CONFIG_MOXA_SMARTIO is not set
   1.533  # CONFIG_ISI is not set
   1.534  # CONFIG_SYNCLINKMP is not set
   1.535 @@ -660,7 +728,6 @@ CONFIG_SERIAL_8250_NR_UARTS=6
   1.536  CONFIG_SERIAL_8250_EXTENDED=y
   1.537  CONFIG_SERIAL_8250_SHARE_IRQ=y
   1.538  # CONFIG_SERIAL_8250_DETECT_IRQ is not set
   1.539 -# CONFIG_SERIAL_8250_MULTIPORT is not set
   1.540  # CONFIG_SERIAL_8250_RSA is not set
   1.541  
   1.542  #
   1.543 @@ -699,6 +766,8 @@ CONFIG_DRM=y
   1.544  # CONFIG_DRM_RADEON is not set
   1.545  # CONFIG_DRM_MGA is not set
   1.546  # CONFIG_DRM_SIS is not set
   1.547 +# CONFIG_DRM_VIA is not set
   1.548 +# CONFIG_DRM_SAVAGE is not set
   1.549  # CONFIG_RAW_DRIVER is not set
   1.550  # CONFIG_HPET is not set
   1.551  # CONFIG_HANGCHECK_TIMER is not set
   1.552 @@ -707,6 +776,7 @@ CONFIG_DRM=y
   1.553  # TPM devices
   1.554  #
   1.555  # CONFIG_TCG_TPM is not set
   1.556 +# CONFIG_TELCLOCK is not set
   1.557  
   1.558  #
   1.559  # I2C support
   1.560 @@ -732,7 +802,6 @@ CONFIG_I2C_ALGOPCF=y
   1.561  # CONFIG_I2C_I801 is not set
   1.562  # CONFIG_I2C_I810 is not set
   1.563  # CONFIG_I2C_PIIX4 is not set
   1.564 -# CONFIG_I2C_ISA is not set
   1.565  # CONFIG_I2C_NFORCE2 is not set
   1.566  # CONFIG_I2C_PARPORT_LIGHT is not set
   1.567  # CONFIG_I2C_PROSAVAGE is not set
   1.568 @@ -748,14 +817,39 @@ CONFIG_I2C_ALGOPCF=y
   1.569  # CONFIG_I2C_PCA_ISA is not set
   1.570  
   1.571  #
   1.572 -# Hardware Sensors Chip support
   1.573 +# Miscellaneous I2C Chip support
   1.574  #
   1.575 -# CONFIG_I2C_SENSOR is not set
   1.576 +# CONFIG_SENSORS_DS1337 is not set
   1.577 +# CONFIG_SENSORS_DS1374 is not set
   1.578 +# CONFIG_SENSORS_EEPROM is not set
   1.579 +# CONFIG_SENSORS_PCF8574 is not set
   1.580 +# CONFIG_SENSORS_PCA9539 is not set
   1.581 +# CONFIG_SENSORS_PCF8591 is not set
   1.582 +# CONFIG_SENSORS_RTC8564 is not set
   1.583 +# CONFIG_SENSORS_MAX6875 is not set
   1.584 +# CONFIG_RTC_X1205_I2C is not set
   1.585 +# CONFIG_I2C_DEBUG_CORE is not set
   1.586 +# CONFIG_I2C_DEBUG_ALGO is not set
   1.587 +# CONFIG_I2C_DEBUG_BUS is not set
   1.588 +# CONFIG_I2C_DEBUG_CHIP is not set
   1.589 +
   1.590 +#
   1.591 +# Dallas's 1-wire bus
   1.592 +#
   1.593 +# CONFIG_W1 is not set
   1.594 +
   1.595 +#
   1.596 +# Hardware Monitoring support
   1.597 +#
   1.598 +CONFIG_HWMON=y
   1.599 +# CONFIG_HWMON_VID is not set
   1.600  # CONFIG_SENSORS_ADM1021 is not set
   1.601  # CONFIG_SENSORS_ADM1025 is not set
   1.602  # CONFIG_SENSORS_ADM1026 is not set
   1.603  # CONFIG_SENSORS_ADM1031 is not set
   1.604 +# CONFIG_SENSORS_ADM9240 is not set
   1.605  # CONFIG_SENSORS_ASB100 is not set
   1.606 +# CONFIG_SENSORS_ATXP1 is not set
   1.607  # CONFIG_SENSORS_DS1621 is not set
   1.608  # CONFIG_SENSORS_FSCHER is not set
   1.609  # CONFIG_SENSORS_FSCPOS is not set
   1.610 @@ -774,37 +868,26 @@ CONFIG_I2C_ALGOPCF=y
   1.611  # CONFIG_SENSORS_LM92 is not set
   1.612  # CONFIG_SENSORS_MAX1619 is not set
   1.613  # CONFIG_SENSORS_PC87360 is not set
   1.614 -# CONFIG_SENSORS_SMSC47B397 is not set
   1.615  # CONFIG_SENSORS_SIS5595 is not set
   1.616  # CONFIG_SENSORS_SMSC47M1 is not set
   1.617 +# CONFIG_SENSORS_SMSC47B397 is not set
   1.618  # CONFIG_SENSORS_VIA686A is not set
   1.619  # CONFIG_SENSORS_W83781D is not set
   1.620 +# CONFIG_SENSORS_W83792D is not set
   1.621  # CONFIG_SENSORS_W83L785TS is not set
   1.622  # CONFIG_SENSORS_W83627HF is not set
   1.623 -
   1.624 -#
   1.625 -# Other I2C Chip support
   1.626 -#
   1.627 -# CONFIG_SENSORS_DS1337 is not set
   1.628 -# CONFIG_SENSORS_EEPROM is not set
   1.629 -# CONFIG_SENSORS_PCF8574 is not set
   1.630 -# CONFIG_SENSORS_PCF8591 is not set
   1.631 -# CONFIG_SENSORS_RTC8564 is not set
   1.632 -# CONFIG_I2C_DEBUG_CORE is not set
   1.633 -# CONFIG_I2C_DEBUG_ALGO is not set
   1.634 -# CONFIG_I2C_DEBUG_BUS is not set
   1.635 -# CONFIG_I2C_DEBUG_CHIP is not set
   1.636 -
   1.637 -#
   1.638 -# Dallas's 1-wire bus
   1.639 -#
   1.640 -# CONFIG_W1 is not set
   1.641 +# CONFIG_SENSORS_W83627EHF is not set
   1.642 +# CONFIG_HWMON_DEBUG_CHIP is not set
   1.643  
   1.644  #
   1.645  # Misc devices
   1.646  #
   1.647  
   1.648  #
   1.649 +# Multimedia Capabilities Port drivers
   1.650 +#
   1.651 +
   1.652 +#
   1.653  # Multimedia devices
   1.654  #
   1.655  CONFIG_VIDEO_DEV=y
   1.656 @@ -829,7 +912,10 @@ CONFIG_VIDEO_DEV=y
   1.657  # CONFIG_VIDEO_HEXIUM_ORION is not set
   1.658  # CONFIG_VIDEO_HEXIUM_GEMINI is not set
   1.659  # CONFIG_VIDEO_CX88 is not set
   1.660 +# CONFIG_VIDEO_EM28XX is not set
   1.661  # CONFIG_VIDEO_OVCAMCHIP is not set
   1.662 +# CONFIG_VIDEO_AUDIO_DECODER is not set
   1.663 +# CONFIG_VIDEO_DECODER is not set
   1.664  
   1.665  #
   1.666  # Radio Adapters
   1.667 @@ -850,7 +936,6 @@ CONFIG_FB=y
   1.668  CONFIG_FB_CFB_FILLRECT=y
   1.669  CONFIG_FB_CFB_COPYAREA=y
   1.670  CONFIG_FB_CFB_IMAGEBLIT=y
   1.671 -CONFIG_FB_SOFT_CURSOR=y
   1.672  # CONFIG_FB_MACMODES is not set
   1.673  CONFIG_FB_MODE_HELPERS=y
   1.674  # CONFIG_FB_TILEBLITTING is not set
   1.675 @@ -859,6 +944,7 @@ CONFIG_FB_MODE_HELPERS=y
   1.676  # CONFIG_FB_CYBER2000 is not set
   1.677  # CONFIG_FB_ASILIANT is not set
   1.678  # CONFIG_FB_IMSTT is not set
   1.679 +# CONFIG_FB_S1D13XXX is not set
   1.680  # CONFIG_FB_NVIDIA is not set
   1.681  # CONFIG_FB_RIVA is not set
   1.682  # CONFIG_FB_MATROX is not set
   1.683 @@ -874,8 +960,8 @@ CONFIG_FB_RADEON_DEBUG=y
   1.684  # CONFIG_FB_KYRO is not set
   1.685  # CONFIG_FB_3DFX is not set
   1.686  # CONFIG_FB_VOODOO1 is not set
   1.687 +# CONFIG_FB_CYBLA is not set
   1.688  # CONFIG_FB_TRIDENT is not set
   1.689 -# CONFIG_FB_S1D13XXX is not set
   1.690  # CONFIG_FB_VIRTUAL is not set
   1.691  
   1.692  #
   1.693 @@ -903,6 +989,8 @@ CONFIG_SOUND=y
   1.694  # Advanced Linux Sound Architecture
   1.695  #
   1.696  CONFIG_SND=y
   1.697 +CONFIG_SND_AC97_CODEC=y
   1.698 +CONFIG_SND_AC97_BUS=y
   1.699  CONFIG_SND_TIMER=y
   1.700  CONFIG_SND_PCM=y
   1.701  CONFIG_SND_HWDEP=y
   1.702 @@ -915,6 +1003,7 @@ CONFIG_SND_PCM_OSS=y
   1.703  CONFIG_SND_SEQUENCER_OSS=y
   1.704  # CONFIG_SND_VERBOSE_PRINTK is not set
   1.705  # CONFIG_SND_DEBUG is not set
   1.706 +CONFIG_SND_GENERIC_DRIVER=y
   1.707  
   1.708  #
   1.709  # Generic devices
   1.710 @@ -930,7 +1019,6 @@ CONFIG_SND_MPU401=y
   1.711  #
   1.712  # PCI devices
   1.713  #
   1.714 -CONFIG_SND_AC97_CODEC=y
   1.715  # CONFIG_SND_ALI5451 is not set
   1.716  CONFIG_SND_ATIIXP=y
   1.717  # CONFIG_SND_ATIIXP_MODEM is not set
   1.718 @@ -951,9 +1039,10 @@ CONFIG_SND_ATIIXP=y
   1.719  # CONFIG_SND_RME96 is not set
   1.720  # CONFIG_SND_RME9652 is not set
   1.721  # CONFIG_SND_HDSP is not set
   1.722 +# CONFIG_SND_HDSPM is not set
   1.723  # CONFIG_SND_TRIDENT is not set
   1.724  # CONFIG_SND_YMFPCI is not set
   1.725 -# CONFIG_SND_ALS4000 is not set
   1.726 +# CONFIG_SND_AD1889 is not set
   1.727  # CONFIG_SND_CMIPCI is not set
   1.728  # CONFIG_SND_ENS1370 is not set
   1.729  # CONFIG_SND_ENS1371 is not set
   1.730 @@ -981,28 +1070,13 @@ CONFIG_SND_FM801_TEA575X=y
   1.731  # Open Sound System
   1.732  #
   1.733  CONFIG_SOUND_PRIME=y
   1.734 -# CONFIG_SOUND_BT878 is not set
   1.735 -# CONFIG_SOUND_CMPCI is not set
   1.736 -# CONFIG_SOUND_EMU10K1 is not set
   1.737 +# CONFIG_OBSOLETE_OSS_DRIVER is not set
   1.738  # CONFIG_SOUND_FUSION is not set
   1.739 -# CONFIG_SOUND_CS4281 is not set
   1.740 -# CONFIG_SOUND_ES1370 is not set
   1.741 -# CONFIG_SOUND_ES1371 is not set
   1.742 -# CONFIG_SOUND_ESSSOLO1 is not set
   1.743 -# CONFIG_SOUND_MAESTRO is not set
   1.744 -# CONFIG_SOUND_MAESTRO3 is not set
   1.745  # CONFIG_SOUND_ICH is not set
   1.746 -# CONFIG_SOUND_SONICVIBES is not set
   1.747  # CONFIG_SOUND_TRIDENT is not set
   1.748  # CONFIG_SOUND_MSNDCLAS is not set
   1.749  # CONFIG_SOUND_MSNDPIN is not set
   1.750 -# CONFIG_SOUND_VIA82CXXX is not set
   1.751 -# CONFIG_SOUND_OSS is not set
   1.752  # CONFIG_SOUND_TVMIXER is not set
   1.753 -# CONFIG_SOUND_ALI5455 is not set
   1.754 -# CONFIG_SOUND_FORTE is not set
   1.755 -# CONFIG_SOUND_RME96XX is not set
   1.756 -# CONFIG_SOUND_AD1980 is not set
   1.757  
   1.758  #
   1.759  # USB support
   1.760 @@ -1027,6 +1101,7 @@ CONFIG_USB_BANDWIDTH=y
   1.761  CONFIG_USB_EHCI_HCD=y
   1.762  # CONFIG_USB_EHCI_SPLIT_ISO is not set
   1.763  # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
   1.764 +# CONFIG_USB_ISP116X_HCD is not set
   1.765  CONFIG_USB_OHCI_HCD=y
   1.766  # CONFIG_USB_OHCI_BIG_ENDIAN is not set
   1.767  CONFIG_USB_OHCI_LITTLE_ENDIAN=y
   1.768 @@ -1036,14 +1111,16 @@ CONFIG_USB_UHCI_HCD=y
   1.769  #
   1.770  # USB Device Class drivers
   1.771  #
   1.772 -CONFIG_USB_AUDIO=y
   1.773 -# CONFIG_USB_BLUETOOTH_TTY is not set
   1.774 -# CONFIG_USB_MIDI is not set
   1.775 +# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
   1.776  # CONFIG_USB_ACM is not set
   1.777  # CONFIG_USB_PRINTER is not set
   1.778  
   1.779  #
   1.780 -# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
   1.781 +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
   1.782 +#
   1.783 +
   1.784 +#
   1.785 +# may also be needed; see USB_STORAGE Help for more information
   1.786  #
   1.787  CONFIG_USB_STORAGE=y
   1.788  # CONFIG_USB_STORAGE_DEBUG is not set
   1.789 @@ -1065,12 +1142,17 @@ CONFIG_USB_HIDINPUT=y
   1.790  CONFIG_USB_HIDDEV=y
   1.791  # CONFIG_USB_AIPTEK is not set
   1.792  # CONFIG_USB_WACOM is not set
   1.793 +# CONFIG_USB_ACECAD is not set
   1.794  # CONFIG_USB_KBTAB is not set
   1.795  # CONFIG_USB_POWERMATE is not set
   1.796  # CONFIG_USB_MTOUCH is not set
   1.797 +# CONFIG_USB_ITMTOUCH is not set
   1.798  # CONFIG_USB_EGALAX is not set
   1.799 +# CONFIG_USB_YEALINK is not set
   1.800  # CONFIG_USB_XPAD is not set
   1.801  # CONFIG_USB_ATI_REMOTE is not set
   1.802 +# CONFIG_USB_KEYSPAN_REMOTE is not set
   1.803 +# CONFIG_USB_APPLETOUCH is not set
   1.804  
   1.805  #
   1.806  # USB Imaging devices
   1.807 @@ -1126,10 +1208,11 @@ CONFIG_USB_MON=y
   1.808  # CONFIG_USB_PHIDGETSERVO is not set
   1.809  # CONFIG_USB_IDMOUSE is not set
   1.810  # CONFIG_USB_SISUSBVGA is not set
   1.811 +# CONFIG_USB_LD is not set
   1.812  # CONFIG_USB_TEST is not set
   1.813  
   1.814  #
   1.815 -# USB ATM/DSL drivers
   1.816 +# USB DSL modem support
   1.817  #
   1.818  
   1.819  #
   1.820 @@ -1148,12 +1231,17 @@ CONFIG_USB_MON=y
   1.821  # CONFIG_INFINIBAND is not set
   1.822  
   1.823  #
   1.824 +# SN Devices
   1.825 +#
   1.826 +
   1.827 +#
   1.828  # File systems
   1.829  #
   1.830  CONFIG_EXT2_FS=y
   1.831  CONFIG_EXT2_FS_XATTR=y
   1.832  CONFIG_EXT2_FS_POSIX_ACL=y
   1.833  CONFIG_EXT2_FS_SECURITY=y
   1.834 +# CONFIG_EXT2_FS_XIP is not set
   1.835  CONFIG_EXT3_FS=y
   1.836  CONFIG_EXT3_FS_XATTR=y
   1.837  CONFIG_EXT3_FS_POSIX_ACL=y
   1.838 @@ -1169,22 +1257,20 @@ CONFIG_REISERFS_FS_POSIX_ACL=y
   1.839  CONFIG_REISERFS_FS_SECURITY=y
   1.840  # CONFIG_JFS_FS is not set
   1.841  CONFIG_FS_POSIX_ACL=y
   1.842 -
   1.843 -#
   1.844 -# XFS support
   1.845 -#
   1.846  CONFIG_XFS_FS=y
   1.847  CONFIG_XFS_EXPORT=y
   1.848 -# CONFIG_XFS_RT is not set
   1.849  # CONFIG_XFS_QUOTA is not set
   1.850  # CONFIG_XFS_SECURITY is not set
   1.851  # CONFIG_XFS_POSIX_ACL is not set
   1.852 +# CONFIG_XFS_RT is not set
   1.853  # CONFIG_MINIX_FS is not set
   1.854  # CONFIG_ROMFS_FS is not set
   1.855 +CONFIG_INOTIFY=y
   1.856  # CONFIG_QUOTA is not set
   1.857  CONFIG_DNOTIFY=y
   1.858  CONFIG_AUTOFS_FS=y
   1.859  CONFIG_AUTOFS4_FS=y
   1.860 +# CONFIG_FUSE_FS is not set
   1.861  
   1.862  #
   1.863  # CD-ROM/DVD Filesystems
   1.864 @@ -1211,14 +1297,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
   1.865  CONFIG_PROC_FS=y
   1.866  CONFIG_PROC_KCORE=y
   1.867  CONFIG_SYSFS=y
   1.868 -# CONFIG_DEVFS_FS is not set
   1.869 -# CONFIG_DEVPTS_FS_XATTR is not set
   1.870  CONFIG_TMPFS=y
   1.871 -CONFIG_TMPFS_XATTR=y
   1.872 -CONFIG_TMPFS_SECURITY=y
   1.873 -CONFIG_HUGETLBFS=y
   1.874 -CONFIG_HUGETLB_PAGE=y
   1.875 +# CONFIG_HUGETLB_PAGE is not set
   1.876  CONFIG_RAMFS=y
   1.877 +# CONFIG_RELAYFS_FS is not set
   1.878  
   1.879  #
   1.880  # Miscellaneous filesystems
   1.881 @@ -1242,15 +1324,18 @@ CONFIG_RAMFS=y
   1.882  #
   1.883  CONFIG_NFS_FS=y
   1.884  CONFIG_NFS_V3=y
   1.885 +# CONFIG_NFS_V3_ACL is not set
   1.886  CONFIG_NFS_V4=y
   1.887  CONFIG_NFS_DIRECTIO=y
   1.888  CONFIG_NFSD=y
   1.889  CONFIG_NFSD_V3=y
   1.890 +# CONFIG_NFSD_V3_ACL is not set
   1.891  CONFIG_NFSD_V4=y
   1.892  CONFIG_NFSD_TCP=y
   1.893  CONFIG_LOCKD=y
   1.894  CONFIG_LOCKD_V4=y
   1.895  CONFIG_EXPORTFS=y
   1.896 +CONFIG_NFS_COMMON=y
   1.897  CONFIG_SUNRPC=y
   1.898  CONFIG_SUNRPC_GSS=y
   1.899  CONFIG_RPCSEC_GSS_KRB5=y
   1.900 @@ -1265,6 +1350,7 @@ CONFIG_CIFS=y
   1.901  # CONFIG_NCP_FS is not set
   1.902  # CONFIG_CODA_FS is not set
   1.903  # CONFIG_AFS_FS is not set
   1.904 +# CONFIG_9P_FS is not set
   1.905  
   1.906  #
   1.907  # Partition Types
   1.908 @@ -1334,15 +1420,18 @@ CONFIG_NLS_UTF8=y
   1.909  # Library routines
   1.910  #
   1.911  # CONFIG_CRC_CCITT is not set
   1.912 +# CONFIG_CRC16 is not set
   1.913  CONFIG_CRC32=y
   1.914  # CONFIG_LIBCRC32C is not set
   1.915  CONFIG_GENERIC_HARDIRQS=y
   1.916  CONFIG_GENERIC_IRQ_PROBE=y
   1.917 +CONFIG_GENERIC_PENDING_IRQ=y
   1.918  
   1.919  #
   1.920 -# Profiling support
   1.921 +# Instrumentation Support
   1.922  #
   1.923  # CONFIG_PROFILING is not set
   1.924 +# CONFIG_KPROBES is not set
   1.925  
   1.926  #
   1.927  # Kernel hacking
   1.928 @@ -1351,6 +1440,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
   1.929  CONFIG_DEBUG_KERNEL=y
   1.930  CONFIG_MAGIC_SYSRQ=y
   1.931  CONFIG_LOG_BUF_SHIFT=20
   1.932 +CONFIG_DETECT_SOFTLOCKUP=y
   1.933  # CONFIG_SCHEDSTATS is not set
   1.934  # CONFIG_DEBUG_SLAB is not set
   1.935  # CONFIG_DEBUG_SPINLOCK is not set
   1.936 @@ -1358,6 +1448,8 @@ CONFIG_LOG_BUF_SHIFT=20
   1.937  # CONFIG_DEBUG_KOBJECT is not set
   1.938  # CONFIG_DEBUG_INFO is not set
   1.939  # CONFIG_DEBUG_FS is not set
   1.940 +# CONFIG_DEBUG_VM is not set
   1.941 +# CONFIG_RCU_TORTURE_TEST is not set
   1.942  CONFIG_IA64_GRANULE_16MB=y
   1.943  # CONFIG_IA64_GRANULE_64MB is not set
   1.944  CONFIG_IA64_PRINT_HAZARDS=y
     2.1 --- a/buildconfigs/linux-defconfig_xenU_ia64	Wed Feb 01 14:27:35 2006 -0700
     2.2 +++ b/buildconfigs/linux-defconfig_xenU_ia64	Thu Feb 02 10:59:20 2006 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  #
     2.5  # Automatically generated make config: don't edit
     2.6 -# Linux kernel version: 2.6.12
     2.7 -# Thu Sep 15 11:04:33 2005
     2.8 +# Linux kernel version: 2.6.15-xenU
     2.9 +# Wed Feb  1 14:19:46 2006
    2.10  #
    2.11  
    2.12  #
    2.13 @@ -18,6 +18,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
    2.14  # General setup
    2.15  #
    2.16  CONFIG_LOCALVERSION=""
    2.17 +CONFIG_LOCALVERSION_AUTO=y
    2.18  CONFIG_SWAP=y
    2.19  CONFIG_SYSVIPC=y
    2.20  # CONFIG_POSIX_MQUEUE is not set
    2.21 @@ -29,6 +30,8 @@ CONFIG_HOTPLUG=y
    2.22  CONFIG_KOBJECT_UEVENT=y
    2.23  # CONFIG_IKCONFIG is not set
    2.24  # CONFIG_CPUSETS is not set
    2.25 +CONFIG_INITRAMFS_SOURCE=""
    2.26 +CONFIG_CC_OPTIMIZE_FOR_SIZE=y
    2.27  # CONFIG_EMBEDDED is not set
    2.28  CONFIG_KALLSYMS=y
    2.29  # CONFIG_KALLSYMS_ALL is not set
    2.30 @@ -57,29 +60,47 @@ CONFIG_OBSOLETE_MODPARM=y
    2.31  # CONFIG_KMOD is not set
    2.32  
    2.33  #
    2.34 +# Block layer
    2.35 +#
    2.36 +
    2.37 +#
    2.38 +# IO Schedulers
    2.39 +#
    2.40 +CONFIG_IOSCHED_NOOP=y
    2.41 +CONFIG_IOSCHED_AS=y
    2.42 +CONFIG_IOSCHED_DEADLINE=y
    2.43 +CONFIG_IOSCHED_CFQ=y
    2.44 +CONFIG_DEFAULT_AS=y
    2.45 +# CONFIG_DEFAULT_DEADLINE is not set
    2.46 +# CONFIG_DEFAULT_CFQ is not set
    2.47 +# CONFIG_DEFAULT_NOOP is not set
    2.48 +CONFIG_DEFAULT_IOSCHED="anticipatory"
    2.49 +
    2.50 +#
    2.51  # Processor type and features
    2.52  #
    2.53  CONFIG_IA64=y
    2.54  CONFIG_64BIT=y
    2.55  CONFIG_MMU=y
    2.56 +CONFIG_SWIOTLB=y
    2.57  CONFIG_RWSEM_XCHGADD_ALGORITHM=y
    2.58  CONFIG_GENERIC_CALIBRATE_DELAY=y
    2.59  CONFIG_TIME_INTERPOLATION=y
    2.60  CONFIG_EFI=y
    2.61  CONFIG_GENERIC_IOMAP=y
    2.62  CONFIG_XEN=y
    2.63 -CONFIG_XEN_VT=n
    2.64  CONFIG_ARCH_XEN=y
    2.65  CONFIG_XEN_PRIVILEGED_GUEST=y
    2.66  CONFIG_XEN_PHYSDEV_ACCESS=y
    2.67  CONFIG_XEN_BLKDEV_GRANT=y
    2.68  CONFIG_XEN_BLKDEV_FRONTEND=y
    2.69 -CONFIG_VGA_CONSOLE=y
    2.70 -CONFIG_FRAMEBUFFER_CONSOLE=n
    2.71 +# CONFIG_XEN_VT is not set
    2.72 +# CONFIG_VT is not set
    2.73  CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
    2.74 +CONFIG_DMA_IS_DMA32=y
    2.75  # CONFIG_IA64_GENERIC is not set
    2.76 -# CONFIG_IA64_DIG is not set
    2.77 -CONFIG_IA64_HP_ZX1=y
    2.78 +CONFIG_IA64_DIG=y
    2.79 +# CONFIG_IA64_HP_ZX1 is not set
    2.80  # CONFIG_IA64_HP_ZX1_SWIOTLB is not set
    2.81  # CONFIG_IA64_SGI_SN2 is not set
    2.82  # CONFIG_IA64_HP_SIM is not set
    2.83 @@ -89,24 +110,39 @@ CONFIG_MCKINLEY=y
    2.84  # CONFIG_IA64_PAGE_SIZE_8KB is not set
    2.85  CONFIG_IA64_PAGE_SIZE_16KB=y
    2.86  # CONFIG_IA64_PAGE_SIZE_64KB is not set
    2.87 +CONFIG_PGTABLE_3=y
    2.88 +# CONFIG_PGTABLE_4 is not set
    2.89 +# CONFIG_HZ_100 is not set
    2.90 +CONFIG_HZ_250=y
    2.91 +# CONFIG_HZ_1000 is not set
    2.92 +CONFIG_HZ=250
    2.93  CONFIG_IA64_L1_CACHE_SHIFT=7
    2.94 -# CONFIG_NUMA is not set
    2.95 -CONFIG_VIRTUAL_MEM_MAP=y
    2.96 -CONFIG_HOLES_IN_ZONE=y
    2.97  # CONFIG_IA64_CYCLONE is not set
    2.98  CONFIG_IOSAPIC=y
    2.99 -CONFIG_FORCE_MAX_ZONEORDER=18
   2.100 +CONFIG_FORCE_MAX_ZONEORDER=11
   2.101  CONFIG_SMP=y
   2.102  CONFIG_NR_CPUS=16
   2.103  # CONFIG_HOTPLUG_CPU is not set
   2.104  # CONFIG_SCHED_SMT is not set
   2.105  # CONFIG_PREEMPT is not set
   2.106 -CONFIG_HAVE_DEC_LOCK=y
   2.107 +CONFIG_SELECT_MEMORY_MODEL=y
   2.108 +CONFIG_FLATMEM_MANUAL=y
   2.109 +# CONFIG_DISCONTIGMEM_MANUAL is not set
   2.110 +# CONFIG_SPARSEMEM_MANUAL is not set
   2.111 +CONFIG_FLATMEM=y
   2.112 +CONFIG_FLAT_NODE_MEM_MAP=y
   2.113 +# CONFIG_SPARSEMEM_STATIC is not set
   2.114 +CONFIG_SPLIT_PTLOCK_CPUS=4
   2.115 +CONFIG_ARCH_SELECT_MEMORY_MODEL=y
   2.116 +CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
   2.117 +CONFIG_ARCH_FLATMEM_ENABLE=y
   2.118 +CONFIG_ARCH_SPARSEMEM_ENABLE=y
   2.119 +CONFIG_VIRTUAL_MEM_MAP=y
   2.120 +CONFIG_HOLES_IN_ZONE=y
   2.121  # CONFIG_IA32_SUPPORT is not set
   2.122  CONFIG_IA64_MCA_RECOVERY=y
   2.123  CONFIG_PERFMON=y
   2.124  CONFIG_IA64_PALINFO=y
   2.125 -CONFIG_ACPI_DEALLOCATE_IRQ=y
   2.126  
   2.127  #
   2.128  # Firmware Drivers
   2.129 @@ -120,34 +156,34 @@ CONFIG_BINFMT_MISC=y
   2.130  # Power management and ACPI
   2.131  #
   2.132  CONFIG_PM=y
   2.133 -CONFIG_ACPI=y
   2.134 +CONFIG_PM_LEGACY=y
   2.135 +# CONFIG_PM_DEBUG is not set
   2.136  
   2.137  #
   2.138  # ACPI (Advanced Configuration and Power Interface) Support
   2.139  #
   2.140 -CONFIG_ACPI_BOOT=y
   2.141 -CONFIG_ACPI_INTERPRETER=y
   2.142 +CONFIG_ACPI=y
   2.143  CONFIG_ACPI_BUTTON=y
   2.144 -# CONFIG_ACPI_VIDEO is not set
   2.145  CONFIG_ACPI_FAN=y
   2.146  CONFIG_ACPI_PROCESSOR=y
   2.147  CONFIG_ACPI_THERMAL=y
   2.148  CONFIG_ACPI_BLACKLIST_YEAR=0
   2.149  # CONFIG_ACPI_DEBUG is not set
   2.150 -CONFIG_ACPI_BUS=y
   2.151  CONFIG_ACPI_POWER=y
   2.152 -CONFIG_ACPI_PCI=y
   2.153  CONFIG_ACPI_SYSTEM=y
   2.154  # CONFIG_ACPI_CONTAINER is not set
   2.155  
   2.156  #
   2.157 +# CPU Frequency scaling
   2.158 +#
   2.159 +# CONFIG_CPU_FREQ is not set
   2.160 +
   2.161 +#
   2.162  # Bus options (PCI, PCMCIA)
   2.163  #
   2.164  CONFIG_PCI=y
   2.165  CONFIG_PCI_DOMAINS=y
   2.166 -# CONFIG_PCI_MSI is not set
   2.167  CONFIG_PCI_LEGACY_PROC=y
   2.168 -CONFIG_PCI_NAMES=y
   2.169  # CONFIG_PCI_DEBUG is not set
   2.170  
   2.171  #
   2.172 @@ -166,6 +202,97 @@ CONFIG_HOTPLUG_PCI_ACPI=y
   2.173  # CONFIG_PCCARD is not set
   2.174  
   2.175  #
   2.176 +# Networking
   2.177 +#
   2.178 +CONFIG_NET=y
   2.179 +
   2.180 +#
   2.181 +# Networking options
   2.182 +#
   2.183 +CONFIG_PACKET=y
   2.184 +# CONFIG_PACKET_MMAP is not set
   2.185 +CONFIG_UNIX=y
   2.186 +# CONFIG_NET_KEY is not set
   2.187 +CONFIG_INET=y
   2.188 +CONFIG_IP_MULTICAST=y
   2.189 +# CONFIG_IP_ADVANCED_ROUTER is not set
   2.190 +CONFIG_IP_FIB_HASH=y
   2.191 +# CONFIG_IP_PNP is not set
   2.192 +# CONFIG_NET_IPIP is not set
   2.193 +# CONFIG_NET_IPGRE is not set
   2.194 +# CONFIG_IP_MROUTE is not set
   2.195 +# CONFIG_ARPD is not set
   2.196 +# CONFIG_SYN_COOKIES is not set
   2.197 +# CONFIG_INET_AH is not set
   2.198 +# CONFIG_INET_ESP is not set
   2.199 +# CONFIG_INET_IPCOMP is not set
   2.200 +# CONFIG_INET_TUNNEL is not set
   2.201 +CONFIG_INET_DIAG=y
   2.202 +CONFIG_INET_TCP_DIAG=y
   2.203 +# CONFIG_TCP_CONG_ADVANCED is not set
   2.204 +CONFIG_TCP_CONG_BIC=y
   2.205 +
   2.206 +#
   2.207 +# IP: Virtual Server Configuration
   2.208 +#
   2.209 +# CONFIG_IP_VS is not set
   2.210 +# CONFIG_IPV6 is not set
   2.211 +CONFIG_NETFILTER=y
   2.212 +# CONFIG_NETFILTER_DEBUG is not set
   2.213 +
   2.214 +#
   2.215 +# Core Netfilter Configuration
   2.216 +#
   2.217 +# CONFIG_NETFILTER_NETLINK is not set
   2.218 +# CONFIG_NF_CONNTRACK is not set
   2.219 +
   2.220 +#
   2.221 +# IP: Netfilter Configuration
   2.222 +#
   2.223 +# CONFIG_IP_NF_CONNTRACK is not set
   2.224 +# CONFIG_IP_NF_QUEUE is not set
   2.225 +# CONFIG_IP_NF_IPTABLES is not set
   2.226 +CONFIG_IP_NF_ARPTABLES=y
   2.227 +# CONFIG_IP_NF_ARPFILTER is not set
   2.228 +# CONFIG_IP_NF_ARP_MANGLE is not set
   2.229 +
   2.230 +#
   2.231 +# DCCP Configuration (EXPERIMENTAL)
   2.232 +#
   2.233 +# CONFIG_IP_DCCP is not set
   2.234 +
   2.235 +#
   2.236 +# SCTP Configuration (EXPERIMENTAL)
   2.237 +#
   2.238 +# CONFIG_IP_SCTP is not set
   2.239 +# CONFIG_ATM is not set
   2.240 +# CONFIG_BRIDGE is not set
   2.241 +# CONFIG_VLAN_8021Q is not set
   2.242 +# CONFIG_DECNET is not set
   2.243 +# CONFIG_LLC2 is not set
   2.244 +# CONFIG_IPX is not set
   2.245 +# CONFIG_ATALK is not set
   2.246 +# CONFIG_X25 is not set
   2.247 +# CONFIG_LAPB is not set
   2.248 +# CONFIG_NET_DIVERT is not set
   2.249 +# CONFIG_ECONET is not set
   2.250 +# CONFIG_WAN_ROUTER is not set
   2.251 +
   2.252 +#
   2.253 +# QoS and/or fair queueing
   2.254 +#
   2.255 +# CONFIG_NET_SCHED is not set
   2.256 +
   2.257 +#
   2.258 +# Network testing
   2.259 +#
   2.260 +# CONFIG_NET_PKTGEN is not set
   2.261 +# CONFIG_HAMRADIO is not set
   2.262 +# CONFIG_IRDA is not set
   2.263 +# CONFIG_BT is not set
   2.264 +# CONFIG_IEEE80211 is not set
   2.265 +
   2.266 +#
   2.267  # Device Drivers
   2.268  #
   2.269  
   2.270 @@ -178,6 +305,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
   2.271  # CONFIG_DEBUG_DRIVER is not set
   2.272  
   2.273  #
   2.274 +# Connector - unified userspace <-> kernelspace linker
   2.275 +#
   2.276 +# CONFIG_CONNECTOR is not set
   2.277 +
   2.278 +#
   2.279  # Memory Technology Devices (MTD)
   2.280  #
   2.281  # CONFIG_MTD is not set
   2.282 @@ -209,16 +341,7 @@ CONFIG_BLK_DEV_RAM=y
   2.283  CONFIG_BLK_DEV_RAM_COUNT=16
   2.284  CONFIG_BLK_DEV_RAM_SIZE=4096
   2.285  CONFIG_BLK_DEV_INITRD=y
   2.286 -CONFIG_INITRAMFS_SOURCE=""
   2.287  # CONFIG_CDROM_PKTCDVD is not set
   2.288 -
   2.289 -#
   2.290 -# IO Schedulers
   2.291 -#
   2.292 -CONFIG_IOSCHED_NOOP=y
   2.293 -CONFIG_IOSCHED_AS=y
   2.294 -CONFIG_IOSCHED_DEADLINE=y
   2.295 -CONFIG_IOSCHED_CFQ=y
   2.296  # CONFIG_ATA_OVER_ETH is not set
   2.297  
   2.298  #
   2.299 @@ -229,6 +352,7 @@ CONFIG_IOSCHED_CFQ=y
   2.300  #
   2.301  # SCSI device support
   2.302  #
   2.303 +# CONFIG_RAID_ATTRS is not set
   2.304  CONFIG_SCSI=y
   2.305  CONFIG_SCSI_PROC_FS=y
   2.306  
   2.307 @@ -241,6 +365,7 @@ CONFIG_CHR_DEV_OSST=y
   2.308  CONFIG_BLK_DEV_SR=y
   2.309  CONFIG_BLK_DEV_SR_VENDOR=y
   2.310  CONFIG_CHR_DEV_SG=y
   2.311 +# CONFIG_CHR_DEV_SCH is not set
   2.312  
   2.313  #
   2.314  # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
   2.315 @@ -255,10 +380,12 @@ CONFIG_SCSI_LOGGING=y
   2.316  CONFIG_SCSI_SPI_ATTRS=y
   2.317  # CONFIG_SCSI_FC_ATTRS is not set
   2.318  # CONFIG_SCSI_ISCSI_ATTRS is not set
   2.319 +CONFIG_SCSI_SAS_ATTRS=y
   2.320  
   2.321  #
   2.322  # SCSI low-level drivers
   2.323  #
   2.324 +# CONFIG_ISCSI_TCP is not set
   2.325  # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
   2.326  # CONFIG_SCSI_3W_9XXX is not set
   2.327  # CONFIG_SCSI_ACARD is not set
   2.328 @@ -269,8 +396,8 @@ CONFIG_SCSI_SPI_ATTRS=y
   2.329  # CONFIG_SCSI_ADVANSYS is not set
   2.330  # CONFIG_MEGARAID_NEWGEN is not set
   2.331  # CONFIG_MEGARAID_LEGACY is not set
   2.332 +# CONFIG_MEGARAID_SAS is not set
   2.333  # CONFIG_SCSI_SATA is not set
   2.334 -# CONFIG_SCSI_CPQFCTS is not set
   2.335  # CONFIG_SCSI_DMX3191D is not set
   2.336  # CONFIG_SCSI_EATA_PIO is not set
   2.337  # CONFIG_SCSI_FUTURE_DOMAIN is not set
   2.338 @@ -283,18 +410,15 @@ CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
   2.339  CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
   2.340  # CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
   2.341  # CONFIG_SCSI_IPR is not set
   2.342 -# CONFIG_SCSI_PCI2000 is not set
   2.343 -# CONFIG_SCSI_PCI2220I is not set
   2.344 -# CONFIG_SCSI_QLOGIC_ISP is not set
   2.345  # CONFIG_SCSI_QLOGIC_FC is not set
   2.346  CONFIG_SCSI_QLOGIC_1280=y
   2.347 -# CONFIG_SCSI_QLOGIC_1280_1040 is not set
   2.348  CONFIG_SCSI_QLA2XXX=y
   2.349  # CONFIG_SCSI_QLA21XX is not set
   2.350  # CONFIG_SCSI_QLA22XX is not set
   2.351  # CONFIG_SCSI_QLA2300 is not set
   2.352  # CONFIG_SCSI_QLA2322 is not set
   2.353  # CONFIG_SCSI_QLA6312 is not set
   2.354 +# CONFIG_SCSI_QLA24XX is not set
   2.355  # CONFIG_SCSI_LPFC is not set
   2.356  # CONFIG_SCSI_DC395x is not set
   2.357  # CONFIG_SCSI_DC390T is not set
   2.358 @@ -309,7 +433,10 @@ CONFIG_SCSI_QLA2XXX=y
   2.359  # Fusion MPT device support
   2.360  #
   2.361  CONFIG_FUSION=y
   2.362 -CONFIG_FUSION_MAX_SGE=40
   2.363 +CONFIG_FUSION_SPI=y
   2.364 +# CONFIG_FUSION_FC is not set
   2.365 +CONFIG_FUSION_SAS=y
   2.366 +CONFIG_FUSION_MAX_SGE=128
   2.367  # CONFIG_FUSION_CTL is not set
   2.368  
   2.369  #
   2.370 @@ -323,84 +450,8 @@ CONFIG_FUSION_MAX_SGE=40
   2.371  # CONFIG_I2O is not set
   2.372  
   2.373  #
   2.374 -# Networking support
   2.375 -#
   2.376 -CONFIG_NET=y
   2.377 -
   2.378 -#
   2.379 -# Networking options
   2.380 -#
   2.381 -CONFIG_PACKET=y
   2.382 -# CONFIG_PACKET_MMAP is not set
   2.383 -CONFIG_UNIX=y
   2.384 -# CONFIG_NET_KEY is not set
   2.385 -CONFIG_INET=y
   2.386 -CONFIG_IP_MULTICAST=y
   2.387 -# CONFIG_IP_ADVANCED_ROUTER is not set
   2.388 -# CONFIG_IP_PNP is not set
   2.389 -# CONFIG_NET_IPIP is not set
   2.390 -# CONFIG_NET_IPGRE is not set
   2.391 -# CONFIG_IP_MROUTE is not set
   2.392 -# CONFIG_ARPD is not set
   2.393 -# CONFIG_SYN_COOKIES is not set
   2.394 -# CONFIG_INET_AH is not set
   2.395 -# CONFIG_INET_ESP is not set
   2.396 -# CONFIG_INET_IPCOMP is not set
   2.397 -# CONFIG_INET_TUNNEL is not set
   2.398 -# CONFIG_IP_TCPDIAG is not set
   2.399 -# CONFIG_IP_TCPDIAG_IPV6 is not set
   2.400 -
   2.401 -#
   2.402 -# IP: Virtual Server Configuration
   2.403 -#
   2.404 -# CONFIG_IP_VS is not set
   2.405 -# CONFIG_IPV6 is not set
   2.406 -CONFIG_NETFILTER=y
   2.407 -# CONFIG_NETFILTER_DEBUG is not set
   2.408 -
   2.409 -#
   2.410 -# IP: Netfilter Configuration
   2.411 +# Network device support
   2.412  #
   2.413 -# CONFIG_IP_NF_CONNTRACK is not set
   2.414 -# CONFIG_IP_NF_CONNTRACK_MARK is not set
   2.415 -# CONFIG_IP_NF_QUEUE is not set
   2.416 -# CONFIG_IP_NF_IPTABLES is not set
   2.417 -CONFIG_IP_NF_ARPTABLES=y
   2.418 -# CONFIG_IP_NF_ARPFILTER is not set
   2.419 -# CONFIG_IP_NF_ARP_MANGLE is not set
   2.420 -
   2.421 -#
   2.422 -# SCTP Configuration (EXPERIMENTAL)
   2.423 -#
   2.424 -# CONFIG_IP_SCTP is not set
   2.425 -# CONFIG_ATM is not set
   2.426 -# CONFIG_BRIDGE is not set
   2.427 -# CONFIG_VLAN_8021Q is not set
   2.428 -# CONFIG_DECNET is not set
   2.429 -# CONFIG_LLC2 is not set
   2.430 -# CONFIG_IPX is not set
   2.431 -# CONFIG_ATALK is not set
   2.432 -# CONFIG_X25 is not set
   2.433 -# CONFIG_LAPB is not set
   2.434 -# CONFIG_NET_DIVERT is not set
   2.435 -# CONFIG_ECONET is not set
   2.436 -# CONFIG_WAN_ROUTER is not set
   2.437 -
   2.438 -#
   2.439 -# QoS and/or fair queueing
   2.440 -#
   2.441 -# CONFIG_NET_SCHED is not set
   2.442 -# CONFIG_NET_CLS_ROUTE is not set
   2.443 -
   2.444 -#
   2.445 -# Network testing
   2.446 -#
   2.447 -# CONFIG_NET_PKTGEN is not set
   2.448 -# CONFIG_NETPOLL is not set
   2.449 -# CONFIG_NET_POLL_CONTROLLER is not set
   2.450 -# CONFIG_HAMRADIO is not set
   2.451 -# CONFIG_IRDA is not set
   2.452 -# CONFIG_BT is not set
   2.453  CONFIG_NETDEVICES=y
   2.454  CONFIG_DUMMY=y
   2.455  # CONFIG_BONDING is not set
   2.456 @@ -413,12 +464,18 @@ CONFIG_DUMMY=y
   2.457  # CONFIG_ARCNET is not set
   2.458  
   2.459  #
   2.460 +# PHY device support
   2.461 +#
   2.462 +# CONFIG_PHYLIB is not set
   2.463 +
   2.464 +#
   2.465  # Ethernet (10 or 100Mbit)
   2.466  #
   2.467  CONFIG_NET_ETHERNET=y
   2.468  CONFIG_MII=y
   2.469  # CONFIG_HAPPYMEAL is not set
   2.470  # CONFIG_SUNGEM is not set
   2.471 +# CONFIG_CASSINI is not set
   2.472  # CONFIG_NET_VENDOR_3COM is not set
   2.473  
   2.474  #
   2.475 @@ -434,6 +491,7 @@ CONFIG_TULIP_NAPI_HW_MITIGATION=y
   2.476  # CONFIG_DE4X5 is not set
   2.477  # CONFIG_WINBOND_840 is not set
   2.478  # CONFIG_DM9102 is not set
   2.479 +# CONFIG_ULI526X is not set
   2.480  # CONFIG_HP100 is not set
   2.481  CONFIG_NET_PCI=y
   2.482  # CONFIG_PCNET32 is not set
   2.483 @@ -465,6 +523,8 @@ CONFIG_E1000=y
   2.484  # CONFIG_HAMACHI is not set
   2.485  # CONFIG_YELLOWFIN is not set
   2.486  # CONFIG_R8169 is not set
   2.487 +# CONFIG_SIS190 is not set
   2.488 +# CONFIG_SKGE is not set
   2.489  # CONFIG_SK98LIN is not set
   2.490  # CONFIG_VIA_VELOCITY is not set
   2.491  CONFIG_TIGON3=y
   2.492 @@ -473,6 +533,7 @@ CONFIG_TIGON3=y
   2.493  #
   2.494  # Ethernet (10000 Mbit)
   2.495  #
   2.496 +# CONFIG_CHELSIO_T1 is not set
   2.497  # CONFIG_IXGB is not set
   2.498  # CONFIG_S2IO is not set
   2.499  
   2.500 @@ -497,6 +558,8 @@ CONFIG_TIGON3=y
   2.501  # CONFIG_NET_FC is not set
   2.502  # CONFIG_SHAPER is not set
   2.503  # CONFIG_NETCONSOLE is not set
   2.504 +# CONFIG_NETPOLL is not set
   2.505 +# CONFIG_NET_POLL_CONTROLLER is not set
   2.506  
   2.507  #
   2.508  # ISDN subsystem
   2.509 @@ -547,7 +610,6 @@ CONFIG_SERIO=y
   2.510  #
   2.511  # Character devices
   2.512  #
   2.513 -# CONFIG_VT is not set
   2.514  # CONFIG_SERIAL_NONSTANDARD is not set
   2.515  
   2.516  #
   2.517 @@ -560,7 +622,6 @@ CONFIG_SERIAL_8250_NR_UARTS=8
   2.518  CONFIG_SERIAL_8250_EXTENDED=y
   2.519  CONFIG_SERIAL_8250_SHARE_IRQ=y
   2.520  # CONFIG_SERIAL_8250_DETECT_IRQ is not set
   2.521 -# CONFIG_SERIAL_8250_MULTIPORT is not set
   2.522  # CONFIG_SERIAL_8250_RSA is not set
   2.523  
   2.524  #
   2.525 @@ -592,14 +653,15 @@ CONFIG_EFI_RTC=y
   2.526  # Ftape, the floppy tape device driver
   2.527  #
   2.528  CONFIG_AGP=y
   2.529 -CONFIG_AGP_HP_ZX1=y
   2.530 +# CONFIG_AGP_I460 is not set
   2.531  CONFIG_DRM=y
   2.532  # CONFIG_DRM_TDFX is not set
   2.533 -# CONFIG_DRM_GAMMA is not set
   2.534  # CONFIG_DRM_R128 is not set
   2.535  CONFIG_DRM_RADEON=y
   2.536  # CONFIG_DRM_MGA is not set
   2.537  # CONFIG_DRM_SIS is not set
   2.538 +# CONFIG_DRM_VIA is not set
   2.539 +# CONFIG_DRM_SAVAGE is not set
   2.540  # CONFIG_RAW_DRIVER is not set
   2.541  # CONFIG_HPET is not set
   2.542  # CONFIG_HANGCHECK_TIMER is not set
   2.543 @@ -608,6 +670,7 @@ CONFIG_DRM_RADEON=y
   2.544  # TPM devices
   2.545  #
   2.546  # CONFIG_TCG_TPM is not set
   2.547 +# CONFIG_TELCLOCK is not set
   2.548  
   2.549  #
   2.550  # I2C support
   2.551 @@ -633,7 +696,6 @@ CONFIG_I2C_ALGOPCF=y
   2.552  # CONFIG_I2C_I801 is not set
   2.553  # CONFIG_I2C_I810 is not set
   2.554  # CONFIG_I2C_PIIX4 is not set
   2.555 -# CONFIG_I2C_ISA is not set
   2.556  # CONFIG_I2C_NFORCE2 is not set
   2.557  # CONFIG_I2C_PARPORT_LIGHT is not set
   2.558  # CONFIG_I2C_PROSAVAGE is not set
   2.559 @@ -649,14 +711,39 @@ CONFIG_I2C_ALGOPCF=y
   2.560  # CONFIG_I2C_PCA_ISA is not set
   2.561  
   2.562  #
   2.563 -# Hardware Sensors Chip support
   2.564 +# Miscellaneous I2C Chip support
   2.565  #
   2.566 -# CONFIG_I2C_SENSOR is not set
   2.567 +# CONFIG_SENSORS_DS1337 is not set
   2.568 +# CONFIG_SENSORS_DS1374 is not set
   2.569 +# CONFIG_SENSORS_EEPROM is not set
   2.570 +# CONFIG_SENSORS_PCF8574 is not set
   2.571 +# CONFIG_SENSORS_PCA9539 is not set
   2.572 +# CONFIG_SENSORS_PCF8591 is not set
   2.573 +# CONFIG_SENSORS_RTC8564 is not set
   2.574 +# CONFIG_SENSORS_MAX6875 is not set
   2.575 +# CONFIG_RTC_X1205_I2C is not set
   2.576 +# CONFIG_I2C_DEBUG_CORE is not set
   2.577 +# CONFIG_I2C_DEBUG_ALGO is not set
   2.578 +# CONFIG_I2C_DEBUG_BUS is not set
   2.579 +# CONFIG_I2C_DEBUG_CHIP is not set
   2.580 +
   2.581 +#
   2.582 +# Dallas's 1-wire bus
   2.583 +#
   2.584 +# CONFIG_W1 is not set
   2.585 +
   2.586 +#
   2.587 +# Hardware Monitoring support
   2.588 +#
   2.589 +CONFIG_HWMON=y
   2.590 +# CONFIG_HWMON_VID is not set
   2.591  # CONFIG_SENSORS_ADM1021 is not set
   2.592  # CONFIG_SENSORS_ADM1025 is not set
   2.593  # CONFIG_SENSORS_ADM1026 is not set
   2.594  # CONFIG_SENSORS_ADM1031 is not set
   2.595 +# CONFIG_SENSORS_ADM9240 is not set
   2.596  # CONFIG_SENSORS_ASB100 is not set
   2.597 +# CONFIG_SENSORS_ATXP1 is not set
   2.598  # CONFIG_SENSORS_DS1621 is not set
   2.599  # CONFIG_SENSORS_FSCHER is not set
   2.600  # CONFIG_SENSORS_FSCPOS is not set
   2.601 @@ -675,37 +762,26 @@ CONFIG_I2C_ALGOPCF=y
   2.602  # CONFIG_SENSORS_LM92 is not set
   2.603  # CONFIG_SENSORS_MAX1619 is not set
   2.604  # CONFIG_SENSORS_PC87360 is not set
   2.605 -# CONFIG_SENSORS_SMSC47B397 is not set
   2.606  # CONFIG_SENSORS_SIS5595 is not set
   2.607  # CONFIG_SENSORS_SMSC47M1 is not set
   2.608 +# CONFIG_SENSORS_SMSC47B397 is not set
   2.609  # CONFIG_SENSORS_VIA686A is not set
   2.610  # CONFIG_SENSORS_W83781D is not set
   2.611 +# CONFIG_SENSORS_W83792D is not set
   2.612  # CONFIG_SENSORS_W83L785TS is not set
   2.613  # CONFIG_SENSORS_W83627HF is not set
   2.614 -
   2.615 -#
   2.616 -# Other I2C Chip support
   2.617 -#
   2.618 -# CONFIG_SENSORS_DS1337 is not set
   2.619 -# CONFIG_SENSORS_EEPROM is not set
   2.620 -# CONFIG_SENSORS_PCF8574 is not set
   2.621 -# CONFIG_SENSORS_PCF8591 is not set
   2.622 -# CONFIG_SENSORS_RTC8564 is not set
   2.623 -# CONFIG_I2C_DEBUG_CORE is not set
   2.624 -# CONFIG_I2C_DEBUG_ALGO is not set
   2.625 -# CONFIG_I2C_DEBUG_BUS is not set
   2.626 -# CONFIG_I2C_DEBUG_CHIP is not set
   2.627 -
   2.628 -#
   2.629 -# Dallas's 1-wire bus
   2.630 -#
   2.631 -# CONFIG_W1 is not set
   2.632 +# CONFIG_SENSORS_W83627EHF is not set
   2.633 +# CONFIG_HWMON_DEBUG_CHIP is not set
   2.634  
   2.635  #
   2.636  # Misc devices
   2.637  #
   2.638  
   2.639  #
   2.640 +# Multimedia Capabilities Port drivers
   2.641 +#
   2.642 +
   2.643 +#
   2.644  # Multimedia devices
   2.645  #
   2.646  CONFIG_VIDEO_DEV=y
   2.647 @@ -731,7 +807,10 @@ CONFIG_VIDEO_DEV=y
   2.648  # CONFIG_VIDEO_HEXIUM_ORION is not set
   2.649  # CONFIG_VIDEO_HEXIUM_GEMINI is not set
   2.650  # CONFIG_VIDEO_CX88 is not set
   2.651 +# CONFIG_VIDEO_EM28XX is not set
   2.652  # CONFIG_VIDEO_OVCAMCHIP is not set
   2.653 +# CONFIG_VIDEO_AUDIO_DECODER is not set
   2.654 +# CONFIG_VIDEO_DECODER is not set
   2.655  
   2.656  #
   2.657  # Radio Adapters
   2.658 @@ -752,7 +831,6 @@ CONFIG_FB=y
   2.659  CONFIG_FB_CFB_FILLRECT=y
   2.660  CONFIG_FB_CFB_COPYAREA=y
   2.661  CONFIG_FB_CFB_IMAGEBLIT=y
   2.662 -CONFIG_FB_SOFT_CURSOR=y
   2.663  # CONFIG_FB_MACMODES is not set
   2.664  CONFIG_FB_MODE_HELPERS=y
   2.665  # CONFIG_FB_TILEBLITTING is not set
   2.666 @@ -761,6 +839,7 @@ CONFIG_FB_MODE_HELPERS=y
   2.667  # CONFIG_FB_CYBER2000 is not set
   2.668  # CONFIG_FB_ASILIANT is not set
   2.669  # CONFIG_FB_IMSTT is not set
   2.670 +# CONFIG_FB_S1D13XXX is not set
   2.671  # CONFIG_FB_NVIDIA is not set
   2.672  # CONFIG_FB_RIVA is not set
   2.673  # CONFIG_FB_MATROX is not set
   2.674 @@ -776,9 +855,9 @@ CONFIG_FB_RADEON_DEBUG=y
   2.675  # CONFIG_FB_KYRO is not set
   2.676  # CONFIG_FB_3DFX is not set
   2.677  # CONFIG_FB_VOODOO1 is not set
   2.678 +# CONFIG_FB_CYBLA is not set
   2.679  # CONFIG_FB_TRIDENT is not set
   2.680  # CONFIG_FB_PM3 is not set
   2.681 -# CONFIG_FB_S1D13XXX is not set
   2.682  # CONFIG_FB_VIRTUAL is not set
   2.683  
   2.684  #
   2.685 @@ -799,6 +878,8 @@ CONFIG_SOUND=y
   2.686  # Advanced Linux Sound Architecture
   2.687  #
   2.688  CONFIG_SND=y
   2.689 +CONFIG_SND_AC97_CODEC=y
   2.690 +CONFIG_SND_AC97_BUS=y
   2.691  CONFIG_SND_TIMER=y
   2.692  CONFIG_SND_PCM=y
   2.693  CONFIG_SND_HWDEP=y
   2.694 @@ -826,7 +907,6 @@ CONFIG_SND_OPL3_LIB=y
   2.695  #
   2.696  # PCI devices
   2.697  #
   2.698 -CONFIG_SND_AC97_CODEC=y
   2.699  # CONFIG_SND_ALI5451 is not set
   2.700  # CONFIG_SND_ATIIXP is not set
   2.701  # CONFIG_SND_ATIIXP_MODEM is not set
   2.702 @@ -847,9 +927,10 @@ CONFIG_SND_AC97_CODEC=y
   2.703  # CONFIG_SND_RME96 is not set
   2.704  # CONFIG_SND_RME9652 is not set
   2.705  # CONFIG_SND_HDSP is not set
   2.706 +# CONFIG_SND_HDSPM is not set
   2.707  # CONFIG_SND_TRIDENT is not set
   2.708  # CONFIG_SND_YMFPCI is not set
   2.709 -# CONFIG_SND_ALS4000 is not set
   2.710 +# CONFIG_SND_AD1889 is not set
   2.711  # CONFIG_SND_CMIPCI is not set
   2.712  # CONFIG_SND_ENS1370 is not set
   2.713  # CONFIG_SND_ENS1371 is not set
   2.714 @@ -901,6 +982,7 @@ CONFIG_USB_BANDWIDTH=y
   2.715  CONFIG_USB_EHCI_HCD=y
   2.716  # CONFIG_USB_EHCI_SPLIT_ISO is not set
   2.717  # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
   2.718 +# CONFIG_USB_ISP116X_HCD is not set
   2.719  CONFIG_USB_OHCI_HCD=y
   2.720  # CONFIG_USB_OHCI_BIG_ENDIAN is not set
   2.721  CONFIG_USB_OHCI_LITTLE_ENDIAN=y
   2.722 @@ -910,14 +992,16 @@ CONFIG_USB_UHCI_HCD=y
   2.723  #
   2.724  # USB Device Class drivers
   2.725  #
   2.726 -# CONFIG_USB_AUDIO is not set
   2.727 -# CONFIG_USB_BLUETOOTH_TTY is not set
   2.728 -# CONFIG_USB_MIDI is not set
   2.729 +# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
   2.730  # CONFIG_USB_ACM is not set
   2.731  # CONFIG_USB_PRINTER is not set
   2.732  
   2.733  #
   2.734 -# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
   2.735 +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
   2.736 +#
   2.737 +
   2.738 +#
   2.739 +# may also be needed; see USB_STORAGE Help for more information
   2.740  #
   2.741  CONFIG_USB_STORAGE=y
   2.742  # CONFIG_USB_STORAGE_DEBUG is not set
   2.743 @@ -938,12 +1022,17 @@ CONFIG_USB_HIDINPUT=y
   2.744  CONFIG_USB_HIDDEV=y
   2.745  # CONFIG_USB_AIPTEK is not set
   2.746  # CONFIG_USB_WACOM is not set
   2.747 +# CONFIG_USB_ACECAD is not set
   2.748  # CONFIG_USB_KBTAB is not set
   2.749  # CONFIG_USB_POWERMATE is not set
   2.750  # CONFIG_USB_MTOUCH is not set
   2.751 +# CONFIG_USB_ITMTOUCH is not set
   2.752  # CONFIG_USB_EGALAX is not set
   2.753 +# CONFIG_USB_YEALINK is not set
   2.754  # CONFIG_USB_XPAD is not set
   2.755  # CONFIG_USB_ATI_REMOTE is not set
   2.756 +# CONFIG_USB_KEYSPAN_REMOTE is not set
   2.757 +# CONFIG_USB_APPLETOUCH is not set
   2.758  
   2.759  #
   2.760  # USB Imaging devices
   2.761 @@ -999,9 +1088,10 @@ CONFIG_USB_MON=y
   2.762  # CONFIG_USB_PHIDGETSERVO is not set
   2.763  # CONFIG_USB_IDMOUSE is not set
   2.764  # CONFIG_USB_SISUSBVGA is not set
   2.765 +# CONFIG_USB_LD is not set
   2.766  
   2.767  #
   2.768 -# USB ATM/DSL drivers
   2.769 +# USB DSL modem support
   2.770  #
   2.771  
   2.772  #
   2.773 @@ -1020,12 +1110,17 @@ CONFIG_USB_MON=y
   2.774  # CONFIG_INFINIBAND is not set
   2.775  
   2.776  #
   2.777 +# SN Devices
   2.778 +#
   2.779 +
   2.780 +#
   2.781  # File systems
   2.782  #
   2.783  CONFIG_EXT2_FS=y
   2.784  CONFIG_EXT2_FS_XATTR=y
   2.785  # CONFIG_EXT2_FS_POSIX_ACL is not set
   2.786  # CONFIG_EXT2_FS_SECURITY is not set
   2.787 +# CONFIG_EXT2_FS_XIP is not set
   2.788  CONFIG_EXT3_FS=y
   2.789  CONFIG_EXT3_FS_XATTR=y
   2.790  # CONFIG_EXT3_FS_POSIX_ACL is not set
   2.791 @@ -1035,17 +1130,16 @@ CONFIG_JBD=y
   2.792  CONFIG_FS_MBCACHE=y
   2.793  # CONFIG_REISERFS_FS is not set
   2.794  # CONFIG_JFS_FS is not set
   2.795 -
   2.796 -#
   2.797 -# XFS support
   2.798 -#
   2.799 +# CONFIG_FS_POSIX_ACL is not set
   2.800  # CONFIG_XFS_FS is not set
   2.801  # CONFIG_MINIX_FS is not set
   2.802  # CONFIG_ROMFS_FS is not set
   2.803 +CONFIG_INOTIFY=y
   2.804  # CONFIG_QUOTA is not set
   2.805  CONFIG_DNOTIFY=y
   2.806  CONFIG_AUTOFS_FS=y
   2.807  # CONFIG_AUTOFS4_FS is not set
   2.808 +# CONFIG_FUSE_FS is not set
   2.809  
   2.810  #
   2.811  # CD-ROM/DVD Filesystems
   2.812 @@ -1072,14 +1166,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
   2.813  CONFIG_PROC_FS=y
   2.814  CONFIG_PROC_KCORE=y
   2.815  CONFIG_SYSFS=y
   2.816 -# CONFIG_DEVFS_FS is not set
   2.817 -# CONFIG_DEVPTS_FS_XATTR is not set
   2.818  CONFIG_TMPFS=y
   2.819 -CONFIG_TMPFS_XATTR=y
   2.820 -CONFIG_TMPFS_SECURITY=y
   2.821 -CONFIG_HUGETLBFS=y
   2.822 -CONFIG_HUGETLB_PAGE=y
   2.823 +# CONFIG_HUGETLB_PAGE is not set
   2.824  CONFIG_RAMFS=y
   2.825 +# CONFIG_RELAYFS_FS is not set
   2.826  
   2.827  #
   2.828  # Miscellaneous filesystems
   2.829 @@ -1103,15 +1193,18 @@ CONFIG_RAMFS=y
   2.830  #
   2.831  CONFIG_NFS_FS=y
   2.832  CONFIG_NFS_V3=y
   2.833 +# CONFIG_NFS_V3_ACL is not set
   2.834  CONFIG_NFS_V4=y
   2.835  # CONFIG_NFS_DIRECTIO is not set
   2.836  CONFIG_NFSD=y
   2.837  CONFIG_NFSD_V3=y
   2.838 +# CONFIG_NFSD_V3_ACL is not set
   2.839  # CONFIG_NFSD_V4 is not set
   2.840  # CONFIG_NFSD_TCP is not set
   2.841  CONFIG_LOCKD=y
   2.842  CONFIG_LOCKD_V4=y
   2.843  CONFIG_EXPORTFS=y
   2.844 +CONFIG_NFS_COMMON=y
   2.845  CONFIG_SUNRPC=y
   2.846  CONFIG_SUNRPC_GSS=y
   2.847  CONFIG_RPCSEC_GSS_KRB5=y
   2.848 @@ -1121,6 +1214,7 @@ CONFIG_RPCSEC_GSS_KRB5=y
   2.849  # CONFIG_NCP_FS is not set
   2.850  # CONFIG_CODA_FS is not set
   2.851  # CONFIG_AFS_FS is not set
   2.852 +# CONFIG_9P_FS is not set
   2.853  
   2.854  #
   2.855  # Partition Types
   2.856 @@ -1190,15 +1284,18 @@ CONFIG_NLS_UTF8=y
   2.857  # Library routines
   2.858  #
   2.859  # CONFIG_CRC_CCITT is not set
   2.860 +# CONFIG_CRC16 is not set
   2.861  CONFIG_CRC32=y
   2.862  # CONFIG_LIBCRC32C is not set
   2.863  CONFIG_GENERIC_HARDIRQS=y
   2.864  CONFIG_GENERIC_IRQ_PROBE=y
   2.865 +CONFIG_GENERIC_PENDING_IRQ=y
   2.866  
   2.867  #
   2.868 -# Profiling support
   2.869 +# Instrumentation Support
   2.870  #
   2.871  # CONFIG_PROFILING is not set
   2.872 +# CONFIG_KPROBES is not set
   2.873  
   2.874  #
   2.875  # Kernel hacking
   2.876 @@ -1207,6 +1304,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
   2.877  CONFIG_DEBUG_KERNEL=y
   2.878  CONFIG_MAGIC_SYSRQ=y
   2.879  CONFIG_LOG_BUF_SHIFT=17
   2.880 +CONFIG_DETECT_SOFTLOCKUP=y
   2.881  # CONFIG_SCHEDSTATS is not set
   2.882  # CONFIG_DEBUG_SLAB is not set
   2.883  # CONFIG_DEBUG_SPINLOCK is not set
   2.884 @@ -1214,6 +1312,8 @@ CONFIG_LOG_BUF_SHIFT=17
   2.885  # CONFIG_DEBUG_KOBJECT is not set
   2.886  # CONFIG_DEBUG_INFO is not set
   2.887  # CONFIG_DEBUG_FS is not set
   2.888 +# CONFIG_DEBUG_VM is not set
   2.889 +# CONFIG_RCU_TORTURE_TEST is not set
   2.890  CONFIG_IA64_GRANULE_16MB=y
   2.891  # CONFIG_IA64_GRANULE_64MB is not set
   2.892  CONFIG_IA64_PRINT_HAZARDS=y
     3.1 --- a/linux-2.6-xen-sparse/arch/ia64/Kconfig	Wed Feb 01 14:27:35 2006 -0700
     3.2 +++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig	Thu Feb 02 10:59:20 2006 +0000
     3.3 @@ -26,6 +26,10 @@ config MMU
     3.4  	bool
     3.5  	default y
     3.6  
     3.7 +config SWIOTLB
     3.8 +       bool
     3.9 +       default y
    3.10 +
    3.11  config RWSEM_XCHGADD_ALGORITHM
    3.12  	bool
    3.13  	default y
    3.14 @@ -97,16 +101,23 @@ config SCHED_NO_NO_OMIT_FRAME_POINTER
    3.15  	bool
    3.16  	default y
    3.17  
    3.18 +config IA64_UNCACHED_ALLOCATOR
    3.19 +	bool
    3.20 +	select GENERIC_ALLOCATOR
    3.21 +
    3.22 +config DMA_IS_DMA32
    3.23 +	bool
    3.24 +	default y
    3.25 +
    3.26  choice
    3.27  	prompt "System type"
    3.28  	default IA64_GENERIC
    3.29  
    3.30  config IA64_GENERIC
    3.31  	bool "generic"
    3.32 +	select ACPI
    3.33  	select NUMA
    3.34  	select ACPI_NUMA
    3.35 -	select VIRTUAL_MEM_MAP
    3.36 -	select DISCONTIGMEM
    3.37  	help
    3.38  	  This selects the system type of your hardware.  A "generic" kernel
    3.39  	  will run on any supported IA-64 system.  However, if you configure
    3.40 @@ -204,6 +215,21 @@ config IA64_PAGE_SIZE_64KB
    3.41  
    3.42  endchoice
    3.43  
    3.44 +choice
    3.45 +	prompt "Page Table Levels"
    3.46 +	default PGTABLE_3
    3.47 +
    3.48 +config PGTABLE_3
    3.49 +	bool "3 Levels"
    3.50 +
    3.51 +config PGTABLE_4
    3.52 +	depends on !IA64_PAGE_SIZE_64KB
    3.53 +	bool "4 Levels"
    3.54 +
    3.55 +endchoice
    3.56 +
    3.57 +source kernel/Kconfig.hz
    3.58 +
    3.59  config IA64_BRL_EMU
    3.60  	bool
    3.61  	depends on ITANIUM
    3.62 @@ -216,40 +242,6 @@ config IA64_L1_CACHE_SHIFT
    3.63  	default "6" if ITANIUM
    3.64  
    3.65  # align cache-sensitive data to 64 bytes
    3.66 -config NUMA
    3.67 -	bool "NUMA support"
    3.68 -	depends on !IA64_HP_SIM
    3.69 -	default y if IA64_SGI_SN2
    3.70 -	select ACPI_NUMA
    3.71 -	help
    3.72 -	  Say Y to compile the kernel to support NUMA (Non-Uniform Memory
    3.73 -	  Access).  This option is for configuring high-end multiprocessor
    3.74 -	  server systems.  If in doubt, say N.
    3.75 -
    3.76 -config VIRTUAL_MEM_MAP
    3.77 -	bool "Virtual mem map"
    3.78 -	default y if !IA64_HP_SIM
    3.79 -	help
    3.80 -	  Say Y to compile the kernel with support for a virtual mem map.
    3.81 -	  This code also only takes effect if a memory hole of greater than
    3.82 -	  1 Gb is found during boot.  You must turn this option on if you
    3.83 -	  require the DISCONTIGMEM option for your machine. If you are
    3.84 -	  unsure, say Y.
    3.85 -
    3.86 -config HOLES_IN_ZONE
    3.87 -	bool
    3.88 -	default y if VIRTUAL_MEM_MAP
    3.89 -
    3.90 -config DISCONTIGMEM
    3.91 -	bool "Discontiguous memory support"
    3.92 -	depends on (IA64_DIG || IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB) && NUMA && VIRTUAL_MEM_MAP
    3.93 -	default y if (IA64_SGI_SN2 || IA64_GENERIC) && NUMA
    3.94 -	help
    3.95 -	  Say Y to support efficient handling of discontiguous physical memory,
    3.96 -	  for architectures which are either NUMA (Non-Uniform Memory Access)
    3.97 -	  or have huge holes in the physical address space for other reasons.
    3.98 -	  See <file:Documentation/vm/numa> for more.
    3.99 -
   3.100  config IA64_CYCLONE
   3.101  	bool "Cyclone (EXA) Time Source support"
   3.102  	help
   3.103 @@ -261,16 +253,10 @@ config IOSAPIC
   3.104  	depends on !IA64_HP_SIM
   3.105  	default y
   3.106  
   3.107 -config IA64_SGI_SN_SIM
   3.108 -	bool "SGI Medusa Simulator Support"
   3.109 -	depends on IA64_SGI_SN2
   3.110 -	help
   3.111 -	  If you are compiling a kernel that will run under SGI's IA-64
   3.112 -	  simulator (Medusa) then say Y, otherwise say N.
   3.113 -
   3.114  config IA64_SGI_SN_XP
   3.115  	tristate "Support communication between SGI SSIs"
   3.116 -	depends on MSPEC
   3.117 +	depends on IA64_GENERIC || IA64_SGI_SN2
   3.118 +	select IA64_UNCACHED_ALLOCATOR
   3.119  	help
   3.120  	  An SGI machine can be divided into multiple Single System
   3.121  	  Images which act independently of each other and have
   3.122 @@ -279,8 +265,10 @@ config IA64_SGI_SN_XP
   3.123  	  based on a network adapter and DMA messaging.
   3.124  
   3.125  config FORCE_MAX_ZONEORDER
   3.126 -	int
   3.127 -	default "18"
   3.128 +	int "MAX_ORDER (11 - 17)"  if !HUGETLB_PAGE
   3.129 +	range 11 17  if !HUGETLB_PAGE
   3.130 +	default "17" if HUGETLB_PAGE
   3.131 +	default "11"
   3.132  
   3.133  config SMP
   3.134  	bool "Symmetric multi-processing support"
   3.135 @@ -301,8 +289,8 @@ config SMP
   3.136  	  If you don't know what to do here, say N.
   3.137  
   3.138  config NR_CPUS
   3.139 -	int "Maximum number of CPUs (2-512)"
   3.140 -	range 2 512
   3.141 +	int "Maximum number of CPUs (2-1024)"
   3.142 +	range 2 1024
   3.143  	depends on SMP
   3.144  	default "64"
   3.145  	help
   3.146 @@ -343,10 +331,59 @@ config PREEMPT
   3.147            Say Y here if you are building a kernel for a desktop, embedded
   3.148            or real-time system.  Say N if you are unsure.
   3.149  
   3.150 -config HAVE_DEC_LOCK
   3.151 +source "mm/Kconfig"
   3.152 +
   3.153 +config ARCH_SELECT_MEMORY_MODEL
   3.154 +	def_bool y
   3.155 +
   3.156 +config ARCH_DISCONTIGMEM_ENABLE
   3.157 +	def_bool y
   3.158 +	help
   3.159 +	  Say Y to support efficient handling of discontiguous physical memory,
   3.160 +	  for architectures which are either NUMA (Non-Uniform Memory Access)
   3.161 +	  or have huge holes in the physical address space for other reasons.
   3.162 + 	  See <file:Documentation/vm/numa> for more.
   3.163 +
   3.164 +config ARCH_FLATMEM_ENABLE
   3.165 +	def_bool y
   3.166 +
   3.167 +config ARCH_SPARSEMEM_ENABLE
   3.168 +	def_bool y
   3.169 +	depends on ARCH_DISCONTIGMEM_ENABLE
   3.170 +
   3.171 +config ARCH_DISCONTIGMEM_DEFAULT
   3.172 +	def_bool y if (IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB)
   3.173 +	depends on ARCH_DISCONTIGMEM_ENABLE
   3.174 +
   3.175 +config NUMA
   3.176 +	bool "NUMA support"
   3.177 +	depends on !IA64_HP_SIM && !FLATMEM
   3.178 +	default y if IA64_SGI_SN2
   3.179 +	help
   3.180 +	  Say Y to compile the kernel to support NUMA (Non-Uniform Memory
   3.181 +	  Access).  This option is for configuring high-end multiprocessor
   3.182 +	  server systems.  If in doubt, say N.
   3.183 +
   3.184 +# VIRTUAL_MEM_MAP and FLAT_NODE_MEM_MAP are functionally equivalent.
   3.185 +# VIRTUAL_MEM_MAP has been retained for historical reasons.
   3.186 +config VIRTUAL_MEM_MAP
   3.187 +	bool "Virtual mem map"
   3.188 +	depends on !SPARSEMEM
   3.189 +	default y if !IA64_HP_SIM
   3.190 +	help
   3.191 +	  Say Y to compile the kernel with support for a virtual mem map.
   3.192 +	  This code also only takes effect if a memory hole of greater than
   3.193 +	  1 Gb is found during boot.  You must turn this option on if you
   3.194 +	  require the DISCONTIGMEM option for your machine. If you are
   3.195 +	  unsure, say Y.
   3.196 +
   3.197 +config HOLES_IN_ZONE
   3.198  	bool
   3.199 -	depends on (SMP || PREEMPT)
   3.200 -	default y
   3.201 +	default y if VIRTUAL_MEM_MAP
   3.202 +
   3.203 +config HAVE_ARCH_EARLY_PFN_TO_NID
   3.204 +	def_bool y
   3.205 +	depends on NEED_MULTIPLE_NODES
   3.206  
   3.207  config IA32_SUPPORT
   3.208  	bool "Support for Linux/x86 binaries"
   3.209 @@ -384,11 +421,6 @@ config IA64_PALINFO
   3.210  	  To use this option, you have to ensure that the "/proc file system
   3.211  	  support" (CONFIG_PROC_FS) is enabled, too.
   3.212  
   3.213 -config ACPI_DEALLOCATE_IRQ
   3.214 -	bool
   3.215 -	depends on IOSAPIC && EXPERIMENTAL
   3.216 -	default y
   3.217 -
   3.218  source "drivers/firmware/Kconfig"
   3.219  
   3.220  source "fs/Kconfig.binfmt"
   3.221 @@ -397,36 +429,14 @@ endmenu
   3.222  
   3.223  menu "Power management and ACPI"
   3.224  
   3.225 -config PM
   3.226 -	bool "Power Management support"
   3.227 -	depends on !IA64_HP_SIM
   3.228 -	default y
   3.229 -	help
   3.230 -	  "Power Management" means that parts of your computer are shut
   3.231 -	  off or put into a power conserving "sleep" mode if they are not
   3.232 -	  being used.  There are two competing standards for doing this: APM
   3.233 -	  and ACPI.  If you want to use either one, say Y here and then also
   3.234 -	  to the requisite support below.
   3.235 -
   3.236 -	  Power Management is most important for battery powered laptop
   3.237 -	  computers; if you have a laptop, check out the Linux Laptop home
   3.238 -	  page on the WWW at <http://www.linux-on-laptops.com/> and the
   3.239 -	  Battery Powered Linux mini-HOWTO, available from
   3.240 -	  <http://www.tldp.org/docs.html#howto>.
   3.241 -
   3.242 -	  Note that, even if you say N here, Linux on the x86 architecture
   3.243 -	  will issue the hlt instruction if nothing is to be done, thereby
   3.244 -	  sending the processor to sleep and saving power.
   3.245 -
   3.246 -config ACPI
   3.247 -	bool
   3.248 -	depends on !IA64_HP_SIM
   3.249 -	default y
   3.250 -
   3.251 -if !IA64_HP_SIM
   3.252 +source "kernel/power/Kconfig"
   3.253  
   3.254  source "drivers/acpi/Kconfig"
   3.255  
   3.256 +if PM
   3.257 +
   3.258 +source "arch/ia64/kernel/cpufreq/Kconfig"
   3.259 +
   3.260  endif
   3.261  
   3.262  endmenu
   3.263 @@ -438,15 +448,8 @@ menu "Bus options (PCI, PCMCIA)"
   3.264  config PCI
   3.265  	bool "PCI support"
   3.266  	help
   3.267 -	  Find out whether you have a PCI motherboard. PCI is the name of a
   3.268 -	  bus system, i.e. the way the CPU talks to the other stuff inside
   3.269 -	  your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
   3.270 -	  VESA. If you have PCI, say Y, otherwise N.
   3.271 -
   3.272 -	  The PCI-HOWTO, available from
   3.273 -	  <http://www.tldp.org/docs.html#howto>, contains valuable
   3.274 -	  information about which PCI hardware does work under Linux and which
   3.275 -	  doesn't.
   3.276 +	  Real IA-64 machines all have PCI/PCI-X/PCI Express busses.  Say Y
   3.277 +	  here unless you are using a simulator without PCI support.
   3.278  
   3.279  config PCI_DOMAINS
   3.280  	bool
   3.281 @@ -462,6 +465,8 @@ endmenu
   3.282  
   3.283  endif
   3.284  
   3.285 +source "net/Kconfig"
   3.286 +
   3.287  source "drivers/Kconfig"
   3.288  
   3.289  source "fs/Kconfig"
   3.290 @@ -479,10 +484,28 @@ config GENERIC_IRQ_PROBE
   3.291  	bool
   3.292  	default y
   3.293  
   3.294 +config GENERIC_PENDING_IRQ
   3.295 +	bool
   3.296 +	depends on GENERIC_HARDIRQS && SMP
   3.297 +	default y
   3.298 +
   3.299  source "arch/ia64/hp/sim/Kconfig"
   3.300  
   3.301 +menu "Instrumentation Support"
   3.302 +        depends on EXPERIMENTAL
   3.303 +
   3.304  source "arch/ia64/oprofile/Kconfig"
   3.305  
   3.306 +config KPROBES
   3.307 +	bool "Kprobes (EXPERIMENTAL)"
   3.308 +	help
   3.309 +	  Kprobes allows you to trap at almost any kernel address and
   3.310 +	  execute a callback function.  register_kprobe() establishes
   3.311 +	  a probepoint and specifies the callback.  Kprobes is useful
   3.312 +	  for kernel debugging, non-intrusive instrumentation and testing.
   3.313 +	  If in doubt, say "N".
   3.314 +endmenu
   3.315 +
   3.316  source "arch/ia64/Kconfig.debug"
   3.317  
   3.318  source "security/Kconfig"
     4.1 --- a/linux-2.6-xen-sparse/arch/ia64/Makefile	Wed Feb 01 14:27:35 2006 -0700
     4.2 +++ b/linux-2.6-xen-sparse/arch/ia64/Makefile	Thu Feb 02 10:59:20 2006 +0000
     4.3 @@ -88,24 +88,7 @@ unwcheck: vmlinux
     4.4  archclean:
     4.5  	$(Q)$(MAKE) $(clean)=$(boot)
     4.6  
     4.7 -CLEAN_FILES += include/asm-ia64/.offsets.h.stamp vmlinux.gz bootloader
     4.8 -
     4.9 -MRPROPER_FILES += include/asm-ia64/offsets.h
    4.10 -
    4.11 -prepare: include/asm-ia64/offsets.h
    4.12 -
    4.13 -arch/ia64/kernel/asm-offsets.s: include/asm include/linux/version.h include/config/MARKER
    4.14 -
    4.15 -include/asm-ia64/offsets.h: arch/ia64/kernel/asm-offsets.s
    4.16 -	$(call filechk,gen-asm-offsets)
    4.17 -
    4.18 -arch/ia64/kernel/asm-offsets.s: include/asm-ia64/.offsets.h.stamp
    4.19 -
    4.20 -include/asm-ia64/.offsets.h.stamp:
    4.21 -	mkdir -p include/asm-ia64
    4.22 -	[ -s include/asm-ia64/offsets.h ] \
    4.23 -	 || echo "#define IA64_TASK_SIZE 0" > include/asm-ia64/offsets.h
    4.24 -	touch $@
    4.25 +CLEAN_FILES += vmlinux.gz bootloader
    4.26  
    4.27  boot:	lib/lib.a vmlinux
    4.28  	$(Q)$(MAKE) $(build)=$(boot) $@
     5.1 --- a/linux-2.6-xen-sparse/arch/ia64/kernel/entry.S	Wed Feb 01 14:27:35 2006 -0700
     5.2 +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/entry.S	Thu Feb 02 10:59:20 2006 +0000
     5.3 @@ -37,7 +37,7 @@
     5.4  #include <asm/cache.h>
     5.5  #include <asm/errno.h>
     5.6  #include <asm/kregs.h>
     5.7 -#include <asm/offsets.h>
     5.8 +#include <asm/asm-offsets.h>
     5.9  #include <asm/pgtable.h>
    5.10  #include <asm/percpu.h>
    5.11  #include <asm/processor.h>
    5.12 @@ -204,9 +204,6 @@ GLOBAL_ENTRY(__ia64_switch_to)
    5.13  (p6)	br.cond.dpnt .map
    5.14  	;;
    5.15  .done:
    5.16 -(p6)	ssm psr.ic			// if we had to map, reenable the psr.ic bit FIRST!!!
    5.17 -	;;
    5.18 -(p6)	srlz.d
    5.19  	ld8 sp=[r21]			// load kernel stack pointer of new task
    5.20  	mov IA64_KR(CURRENT)=in0	// update "current" application register
    5.21  	mov r8=r13			// return pointer to previously running task
    5.22 @@ -234,6 +231,9 @@ GLOBAL_ENTRY(__ia64_switch_to)
    5.23  	mov IA64_KR(CURRENT_STACK)=r26	// remember last page we mapped...
    5.24  	;;
    5.25  	itr.d dtr[r25]=r23		// wire in new mapping...
    5.26 +	ssm psr.ic			// reenable the psr.ic bit
    5.27 +	;;
    5.28 +	srlz.d
    5.29  	br.cond.sptk .done
    5.30  END(__ia64_switch_to)
    5.31  
    5.32 @@ -470,17 +470,28 @@ GLOBAL_ENTRY(load_switch_stack)
    5.33  	br.cond.sptk.many b7
    5.34  END(load_switch_stack)
    5.35  
    5.36 -GLOBAL_ENTRY(__ia64_syscall)
    5.37 -	.regstk 6,0,0,0
    5.38 -	mov r15=in5				// put syscall number in place
    5.39 -	break __BREAK_SYSCALL
    5.40 -	movl r2=errno
    5.41 -	cmp.eq p6,p7=-1,r10
    5.42 +GLOBAL_ENTRY(prefetch_stack)
    5.43 +	add r14 = -IA64_SWITCH_STACK_SIZE, sp
    5.44 +	add r15 = IA64_TASK_THREAD_KSP_OFFSET, in0
    5.45  	;;
    5.46 -(p6)	st4 [r2]=r8
    5.47 -(p6)	mov r8=-1
    5.48 +	ld8 r16 = [r15]				// load next's stack pointer
    5.49 +	lfetch.fault.excl [r14], 128
    5.50 +	;;
    5.51 +	lfetch.fault.excl [r14], 128
    5.52 +	lfetch.fault [r16], 128
    5.53 +	;;
    5.54 +	lfetch.fault.excl [r14], 128
    5.55 +	lfetch.fault [r16], 128
    5.56 +	;;
    5.57 +	lfetch.fault.excl [r14], 128
    5.58 +	lfetch.fault [r16], 128
    5.59 +	;;
    5.60 +	lfetch.fault.excl [r14], 128
    5.61 +	lfetch.fault [r16], 128
    5.62 +	;;
    5.63 +	lfetch.fault [r16], 128
    5.64  	br.ret.sptk.many rp
    5.65 -END(__ia64_syscall)
    5.66 +END(prefetch_stack)
    5.67  
    5.68  GLOBAL_ENTRY(execve)
    5.69  	mov r15=__NR_execve			// put syscall number in place
    5.70 @@ -640,7 +651,7 @@ END(ia64_ret_from_syscall)
    5.71   *	      r8-r11: restored (syscall return value(s))
    5.72   *		 r12: restored (user-level stack pointer)
    5.73   *		 r13: restored (user-level thread pointer)
    5.74 - *		 r14: cleared
    5.75 + *		 r14: set to __kernel_syscall_via_epc
    5.76   *		 r15: restored (syscall #)
    5.77   *	     r16-r17: cleared
    5.78   *		 r18: user-level b6
    5.79 @@ -661,7 +672,7 @@ END(ia64_ret_from_syscall)
    5.80   *		  pr: restored (user-level pr)
    5.81   *		  b0: restored (user-level rp)
    5.82   *	          b6: restored
    5.83 - *		  b7: cleared
    5.84 + *		  b7: set to __kernel_syscall_via_epc
    5.85   *	     ar.unat: restored (user-level ar.unat)
    5.86   *	      ar.pfs: restored (user-level ar.pfs)
    5.87   *	      ar.rsc: restored (user-level ar.rsc)
    5.88 @@ -707,72 +718,79 @@ GLOBAL_ENTRY(__ia64_leave_syscall)
    5.89  	;;
    5.90  (p6)	ld4 r31=[r18]				// load current_thread_info()->flags
    5.91  	ld8 r19=[r2],PT(B6)-PT(LOADRS)		// load ar.rsc value for "loadrs"
    5.92 -	mov b7=r0		// clear b7
    5.93 +	nop.i 0
    5.94  	;;
    5.95 -	ld8 r23=[r3],PT(R11)-PT(AR_BSPSTORE)	// load ar.bspstore (may be garbage)
    5.96 +	mov r16=ar.bsp				// M2  get existing backing store pointer
    5.97  	ld8 r18=[r2],PT(R9)-PT(B6)		// load b6
    5.98  (p6)	and r15=TIF_WORK_MASK,r31		// any work other than TIF_SYSCALL_TRACE?
    5.99  	;;
   5.100 -	mov r16=ar.bsp				// M2  get existing backing store pointer
   5.101 +	ld8 r23=[r3],PT(R11)-PT(AR_BSPSTORE)	// load ar.bspstore (may be garbage)
   5.102  (p6)	cmp4.ne.unc p6,p0=r15, r0		// any special work pending?
   5.103  (p6)	br.cond.spnt .work_pending_syscall
   5.104  	;;
   5.105  	// start restoring the state saved on the kernel stack (struct pt_regs):
   5.106  	ld8 r9=[r2],PT(CR_IPSR)-PT(R9)
   5.107  	ld8 r11=[r3],PT(CR_IIP)-PT(R11)
   5.108 -	mov f6=f0		// clear f6
   5.109 +(pNonSys) break 0		//      bug check: we shouldn't be here if pNonSys is TRUE!
   5.110  	;;
   5.111  	invala			// M0|1 invalidate ALAT
   5.112 -	rsm psr.i | psr.ic	// M2 initiate turning off of interrupt and interruption collection
   5.113 -	mov f9=f0		// clear f9
   5.114 +	rsm psr.i | psr.ic	// M2   turn off interrupts and interruption collection
   5.115 +	cmp.eq p9,p0=r0,r0	// A    set p9 to indicate that we should restore cr.ifs
   5.116  
   5.117 -	ld8 r29=[r2],16		// load cr.ipsr
   5.118 -	ld8 r28=[r3],16			// load cr.iip
   5.119 -	mov f8=f0		// clear f8
   5.120 +	ld8 r29=[r2],16		// M0|1 load cr.ipsr
   5.121 +	ld8 r28=[r3],16		// M0|1 load cr.iip
   5.122 +	mov r22=r0		// A    clear r22
   5.123  	;;
   5.124  	ld8 r30=[r2],16		// M0|1 load cr.ifs
   5.125  	ld8 r25=[r3],16		// M0|1 load ar.unat
   5.126 -	cmp.eq p9,p0=r0,r0	// set p9 to indicate that we should restore cr.ifs
   5.127 -	;;
   5.128 -	ld8 r26=[r2],PT(B0)-PT(AR_PFS)	// M0|1 load ar.pfs
   5.129 -(pKStk)	mov r22=psr		// M2 read PSR now that interrupts are disabled
   5.130 -	mov f10=f0		// clear f10
   5.131 -	;;
   5.132 -	ld8 r21=[r2],PT(AR_RNAT)-PT(B0) // load b0
   5.133 -	ld8 r27=[r3],PT(PR)-PT(AR_RSC)	// load ar.rsc
   5.134 -	mov f11=f0		// clear f11
   5.135 -	;;
   5.136 -	ld8 r24=[r2],PT(AR_FPSR)-PT(AR_RNAT)	// load ar.rnat (may be garbage)
   5.137 -	ld8 r31=[r3],PT(R1)-PT(PR)		// load predicates
   5.138  (pUStk) add r14=IA64_TASK_THREAD_ON_USTACK_OFFSET,r13
   5.139  	;;
   5.140 -	ld8 r20=[r2],PT(R12)-PT(AR_FPSR)	// load ar.fpsr
   5.141 -	ld8.fill r1=[r3],16	// load r1
   5.142 -(pUStk) mov r17=1
   5.143 +	ld8 r26=[r2],PT(B0)-PT(AR_PFS)	// M0|1 load ar.pfs
   5.144 +(pKStk)	mov r22=psr			// M2   read PSR now that interrupts are disabled
   5.145 +	nop 0
   5.146  	;;
   5.147 -	srlz.d			// M0  ensure interruption collection is off
   5.148 -	ld8.fill r13=[r3],16
   5.149 -	mov f7=f0		// clear f7
   5.150 +	ld8 r21=[r2],PT(AR_RNAT)-PT(B0) // M0|1 load b0
   5.151 +	ld8 r27=[r3],PT(PR)-PT(AR_RSC)	// M0|1 load ar.rsc
   5.152 +	mov f6=f0			// F    clear f6
   5.153  	;;
   5.154 -	ld8.fill r12=[r2]	// restore r12 (sp)
   5.155 -	mov.m ar.ssd=r0		// M2 clear ar.ssd
   5.156 -	mov r22=r0		// clear r22
   5.157 +	ld8 r24=[r2],PT(AR_FPSR)-PT(AR_RNAT)	// M0|1 load ar.rnat (may be garbage)
   5.158 +	ld8 r31=[r3],PT(R1)-PT(PR)		// M0|1 load predicates
   5.159 +	mov f7=f0				// F    clear f7
   5.160 +	;;
   5.161 +	ld8 r20=[r2],PT(R12)-PT(AR_FPSR)	// M0|1 load ar.fpsr
   5.162 +	ld8.fill r1=[r3],16			// M0|1 load r1
   5.163 +(pUStk) mov r17=1				// A
   5.164 +	;;
   5.165 +(pUStk) st1 [r14]=r17				// M2|3
   5.166 +	ld8.fill r13=[r3],16			// M0|1
   5.167 +	mov f8=f0				// F    clear f8
   5.168 +	;;
   5.169 +	ld8.fill r12=[r2]			// M0|1 restore r12 (sp)
   5.170 +	ld8.fill r15=[r3]			// M0|1 restore r15
   5.171 +	mov b6=r18				// I0   restore b6
   5.172  
   5.173 -	ld8.fill r15=[r3]	// restore r15
   5.174 -(pUStk) st1 [r14]=r17
   5.175 -	addl r3=THIS_CPU(ia64_phys_stacked_size_p8),r0
   5.176 +	addl r17=THIS_CPU(ia64_phys_stacked_size_p8),r0 // A
   5.177 +	mov f9=f0					// F    clear f9
   5.178 +(pKStk) br.cond.dpnt.many skip_rbs_switch		// B
   5.179 +
   5.180 +	srlz.d				// M0   ensure interruption collection is off (for cover)
   5.181 +	shr.u r18=r19,16		// I0|1 get byte size of existing "dirty" partition
   5.182 +	cover				// B    add current frame into dirty partition & set cr.ifs
   5.183  	;;
   5.184 -(pUStk)	ld4 r17=[r3]		// r17 = cpu_data->phys_stacked_size_p8
   5.185 -	mov.m ar.csd=r0		// M2 clear ar.csd
   5.186 -	mov b6=r18		// I0  restore b6
   5.187 +(pUStk) ld4 r17=[r17]			// M0|1 r17 = cpu_data->phys_stacked_size_p8
   5.188 +	mov r19=ar.bsp			// M2   get new backing store pointer
   5.189 +	mov f10=f0			// F    clear f10
   5.190 +
   5.191 +	nop.m 0
   5.192 +	movl r14=__kernel_syscall_via_epc // X
   5.193  	;;
   5.194 -	mov r14=r0		// clear r14
   5.195 -	shr.u r18=r19,16	// I0|1 get byte size of existing "dirty" partition
   5.196 -(pKStk) br.cond.dpnt.many skip_rbs_switch
   5.197 +	mov.m ar.csd=r0			// M2   clear ar.csd
   5.198 +	mov.m ar.ccv=r0			// M2   clear ar.ccv
   5.199 +	mov b7=r14			// I0   clear b7 (hint with __kernel_syscall_via_epc)
   5.200  
   5.201 -	mov.m ar.ccv=r0		// clear ar.ccv
   5.202 -(pNonSys) br.cond.dpnt.many dont_preserve_current_frame
   5.203 -	br.cond.sptk.many rbs_switch
   5.204 +	mov.m ar.ssd=r0			// M2   clear ar.ssd
   5.205 +	mov f11=f0			// F    clear f11
   5.206 +	br.cond.sptk.many rbs_switch	// B
   5.207  END(__ia64_leave_syscall)
   5.208  
   5.209  #ifdef CONFIG_IA32_SUPPORT
   5.210 @@ -891,7 +909,7 @@ GLOBAL_ENTRY(__ia64_leave_kernel)
   5.211  	ldf.fill f7=[r2],PT(F11)-PT(F7)
   5.212  	ldf.fill f8=[r3],32
   5.213  	;;
   5.214 -	srlz.i			// ensure interruption collection is off
   5.215 +	srlz.d	// ensure that inter. collection is off (VHPT is don't care, since text is pinned)
   5.216  	mov ar.ccv=r15
   5.217  	;;
   5.218  	ldf.fill f11=[r2]
   5.219 @@ -951,11 +969,10 @@ GLOBAL_ENTRY(__ia64_leave_kernel)
   5.220  	 * NOTE: alloc, loadrs, and cover can't be predicated.
   5.221  	 */
   5.222  (pNonSys) br.cond.dpnt dont_preserve_current_frame
   5.223 -
   5.224 -rbs_switch:
   5.225  	cover				// add current frame into dirty partition and set cr.ifs
   5.226  	;;
   5.227  	mov r19=ar.bsp			// get new backing store pointer
   5.228 +rbs_switch:
   5.229  	sub r16=r16,r18			// krbs = old bsp - size of dirty partition
   5.230  	cmp.ne p9,p0=r0,r0		// clear p9 to skip restore of cr.ifs
   5.231  	;;
   5.232 @@ -1030,14 +1047,14 @@ rse_clear_invalid:
   5.233  	mov loc5=0
   5.234  	mov loc6=0
   5.235  	mov loc7=0
   5.236 -(pRecurse) br.call.sptk.few b0=rse_clear_invalid
   5.237 +(pRecurse) br.call.dptk.few b0=rse_clear_invalid
   5.238  	;;
   5.239  	mov loc8=0
   5.240  	mov loc9=0
   5.241  	cmp.ne pReturn,p0=r0,in1	// if recursion count != 0, we need to do a br.ret
   5.242  	mov loc10=0
   5.243  	mov loc11=0
   5.244 -(pReturn) br.ret.sptk.many b0
   5.245 +(pReturn) br.ret.dptk.many b0
   5.246  #endif /* !CONFIG_ITANIUM */
   5.247  #	undef pRecurse
   5.248  #	undef pReturn
   5.249 @@ -1261,7 +1278,7 @@ ENTRY(sys_rt_sigreturn)
   5.250   	stf.spill [r17]=f11
   5.251  	adds out0=16,sp				// out0 = &sigscratch
   5.252  	br.call.sptk.many rp=ia64_rt_sigreturn
   5.253 -.ret19:	.restore sp 0
   5.254 +.ret19:	.restore sp,0
   5.255  	adds sp=16,sp
   5.256  	;;
   5.257  	ld8 r9=[sp]				// load new ar.unat
   5.258 @@ -1583,11 +1600,11 @@ sys_call_table:
   5.259  	data8 sys_add_key
   5.260  	data8 sys_request_key
   5.261  	data8 sys_keyctl
   5.262 -	data8 sys_ni_syscall
   5.263 -	data8 sys_ni_syscall			// 1275
   5.264 +	data8 sys_ioprio_set
   5.265 +	data8 sys_ioprio_get			// 1275
   5.266  	data8 sys_ni_syscall
   5.267 -	data8 sys_ni_syscall
   5.268 -	data8 sys_ni_syscall
   5.269 -	data8 sys_ni_syscall
   5.270 +	data8 sys_inotify_init
   5.271 +	data8 sys_inotify_add_watch
   5.272 +	data8 sys_inotify_rm_watch
   5.273  
   5.274  	.org sys_call_table + 8*NR_syscalls	// guard against failures to increase NR_syscalls
     6.1 --- a/linux-2.6-xen-sparse/arch/ia64/kernel/head.S	Wed Feb 01 14:27:35 2006 -0700
     6.2 +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/head.S	Thu Feb 02 10:59:20 2006 +0000
     6.3 @@ -25,7 +25,7 @@
     6.4  #include <asm/fpu.h>
     6.5  #include <asm/kregs.h>
     6.6  #include <asm/mmu_context.h>
     6.7 -#include <asm/offsets.h>
     6.8 +#include <asm/asm-offsets.h>
     6.9  #include <asm/pal.h>
    6.10  #include <asm/pgtable.h>
    6.11  #include <asm/processor.h>
     7.1 --- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c	Wed Feb 01 14:27:35 2006 -0700
     7.2 +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c	Thu Feb 02 10:59:20 2006 +0000
     7.3 @@ -20,6 +20,7 @@
     7.4   * 02/01/00 R.Seth	fixed get_cpuinfo for SMP
     7.5   * 01/07/99 S.Eranian	added the support for command line argument
     7.6   * 06/24/99 W.Drummond	added boot_cpu_data.
     7.7 + * 05/28/05 Z. Menyhart	Dynamic stride size for "flush_icache_range()"
     7.8   */
     7.9  #include <linux/config.h>
    7.10  #include <linux/module.h>
    7.11 @@ -40,6 +41,8 @@
    7.12  #include <linux/serial_core.h>
    7.13  #include <linux/efi.h>
    7.14  #include <linux/initrd.h>
    7.15 +#include <linux/platform.h>
    7.16 +#include <linux/pm.h>
    7.17  
    7.18  #include <asm/ia32.h>
    7.19  #include <asm/machvec.h>
    7.20 @@ -72,8 +75,30 @@ DEFINE_PER_CPU(unsigned long, ia64_phys_
    7.21  unsigned long ia64_cycles_per_usec;
    7.22  struct ia64_boot_param *ia64_boot_param;
    7.23  struct screen_info screen_info;
    7.24 +unsigned long vga_console_iobase;
    7.25 +unsigned long vga_console_membase;
    7.26 +
    7.27 +static struct resource data_resource = {
    7.28 +	.name	= "Kernel data",
    7.29 +	.flags	= IORESOURCE_BUSY | IORESOURCE_MEM
    7.30 +};
    7.31 +
    7.32 +static struct resource code_resource = {
    7.33 +	.name	= "Kernel code",
    7.34 +	.flags	= IORESOURCE_BUSY | IORESOURCE_MEM
    7.35 +};
    7.36 +extern void efi_initialize_iomem_resources(struct resource *,
    7.37 +		struct resource *);
    7.38 +extern char _text[], _end[], _etext[];
    7.39  
    7.40  unsigned long ia64_max_cacheline_size;
    7.41 +
    7.42 +int dma_get_cache_alignment(void)
    7.43 +{
    7.44 +        return ia64_max_cacheline_size;
    7.45 +}
    7.46 +EXPORT_SYMBOL(dma_get_cache_alignment);
    7.47 +
    7.48  unsigned long ia64_iobase;	/* virtual address for I/O accesses */
    7.49  EXPORT_SYMBOL(ia64_iobase);
    7.50  struct io_space io_space[MAX_IO_SPACES];
    7.51 @@ -81,6 +106,13 @@ EXPORT_SYMBOL(io_space);
    7.52  unsigned int num_io_spaces;
    7.53  
    7.54  /*
    7.55 + * "flush_icache_range()" needs to know what processor dependent stride size to use
    7.56 + * when it makes i-cache(s) coherent with d-caches.
    7.57 + */
    7.58 +#define	I_CACHE_STRIDE_SHIFT	5	/* Safest way to go: 32 bytes by 32 bytes */
    7.59 +unsigned long ia64_i_cache_stride_shift = ~0;
    7.60 +
    7.61 +/*
    7.62   * The merge_mask variable needs to be set to (max(iommu_page_size(iommu)) - 1).  This
    7.63   * mask specifies a mask of address bits that must be 0 in order for two buffers to be
    7.64   * mergeable by the I/O MMU (i.e., the end address of the first buffer and the start
    7.65 @@ -159,6 +191,22 @@ sort_regions (struct rsvd_region *rsvd_r
    7.66  	}
    7.67  }
    7.68  
    7.69 +/*
    7.70 + * Request address space for all standard resources
    7.71 + */
    7.72 +static int __init register_memory(void)
    7.73 +{
    7.74 +	code_resource.start = ia64_tpa(_text);
    7.75 +	code_resource.end   = ia64_tpa(_etext) - 1;
    7.76 +	data_resource.start = ia64_tpa(_etext);
    7.77 +	data_resource.end   = ia64_tpa(_end) - 1;
    7.78 +	efi_initialize_iomem_resources(&code_resource, &data_resource);
    7.79 +
    7.80 +	return 0;
    7.81 +}
    7.82 +
    7.83 +__initcall(register_memory);
    7.84 +
    7.85  /**
    7.86   * reserve_memory - setup reserved memory areas
    7.87   *
    7.88 @@ -199,6 +247,9 @@ reserve_memory (void)
    7.89  	}
    7.90  #endif
    7.91  
    7.92 +	efi_memmap_init(&rsvd_region[n].start, &rsvd_region[n].end);
    7.93 +	n++;
    7.94 +
    7.95  	/* end of memory marker */
    7.96  	rsvd_region[n].start = ~0UL;
    7.97  	rsvd_region[n].end   = ~0UL;
    7.98 @@ -232,28 +283,31 @@ find_initrd (void)
    7.99  static void __init
   7.100  io_port_init (void)
   7.101  {
   7.102 -	extern unsigned long ia64_iobase;
   7.103  	unsigned long phys_iobase;
   7.104  
   7.105  	/*
   7.106 -	 *  Set `iobase' to the appropriate address in region 6 (uncached access range).
   7.107 +	 * Set `iobase' based on the EFI memory map or, failing that, the
   7.108 +	 * value firmware left in ar.k0.
   7.109  	 *
   7.110 -	 *  The EFI memory map is the "preferred" location to get the I/O port space base,
   7.111 -	 *  rather the relying on AR.KR0. This should become more clear in future SAL
   7.112 -	 *  specs. We'll fall back to getting it out of AR.KR0 if no appropriate entry is
   7.113 -	 *  found in the memory map.
   7.114 +	 * Note that in ia32 mode, IN/OUT instructions use ar.k0 to compute
   7.115 +	 * the port's virtual address, so ia32_load_state() loads it with a
   7.116 +	 * user virtual address.  But in ia64 mode, glibc uses the
   7.117 +	 * *physical* address in ar.k0 to mmap the appropriate area from
   7.118 +	 * /dev/mem, and the inX()/outX() interfaces use MMIO.  In both
   7.119 +	 * cases, user-mode can only use the legacy 0-64K I/O port space.
   7.120 +	 *
   7.121 +	 * ar.k0 is not involved in kernel I/O port accesses, which can use
   7.122 +	 * any of the I/O port spaces and are done via MMIO using the
   7.123 +	 * virtual mmio_base from the appropriate io_space[].
   7.124  	 */
   7.125  	phys_iobase = efi_get_iobase();
   7.126 -	if (phys_iobase)
   7.127 -		/* set AR.KR0 since this is all we use it for anyway */
   7.128 -		ia64_set_kr(IA64_KR_IO_BASE, phys_iobase);
   7.129 -	else {
   7.130 +	if (!phys_iobase) {
   7.131  		phys_iobase = ia64_get_kr(IA64_KR_IO_BASE);
   7.132 -		printk(KERN_INFO "No I/O port range found in EFI memory map, falling back "
   7.133 -		       "to AR.KR0\n");
   7.134 -		printk(KERN_INFO "I/O port base = 0x%lx\n", phys_iobase);
   7.135 +		printk(KERN_INFO "No I/O port range found in EFI memory map, "
   7.136 +			"falling back to AR.KR0 (0x%lx)\n", phys_iobase);
   7.137  	}
   7.138  	ia64_iobase = (unsigned long) ioremap(phys_iobase, 0);
   7.139 +	ia64_set_kr(IA64_KR_IO_BASE, __pa(ia64_iobase));
   7.140  
   7.141  	/* setup legacy IO port space */
   7.142  	io_space[0].mmio_base = ia64_iobase;
   7.143 @@ -273,26 +327,29 @@ io_port_init (void)
   7.144  static inline int __init
   7.145  early_console_setup (char *cmdline)
   7.146  {
   7.147 +	int earlycons = 0;
   7.148 +
   7.149  #ifdef CONFIG_XEN
   7.150 -	if (!early_xen_console_setup(cmdline)) return 0;
   7.151 +	if (!early_xen_console_setup(cmdline))
   7.152 +		earlycons++;
   7.153  #endif
   7.154  #ifdef CONFIG_SERIAL_SGI_L1_CONSOLE
   7.155  	{
   7.156  		extern int sn_serial_console_early_setup(void);
   7.157  		if (!sn_serial_console_early_setup())
   7.158 -			return 0;
   7.159 +			earlycons++;
   7.160  	}
   7.161  #endif
   7.162  #ifdef CONFIG_EFI_PCDP
   7.163  	if (!efi_setup_pcdp_console(cmdline))
   7.164 -		return 0;
   7.165 +		earlycons++;
   7.166  #endif
   7.167  #ifdef CONFIG_SERIAL_8250_CONSOLE
   7.168  	if (!early_serial_console_init(cmdline))
   7.169 -		return 0;
   7.170 +		earlycons++;
   7.171  #endif
   7.172  
   7.173 -	return -1;
   7.174 +	return (earlycons) ? 0 : -1;
   7.175  }
   7.176  
   7.177  static inline void
   7.178 @@ -373,7 +430,7 @@ setup_arch (char **cmdline_p)
   7.179  	if (early_console_setup(*cmdline_p) == 0)
   7.180  		mark_bsp_online();
   7.181  
   7.182 -#ifdef CONFIG_ACPI_BOOT
   7.183 +#ifdef CONFIG_ACPI
   7.184  	/* Initialize the ACPI boot-time table parser */
   7.185  	acpi_table_init();
   7.186  # ifdef CONFIG_ACPI_NUMA
   7.187 @@ -408,8 +465,9 @@ setup_arch (char **cmdline_p)
   7.188  #endif
   7.189  
   7.190  	cpu_init();	/* initialize the bootstrap CPU */
   7.191 +	mmu_context_init();	/* initialize context_id bitmap */
   7.192  
   7.193 -#ifdef CONFIG_ACPI_BOOT
   7.194 +#ifdef CONFIG_ACPI
   7.195  	acpi_boot_init();
   7.196  #endif
   7.197  
   7.198 @@ -515,7 +573,7 @@ show_cpuinfo (struct seq_file *m, void *
   7.199  		   c->itc_freq / 1000000, c->itc_freq % 1000000,
   7.200  		   lpj*HZ/500000, (lpj*HZ/5000) % 100);
   7.201  #ifdef CONFIG_SMP
   7.202 -	seq_printf(m, "siblings   : %u\n", c->num_log);
   7.203 +	seq_printf(m, "siblings   : %u\n", cpus_weight(cpu_core_map[cpunum]));
   7.204  	if (c->threads_per_core > 1 || c->cores_per_socket > 1)
   7.205  		seq_printf(m,
   7.206  		   	   "physical id: %u\n"
   7.207 @@ -625,6 +683,12 @@ setup_per_cpu_areas (void)
   7.208  	/* start_kernel() requires this... */
   7.209  }
   7.210  
   7.211 +/*
   7.212 + * Calculate the max. cache line size.
   7.213 + *
   7.214 + * In addition, the minimum of the i-cache stride sizes is calculated for
   7.215 + * "flush_icache_range()".
   7.216 + */
   7.217  static void
   7.218  get_max_cacheline_size (void)
   7.219  {
   7.220 @@ -638,6 +702,8 @@ get_max_cacheline_size (void)
   7.221                  printk(KERN_ERR "%s: ia64_pal_cache_summary() failed (status=%ld)\n",
   7.222                         __FUNCTION__, status);
   7.223                  max = SMP_CACHE_BYTES;
   7.224 +		/* Safest setup for "flush_icache_range()" */
   7.225 +		ia64_i_cache_stride_shift = I_CACHE_STRIDE_SHIFT;
   7.226  		goto out;
   7.227          }
   7.228  
   7.229 @@ -646,14 +712,31 @@ get_max_cacheline_size (void)
   7.230  						    &cci);
   7.231  		if (status != 0) {
   7.232  			printk(KERN_ERR
   7.233 -			       "%s: ia64_pal_cache_config_info(l=%lu) failed (status=%ld)\n",
   7.234 +			       "%s: ia64_pal_cache_config_info(l=%lu, 2) failed (status=%ld)\n",
   7.235  			       __FUNCTION__, l, status);
   7.236  			max = SMP_CACHE_BYTES;
   7.237 +			/* The safest setup for "flush_icache_range()" */
   7.238 +			cci.pcci_stride = I_CACHE_STRIDE_SHIFT;
   7.239 +			cci.pcci_unified = 1;
   7.240  		}
   7.241  		line_size = 1 << cci.pcci_line_size;
   7.242  		if (line_size > max)
   7.243  			max = line_size;
   7.244 -        }
   7.245 +		if (!cci.pcci_unified) {
   7.246 +			status = ia64_pal_cache_config_info(l,
   7.247 +						    /* cache_type (instruction)= */ 1,
   7.248 +						    &cci);
   7.249 +			if (status != 0) {
   7.250 +				printk(KERN_ERR
   7.251 +				"%s: ia64_pal_cache_config_info(l=%lu, 1) failed (status=%ld)\n",
   7.252 +					__FUNCTION__, l, status);
   7.253 +				/* The safest setup for "flush_icache_range()" */
   7.254 +				cci.pcci_stride = I_CACHE_STRIDE_SHIFT;
   7.255 +			}
   7.256 +		}
   7.257 +		if (cci.pcci_stride < ia64_i_cache_stride_shift)
   7.258 +			ia64_i_cache_stride_shift = cci.pcci_stride;
   7.259 +	}
   7.260    out:
   7.261  	if (max > ia64_max_cacheline_size)
   7.262  		ia64_max_cacheline_size = max;
   7.263 @@ -782,6 +865,7 @@ cpu_init (void)
   7.264  	/* size of physical stacked register partition plus 8 bytes: */
   7.265  	__get_cpu_var(ia64_phys_stacked_size_p8) = num_phys_stacked*8 + 8;
   7.266  	platform_cpu_init();
   7.267 +	pm_idle = default_idle;
   7.268  }
   7.269  
   7.270  void
     8.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen/xenentry.S	Wed Feb 01 14:27:35 2006 -0700
     8.2 +++ b/linux-2.6-xen-sparse/arch/ia64/xen/xenentry.S	Thu Feb 02 10:59:20 2006 +0000
     8.3 @@ -14,7 +14,7 @@
     8.4  #include <asm/cache.h>
     8.5  #include <asm/errno.h>
     8.6  #include <asm/kregs.h>
     8.7 -#include <asm/offsets.h>
     8.8 +#include <asm/asm-offsets.h>
     8.9  #include <asm/pgtable.h>
    8.10  #include <asm/percpu.h>
    8.11  #include <asm/processor.h>
     9.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen/xenivt.S	Wed Feb 01 14:27:35 2006 -0700
     9.2 +++ b/linux-2.6-xen-sparse/arch/ia64/xen/xenivt.S	Thu Feb 02 10:59:20 2006 +0000
     9.3 @@ -35,7 +35,7 @@
     9.4  #include <asm/break.h>
     9.5  #include <asm/ia32.h>
     9.6  #include <asm/kregs.h>
     9.7 -#include <asm/offsets.h>
     9.8 +#include <asm/asm-offsets.h>
     9.9  #include <asm/pgtable.h>
    9.10  #include <asm/processor.h>
    9.11  #include <asm/ptrace.h>
    10.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/pal.h	Wed Feb 01 14:27:35 2006 -0700
    10.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/pal.h	Thu Feb 02 10:59:20 2006 +0000
    10.3 @@ -75,6 +75,8 @@
    10.4  #define PAL_CACHE_READ		259	/* read tag & data of cacheline for diagnostic testing */
    10.5  #define PAL_CACHE_WRITE		260	/* write tag & data of cacheline for diagnostic testing */
    10.6  #define PAL_VM_TR_READ		261	/* read contents of translation register */
    10.7 +#define PAL_GET_PSTATE		262	/* get the current P-state */
    10.8 +#define PAL_SET_PSTATE		263	/* set the P-state */
    10.9  
   10.10  #ifndef __ASSEMBLY__
   10.11  
   10.12 @@ -1112,6 +1114,25 @@ ia64_pal_halt_info (pal_power_mgmt_info_
   10.13  	return iprv.status;
   10.14  }
   10.15  
   10.16 +/* Get the current P-state information */
   10.17 +static inline s64
   10.18 +ia64_pal_get_pstate (u64 *pstate_index)
   10.19 +{
   10.20 +	struct ia64_pal_retval iprv;
   10.21 +	PAL_CALL_STK(iprv, PAL_GET_PSTATE, 0, 0, 0);
   10.22 +	*pstate_index = iprv.v0;
   10.23 +	return iprv.status;
   10.24 +}
   10.25 +
   10.26 +/* Set the P-state */
   10.27 +static inline s64
   10.28 +ia64_pal_set_pstate (u64 pstate_index)
   10.29 +{
   10.30 +	struct ia64_pal_retval iprv;
   10.31 +	PAL_CALL_STK(iprv, PAL_SET_PSTATE, pstate_index, 0, 0);
   10.32 +	return iprv.status;
   10.33 +}
   10.34 +
   10.35  /* Cause the processor to enter LIGHT HALT state, where prefetching and execution are
   10.36   * suspended, but cache and TLB coherency is maintained.
   10.37   */
    11.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/processor.h	Wed Feb 01 14:27:35 2006 -0700
    11.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/processor.h	Thu Feb 02 10:59:20 2006 +0000
    11.3 @@ -21,9 +21,6 @@
    11.4  #include <asm/ustack.h>
    11.5  #include <asm/privop.h>
    11.6  
    11.7 -/* Our arch specific arch_init_sched_domain is in arch/ia64/kernel/domain.c */
    11.8 -#define ARCH_HAS_SCHED_DOMAIN
    11.9 -
   11.10  #define IA64_NUM_DBG_REGS	8
   11.11  /*
   11.12   * Limits for PMC and PMD are set to less than maximum architected values
    12.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/system.h	Wed Feb 01 14:27:35 2006 -0700
    12.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/system.h	Thu Feb 02 10:59:20 2006 +0000
    12.3 @@ -19,12 +19,13 @@
    12.4  #include <asm/pal.h>
    12.5  #include <asm/percpu.h>
    12.6  
    12.7 -#define GATE_ADDR		__IA64_UL_CONST(0xa000000000000000)
    12.8 +#define GATE_ADDR		RGN_BASE(RGN_GATE)
    12.9 +
   12.10  /*
   12.11   * 0xa000000000000000+2*PERCPU_PAGE_SIZE
   12.12   * - 0xa000000000000000+3*PERCPU_PAGE_SIZE remain unmapped (guard page)
   12.13   */
   12.14 -#define KERNEL_START		 __IA64_UL_CONST(0xa000000100000000)
   12.15 +#define KERNEL_START		 (GATE_ADDR+0x100000000)
   12.16  #define PERCPU_ADDR		(-PERCPU_PAGE_SIZE)
   12.17  
   12.18  #ifndef __ASSEMBLY__
   12.19 @@ -183,8 +184,6 @@ do {								\
   12.20  
   12.21  #ifdef __KERNEL__
   12.22  
   12.23 -#define prepare_to_switch()    do { } while(0)
   12.24 -
   12.25  #ifdef CONFIG_IA32_SUPPORT
   12.26  # define IS_IA32_PROCESS(regs)	(ia64_psr(regs)->is != 0)
   12.27  #else
   12.28 @@ -274,14 +273,9 @@ extern void ia64_load_extra (struct task
   12.29   * of that CPU which will not be released, because there we wait for the
   12.30   * tasklist_lock to become available.
   12.31   */
   12.32 -#define prepare_arch_switch(rq, next)		\
   12.33 -do {						\
   12.34 -	spin_lock(&(next)->switch_lock);	\
   12.35 -	spin_unlock(&(rq)->lock);		\
   12.36 -} while (0)
   12.37 -#define finish_arch_switch(rq, prev)	spin_unlock_irq(&(prev)->switch_lock)
   12.38 -#define task_running(rq, p) 		((rq)->curr == (p) || spin_is_locked(&(p)->switch_lock))
   12.39 +#define __ARCH_WANT_UNLOCKED_CTXSW
   12.40  
   12.41 +#define ARCH_HAS_PREFETCH_SWITCH_STACK
   12.42  #define ia64_platform_is(x) (strcmp(x, platform_name) == 0)
   12.43  
   12.44  void cpu_idle_wait(void);
    13.1 --- a/linux-2.6-xen-sparse/lib/Makefile	Wed Feb 01 14:27:35 2006 -0700
    13.2 +++ b/linux-2.6-xen-sparse/lib/Makefile	Thu Feb 02 10:59:20 2006 +0000
    13.3 @@ -44,7 +44,9 @@ obj-$(CONFIG_TEXTSEARCH_KMP) += ts_kmp.o
    13.4  obj-$(CONFIG_TEXTSEARCH_BM) += ts_bm.o
    13.5  obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o
    13.6  
    13.7 -ifneq ($(CONFIG_XEN),y)
    13.8 +ifeq ($(CONFIG_IA64),y)
    13.9 +obj-$(CONFIG_SWIOTLB) += swiotlb.o
   13.10 +else ifneq ($(CONFIG_XEN),y)
   13.11  obj-$(CONFIG_SWIOTLB) += swiotlb.o
   13.12  endif
   13.13