ia64/xen-unstable

changeset 8769:17b5d5cca484

Update ia64 to 2.6.16-rc2.
This boots dom0 and domU on an rx2600.
Revert several files that were accidentally reverted by the merge-ups
(that weren't fixed by cset 8743). Those are included here with the
2.6.15 patch re-applied as well as changes between 2.6.15 and 2.6.16-rc2.
Specifically, these are pal.h, processor.h and system.h.
This patch also reverts changes to include/asm-ia64/hypercall.h and
hypervisor.h from cset 8742.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
author cl349@firebug.cl.cam.ac.uk
date Mon Feb 06 18:02:36 2006 +0000 (2006-02-06)
parents 5a37d91b1587
children f030f4b565a5
files buildconfigs/linux-defconfig_xen0_ia64 buildconfigs/linux-defconfig_xenU_ia64 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/include/asm-ia64/hypercall.h linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h 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
line diff
     1.1 --- a/buildconfigs/linux-defconfig_xen0_ia64	Mon Feb 06 16:48:34 2006 +0000
     1.2 +++ b/buildconfigs/linux-defconfig_xen0_ia64	Mon Feb 06 18:02:36 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.15-xen0
     1.7 -# Wed Feb  1 13:18:15 2006
     1.8 +# Linux kernel version: 2.6.16-rc2-xen0
     1.9 +# Mon Feb  6 02:48:43 2006
    1.10  #
    1.11  
    1.12  #
    1.13 @@ -24,8 +24,6 @@ CONFIG_BSD_PROCESS_ACCT=y
    1.14  # CONFIG_BSD_PROCESS_ACCT_V3 is not set
    1.15  CONFIG_SYSCTL=y
    1.16  # CONFIG_AUDIT is not set
    1.17 -CONFIG_HOTPLUG=y
    1.18 -CONFIG_KOBJECT_UEVENT=y
    1.19  CONFIG_IKCONFIG=y
    1.20  CONFIG_IKCONFIG_PROC=y
    1.21  # CONFIG_CPUSETS is not set
    1.22 @@ -35,8 +33,10 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
    1.23  CONFIG_KALLSYMS=y
    1.24  CONFIG_KALLSYMS_ALL=y
    1.25  CONFIG_KALLSYMS_EXTRA_PASS=y
    1.26 +CONFIG_HOTPLUG=y
    1.27  CONFIG_PRINTK=y
    1.28  CONFIG_BUG=y
    1.29 +CONFIG_ELF_CORE=y
    1.30  CONFIG_BASE_FULL=y
    1.31  CONFIG_FUTEX=y
    1.32  CONFIG_EPOLL=y
    1.33 @@ -45,8 +45,10 @@ CONFIG_CC_ALIGN_FUNCTIONS=0
    1.34  CONFIG_CC_ALIGN_LABELS=0
    1.35  CONFIG_CC_ALIGN_LOOPS=0
    1.36  CONFIG_CC_ALIGN_JUMPS=0
    1.37 +CONFIG_SLAB=y
    1.38  # CONFIG_TINY_SHMEM is not set
    1.39  CONFIG_BASE_SMALL=0
    1.40 +# CONFIG_SLOB is not set
    1.41  
    1.42  #
    1.43  # Loadable module support
    1.44 @@ -170,6 +172,7 @@ CONFIG_ACPI_HOTPLUG_CPU=y
    1.45  CONFIG_ACPI_THERMAL=y
    1.46  CONFIG_ACPI_BLACKLIST_YEAR=0
    1.47  # CONFIG_ACPI_DEBUG is not set
    1.48 +CONFIG_ACPI_EC=y
    1.49  CONFIG_ACPI_POWER=y
    1.50  CONFIG_ACPI_SYSTEM=y
    1.51  CONFIG_ACPI_CONTAINER=y
    1.52 @@ -247,16 +250,13 @@ CONFIG_BRIDGE_NETFILTER=y
    1.53  #
    1.54  # CONFIG_NETFILTER_NETLINK is not set
    1.55  # CONFIG_NF_CONNTRACK is not set
    1.56 +# CONFIG_NETFILTER_XTABLES is not set
    1.57  
    1.58  #
    1.59  # IP: Netfilter Configuration
    1.60  #
    1.61  # CONFIG_IP_NF_CONNTRACK is not set
    1.62  # CONFIG_IP_NF_QUEUE is not set
    1.63 -# CONFIG_IP_NF_IPTABLES is not set
    1.64 -CONFIG_IP_NF_ARPTABLES=y
    1.65 -# CONFIG_IP_NF_ARPFILTER is not set
    1.66 -# CONFIG_IP_NF_ARP_MANGLE is not set
    1.67  
    1.68  #
    1.69  # Bridge: Netfilter Configuration
    1.70 @@ -272,6 +272,11 @@ CONFIG_IP_NF_ARPTABLES=y
    1.71  # SCTP Configuration (EXPERIMENTAL)
    1.72  #
    1.73  # CONFIG_IP_SCTP is not set
    1.74 +
    1.75 +#
    1.76 +# TIPC Configuration (EXPERIMENTAL)
    1.77 +#
    1.78 +# CONFIG_TIPC is not set
    1.79  # CONFIG_ATM is not set
    1.80  CONFIG_BRIDGE=y
    1.81  # CONFIG_VLAN_8021Q is not set
    1.82 @@ -471,13 +476,7 @@ CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
    1.83  CONFIG_SCSI_QLOGIC_FC=y
    1.84  # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
    1.85  CONFIG_SCSI_QLOGIC_1280=y
    1.86 -CONFIG_SCSI_QLA2XXX=y
    1.87 -CONFIG_SCSI_QLA21XX=y
    1.88 -CONFIG_SCSI_QLA22XX=y
    1.89 -CONFIG_SCSI_QLA2300=y
    1.90 -CONFIG_SCSI_QLA2322=y
    1.91 -# CONFIG_SCSI_QLA6312 is not set
    1.92 -# CONFIG_SCSI_QLA24XX is not set
    1.93 +# CONFIG_SCSI_QLA_FC is not set
    1.94  # CONFIG_SCSI_LPFC is not set
    1.95  # CONFIG_SCSI_DC395x is not set
    1.96  # CONFIG_SCSI_DC390T is not set
    1.97 @@ -588,12 +587,14 @@ CONFIG_E100=y
    1.98  # CONFIG_DL2K is not set
    1.99  CONFIG_E1000=y
   1.100  # CONFIG_E1000_NAPI is not set
   1.101 +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
   1.102  # CONFIG_NS83820 is not set
   1.103  # CONFIG_HAMACHI is not set
   1.104  # CONFIG_YELLOWFIN is not set
   1.105  # CONFIG_R8169 is not set
   1.106  # CONFIG_SIS190 is not set
   1.107  # CONFIG_SKGE is not set
   1.108 +# CONFIG_SKY2 is not set
   1.109  # CONFIG_SK98LIN is not set
   1.110  # CONFIG_VIA_VELOCITY is not set
   1.111  CONFIG_TIGON3=y
   1.112 @@ -707,12 +708,15 @@ CONFIG_GAMEPORT=y
   1.113  CONFIG_VT_CONSOLE=y
   1.114  CONFIG_HW_CONSOLE=y
   1.115  CONFIG_SERIAL_NONSTANDARD=y
   1.116 +# CONFIG_COMPUTONE is not set
   1.117  # CONFIG_ROCKETPORT is not set
   1.118  # CONFIG_CYCLADES is not set
   1.119  # CONFIG_DIGIEPCA is not set
   1.120 +# CONFIG_MOXA_INTELLIO is not set
   1.121  # CONFIG_MOXA_SMARTIO is not set
   1.122  # CONFIG_ISI is not set
   1.123  # CONFIG_SYNCLINKMP is not set
   1.124 +# CONFIG_SYNCLINK_GT is not set
   1.125  # CONFIG_N_HDLC is not set
   1.126  # CONFIG_SPECIALIX is not set
   1.127  # CONFIG_SX is not set
   1.128 @@ -725,6 +729,7 @@ CONFIG_SERIAL_8250=y
   1.129  CONFIG_SERIAL_8250_CONSOLE=y
   1.130  CONFIG_SERIAL_8250_ACPI=y
   1.131  CONFIG_SERIAL_8250_NR_UARTS=6
   1.132 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4
   1.133  CONFIG_SERIAL_8250_EXTENDED=y
   1.134  CONFIG_SERIAL_8250_SHARE_IRQ=y
   1.135  # CONFIG_SERIAL_8250_DETECT_IRQ is not set
   1.136 @@ -735,7 +740,6 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
   1.137  #
   1.138  CONFIG_SERIAL_CORE=y
   1.139  CONFIG_SERIAL_CORE_CONSOLE=y
   1.140 -# CONFIG_SERIAL_JSM is not set
   1.141  CONFIG_UNIX98_PTYS=y
   1.142  CONFIG_LEGACY_PTYS=y
   1.143  CONFIG_LEGACY_PTY_COUNT=256
   1.144 @@ -834,6 +838,12 @@ CONFIG_I2C_ALGOPCF=y
   1.145  # CONFIG_I2C_DEBUG_CHIP is not set
   1.146  
   1.147  #
   1.148 +# SPI support
   1.149 +#
   1.150 +# CONFIG_SPI is not set
   1.151 +# CONFIG_SPI_MASTER is not set
   1.152 +
   1.153 +#
   1.154  # Dallas's 1-wire bus
   1.155  #
   1.156  # CONFIG_W1 is not set
   1.157 @@ -872,6 +882,7 @@ CONFIG_HWMON=y
   1.158  # CONFIG_SENSORS_SMSC47M1 is not set
   1.159  # CONFIG_SENSORS_SMSC47B397 is not set
   1.160  # CONFIG_SENSORS_VIA686A is not set
   1.161 +# CONFIG_SENSORS_VT8231 is not set
   1.162  # CONFIG_SENSORS_W83781D is not set
   1.163  # CONFIG_SENSORS_W83792D is not set
   1.164  # CONFIG_SENSORS_W83L785TS is not set
   1.165 @@ -899,6 +910,7 @@ CONFIG_VIDEO_DEV=y
   1.166  #
   1.167  # Video Adapters
   1.168  #
   1.169 +# CONFIG_VIDEO_ADV_DEBUG is not set
   1.170  # CONFIG_VIDEO_BT848 is not set
   1.171  # CONFIG_VIDEO_CPIA is not set
   1.172  # CONFIG_VIDEO_SAA5246A is not set
   1.173 @@ -960,7 +972,6 @@ CONFIG_FB_RADEON_DEBUG=y
   1.174  # CONFIG_FB_KYRO is not set
   1.175  # CONFIG_FB_3DFX is not set
   1.176  # CONFIG_FB_VOODOO1 is not set
   1.177 -# CONFIG_FB_CYBLA is not set
   1.178  # CONFIG_FB_TRIDENT is not set
   1.179  # CONFIG_FB_VIRTUAL is not set
   1.180  
   1.181 @@ -989,8 +1000,6 @@ CONFIG_SOUND=y
   1.182  # Advanced Linux Sound Architecture
   1.183  #
   1.184  CONFIG_SND=y
   1.185 -CONFIG_SND_AC97_CODEC=y
   1.186 -CONFIG_SND_AC97_BUS=y
   1.187  CONFIG_SND_TIMER=y
   1.188  CONFIG_SND_PCM=y
   1.189  CONFIG_SND_HWDEP=y
   1.190 @@ -1001,15 +1010,18 @@ CONFIG_SND_OSSEMUL=y
   1.191  CONFIG_SND_MIXER_OSS=y
   1.192  CONFIG_SND_PCM_OSS=y
   1.193  CONFIG_SND_SEQUENCER_OSS=y
   1.194 +# CONFIG_SND_DYNAMIC_MINORS is not set
   1.195 +CONFIG_SND_SUPPORT_OLD_API=y
   1.196  # CONFIG_SND_VERBOSE_PRINTK is not set
   1.197  # CONFIG_SND_DEBUG is not set
   1.198 -CONFIG_SND_GENERIC_DRIVER=y
   1.199  
   1.200  #
   1.201  # Generic devices
   1.202  #
   1.203  CONFIG_SND_MPU401_UART=y
   1.204  CONFIG_SND_OPL3_LIB=y
   1.205 +CONFIG_SND_AC97_CODEC=y
   1.206 +CONFIG_SND_AC97_BUS=y
   1.207  CONFIG_SND_DUMMY=y
   1.208  CONFIG_SND_VIRMIDI=y
   1.209  CONFIG_SND_MTPAV=y
   1.210 @@ -1019,6 +1031,7 @@ CONFIG_SND_MPU401=y
   1.211  #
   1.212  # PCI devices
   1.213  #
   1.214 +# CONFIG_SND_AD1889 is not set
   1.215  # CONFIG_SND_ALI5451 is not set
   1.216  CONFIG_SND_ATIIXP=y
   1.217  # CONFIG_SND_ATIIXP_MODEM is not set
   1.218 @@ -1027,39 +1040,39 @@ CONFIG_SND_ATIIXP=y
   1.219  # CONFIG_SND_AU8830 is not set
   1.220  # CONFIG_SND_AZT3328 is not set
   1.221  # CONFIG_SND_BT87X is not set
   1.222 +# CONFIG_SND_CA0106 is not set
   1.223 +# CONFIG_SND_CMIPCI is not set
   1.224 +# CONFIG_SND_CS4281 is not set
   1.225  # CONFIG_SND_CS46XX is not set
   1.226 -# CONFIG_SND_CS4281 is not set
   1.227  # CONFIG_SND_EMU10K1 is not set
   1.228  # CONFIG_SND_EMU10K1X is not set
   1.229 -# CONFIG_SND_CA0106 is not set
   1.230 -# CONFIG_SND_KORG1212 is not set
   1.231 -# CONFIG_SND_MIXART is not set
   1.232 -# CONFIG_SND_NM256 is not set
   1.233 -# CONFIG_SND_RME32 is not set
   1.234 -# CONFIG_SND_RME96 is not set
   1.235 -# CONFIG_SND_RME9652 is not set
   1.236 -# CONFIG_SND_HDSP is not set
   1.237 -# CONFIG_SND_HDSPM is not set
   1.238 -# CONFIG_SND_TRIDENT is not set
   1.239 -# CONFIG_SND_YMFPCI is not set
   1.240 -# CONFIG_SND_AD1889 is not set
   1.241 -# CONFIG_SND_CMIPCI is not set
   1.242  # CONFIG_SND_ENS1370 is not set
   1.243  # CONFIG_SND_ENS1371 is not set
   1.244  # CONFIG_SND_ES1938 is not set
   1.245  # CONFIG_SND_ES1968 is not set
   1.246 -# CONFIG_SND_MAESTRO3 is not set
   1.247  CONFIG_SND_FM801=y
   1.248  CONFIG_SND_FM801_TEA575X=y
   1.249 +# CONFIG_SND_HDA_INTEL is not set
   1.250 +# CONFIG_SND_HDSP is not set
   1.251 +# CONFIG_SND_HDSPM is not set
   1.252  # CONFIG_SND_ICE1712 is not set
   1.253  # CONFIG_SND_ICE1724 is not set
   1.254  # CONFIG_SND_INTEL8X0 is not set
   1.255  # CONFIG_SND_INTEL8X0M is not set
   1.256 +# CONFIG_SND_KORG1212 is not set
   1.257 +# CONFIG_SND_MAESTRO3 is not set
   1.258 +# CONFIG_SND_MIXART is not set
   1.259 +# CONFIG_SND_NM256 is not set
   1.260 +# CONFIG_SND_PCXHR is not set
   1.261 +# CONFIG_SND_RME32 is not set
   1.262 +# CONFIG_SND_RME96 is not set
   1.263 +# CONFIG_SND_RME9652 is not set
   1.264  # CONFIG_SND_SONICVIBES is not set
   1.265 +# CONFIG_SND_TRIDENT is not set
   1.266  # CONFIG_SND_VIA82XX is not set
   1.267  # CONFIG_SND_VIA82XX_MODEM is not set
   1.268  # CONFIG_SND_VX222 is not set
   1.269 -# CONFIG_SND_HDA_INTEL is not set
   1.270 +# CONFIG_SND_YMFPCI is not set
   1.271  
   1.272  #
   1.273  # USB devices
   1.274 @@ -1132,12 +1145,15 @@ CONFIG_USB_STORAGE=y
   1.275  # CONFIG_USB_STORAGE_SDDR09 is not set
   1.276  # CONFIG_USB_STORAGE_SDDR55 is not set
   1.277  # CONFIG_USB_STORAGE_JUMPSHOT is not set
   1.278 +# CONFIG_USB_STORAGE_ALAUDA is not set
   1.279 +# CONFIG_USB_LIBUSUAL is not set
   1.280  
   1.281  #
   1.282  # USB Input Devices
   1.283  #
   1.284  CONFIG_USB_HID=y
   1.285  CONFIG_USB_HIDINPUT=y
   1.286 +# CONFIG_USB_HIDINPUT_POWERBOOK is not set
   1.287  # CONFIG_HID_FF is not set
   1.288  CONFIG_USB_HIDDEV=y
   1.289  # CONFIG_USB_AIPTEK is not set
   1.290 @@ -1151,6 +1167,7 @@ CONFIG_USB_HIDDEV=y
   1.291  # CONFIG_USB_YEALINK is not set
   1.292  # CONFIG_USB_XPAD is not set
   1.293  # CONFIG_USB_ATI_REMOTE is not set
   1.294 +# CONFIG_USB_ATI_REMOTE2 is not set
   1.295  # CONFIG_USB_KEYSPAN_REMOTE is not set
   1.296  # CONFIG_USB_APPLETOUCH is not set
   1.297  
   1.298 @@ -1166,6 +1183,7 @@ CONFIG_USB_HIDDEV=y
   1.299  # CONFIG_USB_DABUSB is not set
   1.300  # CONFIG_USB_VICAM is not set
   1.301  # CONFIG_USB_DSBR is not set
   1.302 +# CONFIG_USB_ET61X251 is not set
   1.303  # CONFIG_USB_IBMCAM is not set
   1.304  # CONFIG_USB_KONICAWC is not set
   1.305  # CONFIG_USB_OV511 is not set
   1.306 @@ -1235,6 +1253,10 @@ CONFIG_USB_MON=y
   1.307  #
   1.308  
   1.309  #
   1.310 +# EDAC - error detection and reporting (RAS)
   1.311 +#
   1.312 +
   1.313 +#
   1.314  # File systems
   1.315  #
   1.316  CONFIG_EXT2_FS=y
   1.317 @@ -1263,6 +1285,7 @@ CONFIG_XFS_EXPORT=y
   1.318  # CONFIG_XFS_SECURITY is not set
   1.319  # CONFIG_XFS_POSIX_ACL is not set
   1.320  # CONFIG_XFS_RT is not set
   1.321 +# CONFIG_OCFS2_FS is not set
   1.322  # CONFIG_MINIX_FS is not set
   1.323  # CONFIG_ROMFS_FS is not set
   1.324  CONFIG_INOTIFY=y
   1.325 @@ -1301,6 +1324,7 @@ CONFIG_TMPFS=y
   1.326  # CONFIG_HUGETLB_PAGE is not set
   1.327  CONFIG_RAMFS=y
   1.328  # CONFIG_RELAYFS_FS is not set
   1.329 +# CONFIG_CONFIGFS_FS is not set
   1.330  
   1.331  #
   1.332  # Miscellaneous filesystems
   1.333 @@ -1370,6 +1394,7 @@ CONFIG_MSDOS_PARTITION=y
   1.334  CONFIG_SGI_PARTITION=y
   1.335  # CONFIG_ULTRIX_PARTITION is not set
   1.336  # CONFIG_SUN_PARTITION is not set
   1.337 +# CONFIG_KARMA_PARTITION is not set
   1.338  CONFIG_EFI_PARTITION=y
   1.339  
   1.340  #
   1.341 @@ -1437,18 +1462,20 @@ CONFIG_GENERIC_PENDING_IRQ=y
   1.342  # Kernel hacking
   1.343  #
   1.344  # CONFIG_PRINTK_TIME is not set
   1.345 +CONFIG_MAGIC_SYSRQ=y
   1.346  CONFIG_DEBUG_KERNEL=y
   1.347 -CONFIG_MAGIC_SYSRQ=y
   1.348  CONFIG_LOG_BUF_SHIFT=20
   1.349  CONFIG_DETECT_SOFTLOCKUP=y
   1.350  # CONFIG_SCHEDSTATS is not set
   1.351  # CONFIG_DEBUG_SLAB is not set
   1.352 +CONFIG_DEBUG_MUTEXES=y
   1.353  # CONFIG_DEBUG_SPINLOCK is not set
   1.354  # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
   1.355  # CONFIG_DEBUG_KOBJECT is not set
   1.356  # CONFIG_DEBUG_INFO is not set
   1.357  # CONFIG_DEBUG_FS is not set
   1.358  # CONFIG_DEBUG_VM is not set
   1.359 +CONFIG_FORCED_INLINING=y
   1.360  # CONFIG_RCU_TORTURE_TEST is not set
   1.361  CONFIG_IA64_GRANULE_16MB=y
   1.362  # CONFIG_IA64_GRANULE_64MB is not set
     2.1 --- a/buildconfigs/linux-defconfig_xenU_ia64	Mon Feb 06 16:48:34 2006 +0000
     2.2 +++ b/buildconfigs/linux-defconfig_xenU_ia64	Mon Feb 06 18:02:36 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.15-xenU
     2.7 -# Wed Feb  1 14:19:46 2006
     2.8 +# Linux kernel version: 2.6.16-rc2-xenU
     2.9 +# Mon Feb  6 03:35:30 2006
    2.10  #
    2.11  
    2.12  #
    2.13 @@ -26,8 +26,6 @@ CONFIG_BSD_PROCESS_ACCT=y
    2.14  # CONFIG_BSD_PROCESS_ACCT_V3 is not set
    2.15  CONFIG_SYSCTL=y
    2.16  # CONFIG_AUDIT is not set
    2.17 -CONFIG_HOTPLUG=y
    2.18 -CONFIG_KOBJECT_UEVENT=y
    2.19  # CONFIG_IKCONFIG is not set
    2.20  # CONFIG_CPUSETS is not set
    2.21  CONFIG_INITRAMFS_SOURCE=""
    2.22 @@ -36,8 +34,10 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
    2.23  CONFIG_KALLSYMS=y
    2.24  # CONFIG_KALLSYMS_ALL is not set
    2.25  # CONFIG_KALLSYMS_EXTRA_PASS is not set
    2.26 +CONFIG_HOTPLUG=y
    2.27  CONFIG_PRINTK=y
    2.28  CONFIG_BUG=y
    2.29 +CONFIG_ELF_CORE=y
    2.30  CONFIG_BASE_FULL=y
    2.31  CONFIG_FUTEX=y
    2.32  CONFIG_EPOLL=y
    2.33 @@ -46,8 +46,10 @@ CONFIG_CC_ALIGN_FUNCTIONS=0
    2.34  CONFIG_CC_ALIGN_LABELS=0
    2.35  CONFIG_CC_ALIGN_LOOPS=0
    2.36  CONFIG_CC_ALIGN_JUMPS=0
    2.37 +CONFIG_SLAB=y
    2.38  # CONFIG_TINY_SHMEM is not set
    2.39  CONFIG_BASE_SMALL=0
    2.40 +# CONFIG_SLOB is not set
    2.41  
    2.42  #
    2.43  # Loadable module support
    2.44 @@ -169,6 +171,7 @@ CONFIG_ACPI_PROCESSOR=y
    2.45  CONFIG_ACPI_THERMAL=y
    2.46  CONFIG_ACPI_BLACKLIST_YEAR=0
    2.47  # CONFIG_ACPI_DEBUG is not set
    2.48 +CONFIG_ACPI_EC=y
    2.49  CONFIG_ACPI_POWER=y
    2.50  CONFIG_ACPI_SYSTEM=y
    2.51  # CONFIG_ACPI_CONTAINER is not set
    2.52 @@ -245,16 +248,13 @@ CONFIG_NETFILTER=y
    2.53  #
    2.54  # CONFIG_NETFILTER_NETLINK is not set
    2.55  # CONFIG_NF_CONNTRACK is not set
    2.56 +# CONFIG_NETFILTER_XTABLES is not set
    2.57  
    2.58  #
    2.59  # IP: Netfilter Configuration
    2.60  #
    2.61  # CONFIG_IP_NF_CONNTRACK is not set
    2.62  # CONFIG_IP_NF_QUEUE is not set
    2.63 -# CONFIG_IP_NF_IPTABLES is not set
    2.64 -CONFIG_IP_NF_ARPTABLES=y
    2.65 -# CONFIG_IP_NF_ARPFILTER is not set
    2.66 -# CONFIG_IP_NF_ARP_MANGLE is not set
    2.67  
    2.68  #
    2.69  # DCCP Configuration (EXPERIMENTAL)
    2.70 @@ -265,6 +265,11 @@ CONFIG_IP_NF_ARPTABLES=y
    2.71  # SCTP Configuration (EXPERIMENTAL)
    2.72  #
    2.73  # CONFIG_IP_SCTP is not set
    2.74 +
    2.75 +#
    2.76 +# TIPC Configuration (EXPERIMENTAL)
    2.77 +#
    2.78 +# CONFIG_TIPC is not set
    2.79  # CONFIG_ATM is not set
    2.80  # CONFIG_BRIDGE is not set
    2.81  # CONFIG_VLAN_8021Q is not set
    2.82 @@ -412,13 +417,7 @@ CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
    2.83  # CONFIG_SCSI_IPR is not set
    2.84  # CONFIG_SCSI_QLOGIC_FC is not set
    2.85  CONFIG_SCSI_QLOGIC_1280=y
    2.86 -CONFIG_SCSI_QLA2XXX=y
    2.87 -# CONFIG_SCSI_QLA21XX is not set
    2.88 -# CONFIG_SCSI_QLA22XX is not set
    2.89 -# CONFIG_SCSI_QLA2300 is not set
    2.90 -# CONFIG_SCSI_QLA2322 is not set
    2.91 -# CONFIG_SCSI_QLA6312 is not set
    2.92 -# CONFIG_SCSI_QLA24XX is not set
    2.93 +# CONFIG_SCSI_QLA_FC is not set
    2.94  # CONFIG_SCSI_LPFC is not set
    2.95  # CONFIG_SCSI_DC395x is not set
    2.96  # CONFIG_SCSI_DC390T is not set
    2.97 @@ -519,12 +518,14 @@ CONFIG_E100=y
    2.98  # CONFIG_DL2K is not set
    2.99  CONFIG_E1000=y
   2.100  # CONFIG_E1000_NAPI is not set
   2.101 +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
   2.102  # CONFIG_NS83820 is not set
   2.103  # CONFIG_HAMACHI is not set
   2.104  # CONFIG_YELLOWFIN is not set
   2.105  # CONFIG_R8169 is not set
   2.106  # CONFIG_SIS190 is not set
   2.107  # CONFIG_SKGE is not set
   2.108 +# CONFIG_SKY2 is not set
   2.109  # CONFIG_SK98LIN is not set
   2.110  # CONFIG_VIA_VELOCITY is not set
   2.111  CONFIG_TIGON3=y
   2.112 @@ -619,6 +620,7 @@ CONFIG_SERIAL_8250=y
   2.113  CONFIG_SERIAL_8250_CONSOLE=y
   2.114  CONFIG_SERIAL_8250_ACPI=y
   2.115  CONFIG_SERIAL_8250_NR_UARTS=8
   2.116 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4
   2.117  CONFIG_SERIAL_8250_EXTENDED=y
   2.118  CONFIG_SERIAL_8250_SHARE_IRQ=y
   2.119  # CONFIG_SERIAL_8250_DETECT_IRQ is not set
   2.120 @@ -728,6 +730,12 @@ CONFIG_I2C_ALGOPCF=y
   2.121  # CONFIG_I2C_DEBUG_CHIP is not set
   2.122  
   2.123  #
   2.124 +# SPI support
   2.125 +#
   2.126 +# CONFIG_SPI is not set
   2.127 +# CONFIG_SPI_MASTER is not set
   2.128 +
   2.129 +#
   2.130  # Dallas's 1-wire bus
   2.131  #
   2.132  # CONFIG_W1 is not set
   2.133 @@ -766,6 +774,7 @@ CONFIG_HWMON=y
   2.134  # CONFIG_SENSORS_SMSC47M1 is not set
   2.135  # CONFIG_SENSORS_SMSC47B397 is not set
   2.136  # CONFIG_SENSORS_VIA686A is not set
   2.137 +# CONFIG_SENSORS_VT8231 is not set
   2.138  # CONFIG_SENSORS_W83781D is not set
   2.139  # CONFIG_SENSORS_W83792D is not set
   2.140  # CONFIG_SENSORS_W83L785TS is not set
   2.141 @@ -793,6 +802,7 @@ CONFIG_VIDEO_DEV=y
   2.142  #
   2.143  # Video Adapters
   2.144  #
   2.145 +# CONFIG_VIDEO_ADV_DEBUG is not set
   2.146  # CONFIG_VIDEO_BT848 is not set
   2.147  # CONFIG_VIDEO_CPIA is not set
   2.148  # CONFIG_VIDEO_SAA5246A is not set
   2.149 @@ -855,7 +865,6 @@ CONFIG_FB_RADEON_DEBUG=y
   2.150  # CONFIG_FB_KYRO is not set
   2.151  # CONFIG_FB_3DFX is not set
   2.152  # CONFIG_FB_VOODOO1 is not set
   2.153 -# CONFIG_FB_CYBLA is not set
   2.154  # CONFIG_FB_TRIDENT is not set
   2.155  # CONFIG_FB_PM3 is not set
   2.156  # CONFIG_FB_VIRTUAL is not set
   2.157 @@ -878,8 +887,6 @@ CONFIG_SOUND=y
   2.158  # Advanced Linux Sound Architecture
   2.159  #
   2.160  CONFIG_SND=y
   2.161 -CONFIG_SND_AC97_CODEC=y
   2.162 -CONFIG_SND_AC97_BUS=y
   2.163  CONFIG_SND_TIMER=y
   2.164  CONFIG_SND_PCM=y
   2.165  CONFIG_SND_HWDEP=y
   2.166 @@ -890,6 +897,8 @@ CONFIG_SND_OSSEMUL=y
   2.167  CONFIG_SND_MIXER_OSS=y
   2.168  CONFIG_SND_PCM_OSS=y
   2.169  CONFIG_SND_SEQUENCER_OSS=y
   2.170 +# CONFIG_SND_DYNAMIC_MINORS is not set
   2.171 +CONFIG_SND_SUPPORT_OLD_API=y
   2.172  # CONFIG_SND_VERBOSE_PRINTK is not set
   2.173  # CONFIG_SND_DEBUG is not set
   2.174  
   2.175 @@ -898,6 +907,8 @@ CONFIG_SND_SEQUENCER_OSS=y
   2.176  #
   2.177  CONFIG_SND_MPU401_UART=y
   2.178  CONFIG_SND_OPL3_LIB=y
   2.179 +CONFIG_SND_AC97_CODEC=y
   2.180 +CONFIG_SND_AC97_BUS=y
   2.181  # CONFIG_SND_DUMMY is not set
   2.182  # CONFIG_SND_VIRMIDI is not set
   2.183  # CONFIG_SND_MTPAV is not set
   2.184 @@ -907,6 +918,7 @@ CONFIG_SND_OPL3_LIB=y
   2.185  #
   2.186  # PCI devices
   2.187  #
   2.188 +# CONFIG_SND_AD1889 is not set
   2.189  # CONFIG_SND_ALI5451 is not set
   2.190  # CONFIG_SND_ATIIXP is not set
   2.191  # CONFIG_SND_ATIIXP_MODEM is not set
   2.192 @@ -915,39 +927,39 @@ CONFIG_SND_OPL3_LIB=y
   2.193  # CONFIG_SND_AU8830 is not set
   2.194  # CONFIG_SND_AZT3328 is not set
   2.195  # CONFIG_SND_BT87X is not set
   2.196 +# CONFIG_SND_CA0106 is not set
   2.197 +# CONFIG_SND_CMIPCI is not set
   2.198 +# CONFIG_SND_CS4281 is not set
   2.199  # CONFIG_SND_CS46XX is not set
   2.200 -# CONFIG_SND_CS4281 is not set
   2.201  # CONFIG_SND_EMU10K1 is not set
   2.202  # CONFIG_SND_EMU10K1X is not set
   2.203 -# CONFIG_SND_CA0106 is not set
   2.204 -# CONFIG_SND_KORG1212 is not set
   2.205 -# CONFIG_SND_MIXART is not set
   2.206 -# CONFIG_SND_NM256 is not set
   2.207 -# CONFIG_SND_RME32 is not set
   2.208 -# CONFIG_SND_RME96 is not set
   2.209 -# CONFIG_SND_RME9652 is not set
   2.210 -# CONFIG_SND_HDSP is not set
   2.211 -# CONFIG_SND_HDSPM is not set
   2.212 -# CONFIG_SND_TRIDENT is not set
   2.213 -# CONFIG_SND_YMFPCI is not set
   2.214 -# CONFIG_SND_AD1889 is not set
   2.215 -# CONFIG_SND_CMIPCI is not set
   2.216  # CONFIG_SND_ENS1370 is not set
   2.217  # CONFIG_SND_ENS1371 is not set
   2.218  # CONFIG_SND_ES1938 is not set
   2.219  # CONFIG_SND_ES1968 is not set
   2.220 -# CONFIG_SND_MAESTRO3 is not set
   2.221  CONFIG_SND_FM801=y
   2.222  CONFIG_SND_FM801_TEA575X=y
   2.223 +# CONFIG_SND_HDA_INTEL is not set
   2.224 +# CONFIG_SND_HDSP is not set
   2.225 +# CONFIG_SND_HDSPM is not set
   2.226  # CONFIG_SND_ICE1712 is not set
   2.227  # CONFIG_SND_ICE1724 is not set
   2.228  # CONFIG_SND_INTEL8X0 is not set
   2.229  # CONFIG_SND_INTEL8X0M is not set
   2.230 +# CONFIG_SND_KORG1212 is not set
   2.231 +# CONFIG_SND_MAESTRO3 is not set
   2.232 +# CONFIG_SND_MIXART is not set
   2.233 +# CONFIG_SND_NM256 is not set
   2.234 +# CONFIG_SND_PCXHR is not set
   2.235 +# CONFIG_SND_RME32 is not set
   2.236 +# CONFIG_SND_RME96 is not set
   2.237 +# CONFIG_SND_RME9652 is not set
   2.238  # CONFIG_SND_SONICVIBES is not set
   2.239 +# CONFIG_SND_TRIDENT is not set
   2.240  # CONFIG_SND_VIA82XX is not set
   2.241  # CONFIG_SND_VIA82XX_MODEM is not set
   2.242  # CONFIG_SND_VX222 is not set
   2.243 -# CONFIG_SND_HDA_INTEL is not set
   2.244 +# CONFIG_SND_YMFPCI is not set
   2.245  
   2.246  #
   2.247  # USB devices
   2.248 @@ -1012,12 +1024,15 @@ CONFIG_USB_STORAGE=y
   2.249  # CONFIG_USB_STORAGE_SDDR09 is not set
   2.250  # CONFIG_USB_STORAGE_SDDR55 is not set
   2.251  # CONFIG_USB_STORAGE_JUMPSHOT is not set
   2.252 +# CONFIG_USB_STORAGE_ALAUDA is not set
   2.253 +# CONFIG_USB_LIBUSUAL is not set
   2.254  
   2.255  #
   2.256  # USB Input Devices
   2.257  #
   2.258  CONFIG_USB_HID=y
   2.259  CONFIG_USB_HIDINPUT=y
   2.260 +# CONFIG_USB_HIDINPUT_POWERBOOK is not set
   2.261  # CONFIG_HID_FF is not set
   2.262  CONFIG_USB_HIDDEV=y
   2.263  # CONFIG_USB_AIPTEK is not set
   2.264 @@ -1031,6 +1046,7 @@ CONFIG_USB_HIDDEV=y
   2.265  # CONFIG_USB_YEALINK is not set
   2.266  # CONFIG_USB_XPAD is not set
   2.267  # CONFIG_USB_ATI_REMOTE is not set
   2.268 +# CONFIG_USB_ATI_REMOTE2 is not set
   2.269  # CONFIG_USB_KEYSPAN_REMOTE is not set
   2.270  # CONFIG_USB_APPLETOUCH is not set
   2.271  
   2.272 @@ -1046,6 +1062,7 @@ CONFIG_USB_HIDDEV=y
   2.273  # CONFIG_USB_DABUSB is not set
   2.274  # CONFIG_USB_VICAM is not set
   2.275  # CONFIG_USB_DSBR is not set
   2.276 +# CONFIG_USB_ET61X251 is not set
   2.277  # CONFIG_USB_IBMCAM is not set
   2.278  # CONFIG_USB_KONICAWC is not set
   2.279  # CONFIG_USB_OV511 is not set
   2.280 @@ -1114,6 +1131,10 @@ CONFIG_USB_MON=y
   2.281  #
   2.282  
   2.283  #
   2.284 +# EDAC - error detection and reporting (RAS)
   2.285 +#
   2.286 +
   2.287 +#
   2.288  # File systems
   2.289  #
   2.290  CONFIG_EXT2_FS=y
   2.291 @@ -1132,6 +1153,7 @@ CONFIG_FS_MBCACHE=y
   2.292  # CONFIG_JFS_FS is not set
   2.293  # CONFIG_FS_POSIX_ACL is not set
   2.294  # CONFIG_XFS_FS is not set
   2.295 +# CONFIG_OCFS2_FS is not set
   2.296  # CONFIG_MINIX_FS is not set
   2.297  # CONFIG_ROMFS_FS is not set
   2.298  CONFIG_INOTIFY=y
   2.299 @@ -1170,6 +1192,7 @@ CONFIG_TMPFS=y
   2.300  # CONFIG_HUGETLB_PAGE is not set
   2.301  CONFIG_RAMFS=y
   2.302  # CONFIG_RELAYFS_FS is not set
   2.303 +# CONFIG_CONFIGFS_FS is not set
   2.304  
   2.305  #
   2.306  # Miscellaneous filesystems
   2.307 @@ -1234,6 +1257,7 @@ CONFIG_MSDOS_PARTITION=y
   2.308  # CONFIG_SGI_PARTITION is not set
   2.309  # CONFIG_ULTRIX_PARTITION is not set
   2.310  # CONFIG_SUN_PARTITION is not set
   2.311 +# CONFIG_KARMA_PARTITION is not set
   2.312  CONFIG_EFI_PARTITION=y
   2.313  
   2.314  #
   2.315 @@ -1301,18 +1325,20 @@ CONFIG_GENERIC_PENDING_IRQ=y
   2.316  # Kernel hacking
   2.317  #
   2.318  # CONFIG_PRINTK_TIME is not set
   2.319 +CONFIG_MAGIC_SYSRQ=y
   2.320  CONFIG_DEBUG_KERNEL=y
   2.321 -CONFIG_MAGIC_SYSRQ=y
   2.322  CONFIG_LOG_BUF_SHIFT=17
   2.323  CONFIG_DETECT_SOFTLOCKUP=y
   2.324  # CONFIG_SCHEDSTATS is not set
   2.325  # CONFIG_DEBUG_SLAB is not set
   2.326 +CONFIG_DEBUG_MUTEXES=y
   2.327  # CONFIG_DEBUG_SPINLOCK is not set
   2.328  # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
   2.329  # CONFIG_DEBUG_KOBJECT is not set
   2.330  # CONFIG_DEBUG_INFO is not set
   2.331  # CONFIG_DEBUG_FS is not set
   2.332  # CONFIG_DEBUG_VM is not set
   2.333 +CONFIG_FORCED_INLINING=y
   2.334  # CONFIG_RCU_TORTURE_TEST is not set
   2.335  CONFIG_IA64_GRANULE_16MB=y
   2.336  # CONFIG_IA64_GRANULE_64MB is not set
     3.1 --- a/linux-2.6-xen-sparse/arch/ia64/Makefile	Mon Feb 06 16:48:34 2006 +0000
     3.2 +++ b/linux-2.6-xen-sparse/arch/ia64/Makefile	Mon Feb 06 18:02:36 2006 +0000
     3.3 @@ -25,7 +25,6 @@ cflags-y	:= -pipe $(EXTRA) -ffixed-r13 -
     3.4  		   -falign-functions=32 -frename-registers -fno-optimize-sibling-calls
     3.5  CFLAGS_KERNEL	:= -mconstant-gp
     3.6  
     3.7 -GCC_VERSION     := $(call cc-version)
     3.8  GAS_STATUS	= $(shell $(srctree)/arch/ia64/scripts/check-gas "$(CC)" "$(OBJDUMP)")
     3.9  CPPFLAGS += $(shell $(srctree)/arch/ia64/scripts/toolchain-flags "$(CC)" "$(OBJDUMP)" "$(READELF)")
    3.10  
    3.11 @@ -37,11 +36,7 @@ ifeq ($(GAS_STATUS),buggy)
    3.12  		ftp://ftp.hpl.hp.com/pub/linux-ia64/gas-030124.tar.gz)
    3.13  endif
    3.14  
    3.15 -ifneq ($(shell if [ $(GCC_VERSION) -lt 0300 ] ; then echo "bad"; fi ;),)
    3.16 -$(error Sorry, your compiler is too old.  GCC v2.96 is known to generate bad code.)
    3.17 -endif
    3.18 -
    3.19 -ifeq ($(GCC_VERSION),0304)
    3.20 +ifeq ($(call cc-version),0304)
    3.21  	cflags-$(CONFIG_ITANIUM)	+= -mtune=merced
    3.22  	cflags-$(CONFIG_MCKINLEY)	+= -mtune=mckinley
    3.23  endif
     4.1 --- a/linux-2.6-xen-sparse/arch/ia64/kernel/entry.S	Mon Feb 06 16:48:34 2006 +0000
     4.2 +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/entry.S	Mon Feb 06 18:02:36 2006 +0000
     4.3 @@ -1606,5 +1606,6 @@ sys_call_table:
     4.4  	data8 sys_inotify_init
     4.5  	data8 sys_inotify_add_watch
     4.6  	data8 sys_inotify_rm_watch
     4.7 +	data8 sys_migrate_pages			// 1280
     4.8  
     4.9  	.org sys_call_table + 8*NR_syscalls	// guard against failures to increase NR_syscalls
     5.1 --- a/linux-2.6-xen-sparse/arch/ia64/kernel/head.S	Mon Feb 06 16:48:34 2006 +0000
     5.2 +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/head.S	Mon Feb 06 18:02:36 2006 +0000
     5.3 @@ -1064,7 +1064,7 @@ SET_REG(b5);
     5.4  	 * the clobber lists for spin_lock() in include/asm-ia64/spinlock.h.
     5.5  	 */
     5.6  
     5.7 -#if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
     5.8 +#if (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
     5.9  
    5.10  GLOBAL_ENTRY(ia64_spinlock_contention_pre3_4)
    5.11  	.prologue
     6.1 --- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c	Mon Feb 06 16:48:34 2006 +0000
     6.2 +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c	Mon Feb 06 18:02:36 2006 +0000
     6.3 @@ -43,6 +43,7 @@
     6.4  #include <linux/initrd.h>
     6.5  #include <linux/platform.h>
     6.6  #include <linux/pm.h>
     6.7 +#include <linux/cpufreq.h>
     6.8  
     6.9  #include <asm/ia32.h>
    6.10  #include <asm/machvec.h>
    6.11 @@ -59,6 +60,7 @@
    6.12  #include <asm/smp.h>
    6.13  #include <asm/system.h>
    6.14  #include <asm/unistd.h>
    6.15 +#include <asm/system.h>
    6.16  
    6.17  #if defined(CONFIG_SMP) && (IA64_CPU_SIZE > PAGE_SIZE)
    6.18  # error "struct cpuinfo_ia64 too big!"
    6.19 @@ -521,6 +523,7 @@ show_cpuinfo (struct seq_file *m, void *
    6.20  	char family[32], features[128], *cp, sep;
    6.21  	struct cpuinfo_ia64 *c = v;
    6.22  	unsigned long mask;
    6.23 +	unsigned long proc_freq;
    6.24  	int i;
    6.25  
    6.26  	mask = c->features;
    6.27 @@ -553,6 +556,10 @@ show_cpuinfo (struct seq_file *m, void *
    6.28  		sprintf(cp, " 0x%lx", mask);
    6.29  	}
    6.30  
    6.31 +	proc_freq = cpufreq_quick_get(cpunum);
    6.32 +	if (!proc_freq)
    6.33 +		proc_freq = c->proc_freq / 1000;
    6.34 +
    6.35  	seq_printf(m,
    6.36  		   "processor  : %d\n"
    6.37  		   "vendor     : %s\n"
    6.38 @@ -569,7 +576,7 @@ show_cpuinfo (struct seq_file *m, void *
    6.39  		   "BogoMIPS   : %lu.%02lu\n",
    6.40  		   cpunum, c->vendor, family, c->model, c->revision, c->archrev,
    6.41  		   features, c->ppn, c->number,
    6.42 -		   c->proc_freq / 1000000, c->proc_freq % 1000000,
    6.43 +		   proc_freq / 1000, proc_freq % 1000,
    6.44  		   c->itc_freq / 1000000, c->itc_freq % 1000000,
    6.45  		   lpj*HZ/500000, (lpj*HZ/5000) % 100);
    6.46  #ifdef CONFIG_SMP
    6.47 @@ -693,6 +700,7 @@ static void
    6.48  get_max_cacheline_size (void)
    6.49  {
    6.50  	unsigned long line_size, max = 1;
    6.51 +	unsigned int cache_size = 0;
    6.52  	u64 l, levels, unique_caches;
    6.53          pal_cache_config_info_t cci;
    6.54          s64 status;
    6.55 @@ -722,6 +730,8 @@ get_max_cacheline_size (void)
    6.56  		line_size = 1 << cci.pcci_line_size;
    6.57  		if (line_size > max)
    6.58  			max = line_size;
    6.59 +		if (cache_size < cci.pcci_cache_size)
    6.60 +			cache_size = cci.pcci_cache_size;
    6.61  		if (!cci.pcci_unified) {
    6.62  			status = ia64_pal_cache_config_info(l,
    6.63  						    /* cache_type (instruction)= */ 1,
    6.64 @@ -738,6 +748,9 @@ get_max_cacheline_size (void)
    6.65  			ia64_i_cache_stride_shift = cci.pcci_stride;
    6.66  	}
    6.67    out:
    6.68 +#ifdef CONFIG_SMP
    6.69 +	max_cache_size = max(max_cache_size, cache_size);
    6.70 +#endif
    6.71  	if (max > ia64_max_cacheline_size)
    6.72  		ia64_max_cacheline_size = max;
    6.73  }
    6.74 @@ -792,7 +805,7 @@ cpu_init (void)
    6.75  #endif
    6.76  
    6.77  	/* Clear the stack memory reserved for pt_regs: */
    6.78 -	memset(ia64_task_regs(current), 0, sizeof(struct pt_regs));
    6.79 +	memset(task_pt_regs(current), 0, sizeof(struct pt_regs));
    6.80  
    6.81  	ia64_set_kr(IA64_KR_FPU_OWNER, 0);
    6.82  
    6.83 @@ -868,6 +881,15 @@ cpu_init (void)
    6.84  	pm_idle = default_idle;
    6.85  }
    6.86  
    6.87 +/*
    6.88 + * On SMP systems, when the scheduler does migration-cost autodetection,
    6.89 + * it needs a way to flush as much of the CPU's caches as possible.
    6.90 + */
    6.91 +void sched_cacheflush(void)
    6.92 +{
    6.93 +	ia64_sal_cache_flush(3);
    6.94 +}
    6.95 +
    6.96  void
    6.97  check_bugs (void)
    6.98  {
     7.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h	Mon Feb 06 16:48:34 2006 +0000
     7.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h	Mon Feb 06 18:02:36 2006 +0000
     7.3 @@ -30,8 +30,8 @@
     7.4  #ifndef __HYPERCALL_H__
     7.5  #define __HYPERCALL_H__
     7.6  
     7.7 -#include <asm-xen/xen-public/xen.h>
     7.8 -#include <asm-xen/xen-public/sched.h>
     7.9 +#include <xen/interface/xen.h>
    7.10 +#include <xen/interface/sched.h>
    7.11  
    7.12  /* FIXME: temp place to hold these page related macros */
    7.13  #include <asm/page.h>
     8.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h	Mon Feb 06 16:48:34 2006 +0000
     8.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h	Mon Feb 06 18:02:36 2006 +0000
     8.3 @@ -34,8 +34,8 @@
     8.4  #include <linux/types.h>
     8.5  #include <linux/kernel.h>
     8.6  #include <linux/version.h>
     8.7 -#include <asm-xen/xen-public/xen.h>
     8.8 -#include <asm-xen/xen-public/dom0_ops.h>
     8.9 +#include <xen/interface/xen.h>
    8.10 +#include <xen/interface/dom0_ops.h>
    8.11  #include <asm/ptrace.h>
    8.12  #include <asm/page.h>
    8.13  
     9.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/pal.h	Mon Feb 06 16:48:34 2006 +0000
     9.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/pal.h	Mon Feb 06 18:02:36 2006 +0000
     9.3 @@ -75,6 +75,8 @@
     9.4  #define PAL_CACHE_READ		259	/* read tag & data of cacheline for diagnostic testing */
     9.5  #define PAL_CACHE_WRITE		260	/* write tag & data of cacheline for diagnostic testing */
     9.6  #define PAL_VM_TR_READ		261	/* read contents of translation register */
     9.7 +#define PAL_GET_PSTATE		262	/* get the current P-state */
     9.8 +#define PAL_SET_PSTATE		263	/* set the P-state */
     9.9  
    9.10  #ifndef __ASSEMBLY__
    9.11  
    9.12 @@ -926,7 +928,7 @@ static inline s64
    9.13  ia64_pal_cache_flush (u64 cache_type, u64 invalidate, u64 *progress, u64 *vector)
    9.14  {
    9.15  	struct ia64_pal_retval iprv;
    9.16 -	PAL_CALL_IC_OFF(iprv, PAL_CACHE_FLUSH, cache_type, invalidate, *progress);
    9.17 +	PAL_CALL(iprv, PAL_CACHE_FLUSH, cache_type, invalidate, *progress);
    9.18  	if (vector)
    9.19  		*vector = iprv.v0;
    9.20  	*progress = iprv.v1;
    9.21 @@ -1112,6 +1114,25 @@ ia64_pal_halt_info (pal_power_mgmt_info_
    9.22  	return iprv.status;
    9.23  }
    9.24  
    9.25 +/* Get the current P-state information */
    9.26 +static inline s64
    9.27 +ia64_pal_get_pstate (u64 *pstate_index)
    9.28 +{
    9.29 +	struct ia64_pal_retval iprv;
    9.30 +	PAL_CALL_STK(iprv, PAL_GET_PSTATE, 0, 0, 0);
    9.31 +	*pstate_index = iprv.v0;
    9.32 +	return iprv.status;
    9.33 +}
    9.34 +
    9.35 +/* Set the P-state */
    9.36 +static inline s64
    9.37 +ia64_pal_set_pstate (u64 pstate_index)
    9.38 +{
    9.39 +	struct ia64_pal_retval iprv;
    9.40 +	PAL_CALL_STK(iprv, PAL_SET_PSTATE, pstate_index, 0, 0);
    9.41 +	return iprv.status;
    9.42 +}
    9.43 +
    9.44  /* Cause the processor to enter LIGHT HALT state, where prefetching and execution are
    9.45   * suspended, but cache and TLB coherency is maintained.
    9.46   */
    10.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/processor.h	Mon Feb 06 16:48:34 2006 +0000
    10.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/processor.h	Mon Feb 06 18:02:36 2006 +0000
    10.3 @@ -21,16 +21,13 @@
    10.4  #include <asm/ustack.h>
    10.5  #include <asm/privop.h>
    10.6  
    10.7 -/* Our arch specific arch_init_sched_domain is in arch/ia64/kernel/domain.c */
    10.8 -#define ARCH_HAS_SCHED_DOMAIN
    10.9 -
   10.10  #define IA64_NUM_DBG_REGS	8
   10.11  /*
   10.12   * Limits for PMC and PMD are set to less than maximum architected values
   10.13   * but should be sufficient for a while
   10.14   */
   10.15 -#define IA64_NUM_PMC_REGS	32
   10.16 -#define IA64_NUM_PMD_REGS	32
   10.17 +#define IA64_NUM_PMC_REGS	64
   10.18 +#define IA64_NUM_PMD_REGS	64
   10.19  
   10.20  #define DEFAULT_MAP_BASE	__IA64_UL_CONST(0x2000000000000000)
   10.21  #define DEFAULT_TASK_SIZE	__IA64_UL_CONST(0xa000000000000000)
   10.22 @@ -356,7 +353,7 @@ extern unsigned long get_wchan (struct t
   10.23  /* Return instruction pointer of blocked task TSK.  */
   10.24  #define KSTK_EIP(tsk)					\
   10.25    ({							\
   10.26 -	struct pt_regs *_regs = ia64_task_regs(tsk);	\
   10.27 +	struct pt_regs *_regs = task_pt_regs(tsk);	\
   10.28  	_regs->cr_iip + ia64_psr(_regs)->ri;		\
   10.29    })
   10.30  
    11.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/system.h	Mon Feb 06 16:48:34 2006 +0000
    11.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/system.h	Mon Feb 06 18:02:36 2006 +0000
    11.3 @@ -19,12 +19,13 @@
    11.4  #include <asm/pal.h>
    11.5  #include <asm/percpu.h>
    11.6  
    11.7 -#define GATE_ADDR		__IA64_UL_CONST(0xa000000000000000)
    11.8 +#define GATE_ADDR		RGN_BASE(RGN_GATE)
    11.9 +
   11.10  /*
   11.11   * 0xa000000000000000+2*PERCPU_PAGE_SIZE
   11.12   * - 0xa000000000000000+3*PERCPU_PAGE_SIZE remain unmapped (guard page)
   11.13   */
   11.14 -#define KERNEL_START		 __IA64_UL_CONST(0xa000000100000000)
   11.15 +#define KERNEL_START		 (GATE_ADDR+0x100000000)
   11.16  #define PERCPU_ADDR		(-PERCPU_PAGE_SIZE)
   11.17  
   11.18  #ifndef __ASSEMBLY__
   11.19 @@ -183,8 +184,6 @@ do {								\
   11.20  
   11.21  #ifdef __KERNEL__
   11.22  
   11.23 -#define prepare_to_switch()    do { } while(0)
   11.24 -
   11.25  #ifdef CONFIG_IA32_SUPPORT
   11.26  # define IS_IA32_PROCESS(regs)	(ia64_psr(regs)->is != 0)
   11.27  #else
   11.28 @@ -220,14 +219,14 @@ extern void ia64_load_extra (struct task
   11.29  
   11.30  #define IA64_HAS_EXTRA_STATE(t)							\
   11.31  	((t)->thread.flags & (IA64_THREAD_DBG_VALID|IA64_THREAD_PM_VALID)	\
   11.32 -	 || IS_IA32_PROCESS(ia64_task_regs(t)) || PERFMON_IS_SYSWIDE())
   11.33 +	 || IS_IA32_PROCESS(task_pt_regs(t)) || PERFMON_IS_SYSWIDE())
   11.34  
   11.35  #define __switch_to(prev,next,last) do {							 \
   11.36  	if (IA64_HAS_EXTRA_STATE(prev))								 \
   11.37  		ia64_save_extra(prev);								 \
   11.38  	if (IA64_HAS_EXTRA_STATE(next))								 \
   11.39  		ia64_load_extra(next);								 \
   11.40 -	ia64_psr(ia64_task_regs(next))->dfh = !ia64_is_local_fpu_owner(next);			 \
   11.41 +	ia64_psr(task_pt_regs(next))->dfh = !ia64_is_local_fpu_owner(next);			 \
   11.42  	(last) = ia64_switch_to((next));							 \
   11.43  } while (0)
   11.44  
   11.45 @@ -239,8 +238,8 @@ extern void ia64_load_extra (struct task
   11.46   * the latest fph state from another CPU.  In other words: eager save, lazy restore.
   11.47   */
   11.48  # define switch_to(prev,next,last) do {						\
   11.49 -	if (ia64_psr(ia64_task_regs(prev))->mfh && ia64_is_local_fpu_owner(prev)) {				\
   11.50 -		ia64_psr(ia64_task_regs(prev))->mfh = 0;			\
   11.51 +	if (ia64_psr(task_pt_regs(prev))->mfh && ia64_is_local_fpu_owner(prev)) {				\
   11.52 +		ia64_psr(task_pt_regs(prev))->mfh = 0;			\
   11.53  		(prev)->thread.flags |= IA64_THREAD_FPH_VALID;			\
   11.54  		__ia64_save_fpu((prev)->thread.fph);				\
   11.55  	}									\
   11.56 @@ -274,17 +273,13 @@ extern void ia64_load_extra (struct task
   11.57   * of that CPU which will not be released, because there we wait for the
   11.58   * tasklist_lock to become available.
   11.59   */
   11.60 -#define prepare_arch_switch(rq, next)		\
   11.61 -do {						\
   11.62 -	spin_lock(&(next)->switch_lock);	\
   11.63 -	spin_unlock(&(rq)->lock);		\
   11.64 -} while (0)
   11.65 -#define finish_arch_switch(rq, prev)	spin_unlock_irq(&(prev)->switch_lock)
   11.66 -#define task_running(rq, p) 		((rq)->curr == (p) || spin_is_locked(&(p)->switch_lock))
   11.67 +#define __ARCH_WANT_UNLOCKED_CTXSW
   11.68  
   11.69 +#define ARCH_HAS_PREFETCH_SWITCH_STACK
   11.70  #define ia64_platform_is(x) (strcmp(x, platform_name) == 0)
   11.71  
   11.72  void cpu_idle_wait(void);
   11.73 +void sched_cacheflush(void);
   11.74  
   11.75  #define arch_align_stack(x) (x)
   11.76