[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

RE: [Xen-ia64-devel] [PATCH] ia64 update for 2.6.16-rc2



Hi Fred --

I was traveling for most of last week with unexpectedly
limited access to the internet.  During this time the
core Xen team made several version updates to the -sparse
tree. Alex did a fine job keeping up with the changes so
that Xen/ia64 would continue to work in xen-unstable,
but didn't have a key to sync with xen-ia64-unstable.

I will sync up xen-ia64-unstable with xen-unstable as
soon as Christian applies Alex's update to 2.6.16-rc2.
And I will ensure Alex can back me up in the future
when I am traveling.

Dan

> -----Original Message-----
> From: Yang, Fred [mailto:fred.yang@xxxxxxxxx] 
> Sent: Monday, February 06, 2006 11:21 AM
> To: Williamson, Alex (Linux Kernel Dev); Christian Limpach; 
> Magenheimer, Dan (HP Labs Fort Collins)
> Cc: xen-ia64-devel
> Subject: RE: [Xen-ia64-devel] [PATCH] ia64 update for 2.6.16-rc2
> 
> Dan,
> 
> Are you pushing XenLinux update directly to Xen-unstable.hg without
> updating Xen-ia64-unstable.hg?  When will you update all 
> these XenLinux
> as well as other patches into Xen-ia64-unstable.hg for
> xen-ia64-unstable.hg? Whole community also need to move to 
> the new base.
> 
> -Fred
> 
> Alex Williamson wrote:
> > Hi Christian,
> > 
> >    Here's a patch that updates ia64 to 2.6.16-rc2 on xen-unstable. 
> > This 
> > boots dom0 and domU on an rx2600.  There were still 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.  Thanks,
> > 
> >     Alex
> > 
> > Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>
> > ---
> > 
> >  buildconfigs/linux-defconfig_xen0_ia64             |  101
> >  +++++++++++++-------- 
> buildconfigs/linux-defconfig_xenU_ia64        
> >  |   96 ++++++++++++------- 
> linux-2.6-xen-sparse/arch/ia64/Makefile  
> >  |    7 - linux-2.6-xen-sparse/arch/ia64/kernel/entry.S      |    1
> >  linux-2.6-xen-sparse/arch/ia64/kernel/head.S       |    2
> >  linux-2.6-xen-sparse/arch/ia64/kernel/setup.c      |   26 ++++-
> >  linux-2.6-xen-sparse/include/asm-ia64/hypercall.h  |    4
> >  linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h |    4
> >  linux-2.6-xen-sparse/include/asm-ia64/pal.h        |   23 ++++
> >  linux-2.6-xen-sparse/include/asm-ia64/processor.h  |    9 -
> >  linux-2.6-xen-sparse/include/asm-ia64/system.h     |   27 ++---
> >  11 files changed, 192 insertions(+), 108 deletions(-)
> > 
> > 
> > diff -r 57e6d7218427 buildconfigs/linux-defconfig_xen0_ia64
> > --- a/buildconfigs/linux-defconfig_xen0_ia64        Fri Feb 
>  3 18:45:14 2006
> > +++ b/buildconfigs/linux-defconfig_xen0_ia64        Mon Feb 
>  6 03:56:58 2006
> > @@ -1,7 +1,7 @@
> >  #
> >  # Automatically generated make config: don't edit
> > -# Linux kernel version: 2.6.15-xen0
> > -# Wed Feb  1 13:18:15 2006
> > +# Linux kernel version: 2.6.16-rc2-xen0
> > +# Mon Feb  6 02:48:43 2006
> >  #
> > 
> >  #
> > @@ -24,8 +24,6 @@
> >  # CONFIG_BSD_PROCESS_ACCT_V3 is not set
> >  CONFIG_SYSCTL=y
> >  # CONFIG_AUDIT is not set
> > -CONFIG_HOTPLUG=y
> > -CONFIG_KOBJECT_UEVENT=y
> >  CONFIG_IKCONFIG=y
> >  CONFIG_IKCONFIG_PROC=y
> >  # CONFIG_CPUSETS is not set
> > @@ -35,8 +33,10 @@
> >  CONFIG_KALLSYMS=y
> >  CONFIG_KALLSYMS_ALL=y
> >  CONFIG_KALLSYMS_EXTRA_PASS=y
> > +CONFIG_HOTPLUG=y
> >  CONFIG_PRINTK=y
> >  CONFIG_BUG=y
> > +CONFIG_ELF_CORE=y
> >  CONFIG_BASE_FULL=y
> >  CONFIG_FUTEX=y
> >  CONFIG_EPOLL=y
> > @@ -45,8 +45,10 @@
> >  CONFIG_CC_ALIGN_LABELS=0
> >  CONFIG_CC_ALIGN_LOOPS=0
> >  CONFIG_CC_ALIGN_JUMPS=0
> > +CONFIG_SLAB=y
> >  # CONFIG_TINY_SHMEM is not set
> >  CONFIG_BASE_SMALL=0
> > +# CONFIG_SLOB is not set
> > 
> >  #
> >  # Loadable module support
> > @@ -170,6 +172,7 @@
> >  CONFIG_ACPI_THERMAL=y
> >  CONFIG_ACPI_BLACKLIST_YEAR=0
> >  # CONFIG_ACPI_DEBUG is not set
> > +CONFIG_ACPI_EC=y
> >  CONFIG_ACPI_POWER=y
> >  CONFIG_ACPI_SYSTEM=y
> >  CONFIG_ACPI_CONTAINER=y
> > @@ -247,16 +250,13 @@
> >  #
> >  # CONFIG_NETFILTER_NETLINK is not set
> >  # CONFIG_NF_CONNTRACK is not set
> > +# CONFIG_NETFILTER_XTABLES is not set
> > 
> >  #
> >  # IP: Netfilter Configuration
> >  #
> >  # CONFIG_IP_NF_CONNTRACK is not set
> >  # CONFIG_IP_NF_QUEUE is not set
> > -# CONFIG_IP_NF_IPTABLES is not set
> > -CONFIG_IP_NF_ARPTABLES=y
> > -# CONFIG_IP_NF_ARPFILTER is not set
> > -# CONFIG_IP_NF_ARP_MANGLE is not set
> > 
> >  #
> >  # Bridge: Netfilter Configuration
> > @@ -272,6 +272,11 @@
> >  # SCTP Configuration (EXPERIMENTAL)
> >  #
> >  # CONFIG_IP_SCTP is not set
> > +
> > +#
> > +# TIPC Configuration (EXPERIMENTAL)
> > +#
> > +# CONFIG_TIPC is not set
> >  # CONFIG_ATM is not set
> >  CONFIG_BRIDGE=y
> >  # CONFIG_VLAN_8021Q is not set
> > @@ -471,13 +476,7 @@
> >  CONFIG_SCSI_QLOGIC_FC=y
> >  # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
> >  CONFIG_SCSI_QLOGIC_1280=y
> > -CONFIG_SCSI_QLA2XXX=y
> > -CONFIG_SCSI_QLA21XX=y
> > -CONFIG_SCSI_QLA22XX=y
> > -CONFIG_SCSI_QLA2300=y
> > -CONFIG_SCSI_QLA2322=y
> > -# CONFIG_SCSI_QLA6312 is not set
> > -# CONFIG_SCSI_QLA24XX is not set
> > +# CONFIG_SCSI_QLA_FC is not set
> >  # CONFIG_SCSI_LPFC is not set
> >  # CONFIG_SCSI_DC395x is not set
> >  # CONFIG_SCSI_DC390T is not set
> > @@ -588,12 +587,14 @@
> >  # CONFIG_DL2K is not set
> >  CONFIG_E1000=y
> >  # CONFIG_E1000_NAPI is not set
> > +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
> >  # CONFIG_NS83820 is not set
> >  # CONFIG_HAMACHI is not set
> >  # CONFIG_YELLOWFIN is not set
> >  # CONFIG_R8169 is not set
> >  # CONFIG_SIS190 is not set
> >  # CONFIG_SKGE is not set
> > +# CONFIG_SKY2 is not set
> >  # CONFIG_SK98LIN is not set
> >  # CONFIG_VIA_VELOCITY is not set
> >  CONFIG_TIGON3=y
> > @@ -707,12 +708,15 @@
> >  CONFIG_VT_CONSOLE=y
> >  CONFIG_HW_CONSOLE=y
> >  CONFIG_SERIAL_NONSTANDARD=y
> > +# CONFIG_COMPUTONE is not set
> >  # CONFIG_ROCKETPORT is not set
> >  # CONFIG_CYCLADES is not set
> >  # CONFIG_DIGIEPCA is not set
> > +# CONFIG_MOXA_INTELLIO is not set
> >  # CONFIG_MOXA_SMARTIO is not set
> >  # CONFIG_ISI is not set
> >  # CONFIG_SYNCLINKMP is not set
> > +# CONFIG_SYNCLINK_GT is not set
> >  # CONFIG_N_HDLC is not set
> >  # CONFIG_SPECIALIX is not set
> >  # CONFIG_SX is not set
> > @@ -725,6 +729,7 @@
> >  CONFIG_SERIAL_8250_CONSOLE=y
> >  CONFIG_SERIAL_8250_ACPI=y
> >  CONFIG_SERIAL_8250_NR_UARTS=6
> > +CONFIG_SERIAL_8250_RUNTIME_UARTS=4
> >  CONFIG_SERIAL_8250_EXTENDED=y
> >  CONFIG_SERIAL_8250_SHARE_IRQ=y
> >  # CONFIG_SERIAL_8250_DETECT_IRQ is not set
> > @@ -735,7 +740,6 @@
> >  #
> >  CONFIG_SERIAL_CORE=y
> >  CONFIG_SERIAL_CORE_CONSOLE=y
> > -# CONFIG_SERIAL_JSM is not set
> >  CONFIG_UNIX98_PTYS=y
> >  CONFIG_LEGACY_PTYS=y
> >  CONFIG_LEGACY_PTY_COUNT=256
> > @@ -832,6 +836,12 @@
> >  # CONFIG_I2C_DEBUG_ALGO is not set
> >  # CONFIG_I2C_DEBUG_BUS is not set
> >  # CONFIG_I2C_DEBUG_CHIP is not set
> > +
> > +#
> > +# SPI support
> > +#
> > +# CONFIG_SPI is not set
> > +# CONFIG_SPI_MASTER is not set
> > 
> >  #
> >  # Dallas's 1-wire bus
> > @@ -872,6 +882,7 @@
> >  # CONFIG_SENSORS_SMSC47M1 is not set
> >  # CONFIG_SENSORS_SMSC47B397 is not set
> >  # CONFIG_SENSORS_VIA686A is not set
> > +# CONFIG_SENSORS_VT8231 is not set
> >  # CONFIG_SENSORS_W83781D is not set
> >  # CONFIG_SENSORS_W83792D is not set
> >  # CONFIG_SENSORS_W83L785TS is not set
> > @@ -899,6 +910,7 @@
> >  #
> >  # Video Adapters
> >  #
> > +# CONFIG_VIDEO_ADV_DEBUG is not set
> >  # CONFIG_VIDEO_BT848 is not set
> >  # CONFIG_VIDEO_CPIA is not set
> >  # CONFIG_VIDEO_SAA5246A is not set
> > @@ -960,7 +972,6 @@
> >  # CONFIG_FB_KYRO is not set
> >  # CONFIG_FB_3DFX is not set
> >  # CONFIG_FB_VOODOO1 is not set
> > -# CONFIG_FB_CYBLA is not set
> >  # CONFIG_FB_TRIDENT is not set
> >  # CONFIG_FB_VIRTUAL is not set
> > 
> > @@ -989,8 +1000,6 @@
> >  # Advanced Linux Sound Architecture
> >  #
> >  CONFIG_SND=y
> > -CONFIG_SND_AC97_CODEC=y
> > -CONFIG_SND_AC97_BUS=y
> >  CONFIG_SND_TIMER=y
> >  CONFIG_SND_PCM=y
> >  CONFIG_SND_HWDEP=y
> > @@ -1001,15 +1010,18 @@
> >  CONFIG_SND_MIXER_OSS=y
> >  CONFIG_SND_PCM_OSS=y
> >  CONFIG_SND_SEQUENCER_OSS=y
> > +# CONFIG_SND_DYNAMIC_MINORS is not set
> > +CONFIG_SND_SUPPORT_OLD_API=y
> >  # CONFIG_SND_VERBOSE_PRINTK is not set
> >  # CONFIG_SND_DEBUG is not set
> > -CONFIG_SND_GENERIC_DRIVER=y
> > 
> >  #
> >  # Generic devices
> >  #
> >  CONFIG_SND_MPU401_UART=y
> >  CONFIG_SND_OPL3_LIB=y
> > +CONFIG_SND_AC97_CODEC=y
> > +CONFIG_SND_AC97_BUS=y
> >  CONFIG_SND_DUMMY=y
> >  CONFIG_SND_VIRMIDI=y
> >  CONFIG_SND_MTPAV=y
> > @@ -1019,6 +1031,7 @@
> >  #
> >  # PCI devices
> >  #
> > +# CONFIG_SND_AD1889 is not set
> >  # CONFIG_SND_ALI5451 is not set
> >  CONFIG_SND_ATIIXP=y
> >  # CONFIG_SND_ATIIXP_MODEM is not set
> > @@ -1027,39 +1040,39 @@
> >  # CONFIG_SND_AU8830 is not set
> >  # CONFIG_SND_AZT3328 is not set
> >  # CONFIG_SND_BT87X is not set
> > +# CONFIG_SND_CA0106 is not set
> > +# CONFIG_SND_CMIPCI is not set
> > +# CONFIG_SND_CS4281 is not set
> >  # CONFIG_SND_CS46XX is not set
> > -# CONFIG_SND_CS4281 is not set
> >  # CONFIG_SND_EMU10K1 is not set
> >  # CONFIG_SND_EMU10K1X is not set
> > -# CONFIG_SND_CA0106 is not set
> > -# CONFIG_SND_KORG1212 is not set
> > -# CONFIG_SND_MIXART is not set
> > -# CONFIG_SND_NM256 is not set
> > -# CONFIG_SND_RME32 is not set
> > -# CONFIG_SND_RME96 is not set
> > -# CONFIG_SND_RME9652 is not set
> > -# CONFIG_SND_HDSP is not set
> > -# CONFIG_SND_HDSPM is not set
> > -# CONFIG_SND_TRIDENT is not set
> > -# CONFIG_SND_YMFPCI is not set
> > -# CONFIG_SND_AD1889 is not set
> > -# CONFIG_SND_CMIPCI is not set
> >  # CONFIG_SND_ENS1370 is not set
> >  # CONFIG_SND_ENS1371 is not set
> >  # CONFIG_SND_ES1938 is not set
> >  # CONFIG_SND_ES1968 is not set
> > -# CONFIG_SND_MAESTRO3 is not set
> >  CONFIG_SND_FM801=y
> >  CONFIG_SND_FM801_TEA575X=y
> > +# CONFIG_SND_HDA_INTEL is not set
> > +# CONFIG_SND_HDSP is not set
> > +# CONFIG_SND_HDSPM is not set
> >  # CONFIG_SND_ICE1712 is not set
> >  # CONFIG_SND_ICE1724 is not set
> >  # CONFIG_SND_INTEL8X0 is not set
> >  # CONFIG_SND_INTEL8X0M is not set
> > +# CONFIG_SND_KORG1212 is not set
> > +# CONFIG_SND_MAESTRO3 is not set
> > +# CONFIG_SND_MIXART is not set
> > +# CONFIG_SND_NM256 is not set
> > +# CONFIG_SND_PCXHR is not set
> > +# CONFIG_SND_RME32 is not set
> > +# CONFIG_SND_RME96 is not set
> > +# CONFIG_SND_RME9652 is not set
> >  # CONFIG_SND_SONICVIBES is not set
> > +# CONFIG_SND_TRIDENT is not set
> >  # CONFIG_SND_VIA82XX is not set
> >  # CONFIG_SND_VIA82XX_MODEM is not set
> >  # CONFIG_SND_VX222 is not set
> > -# CONFIG_SND_HDA_INTEL is not set
> > +# CONFIG_SND_YMFPCI is not set
> > 
> >  #
> >  # USB devices
> > @@ -1132,12 +1145,15 @@
> >  # CONFIG_USB_STORAGE_SDDR09 is not set
> >  # CONFIG_USB_STORAGE_SDDR55 is not set
> >  # CONFIG_USB_STORAGE_JUMPSHOT is not set
> > +# CONFIG_USB_STORAGE_ALAUDA is not set
> > +# CONFIG_USB_LIBUSUAL is not set
> > 
> >  #
> >  # USB Input Devices
> >  #
> >  CONFIG_USB_HID=y
> >  CONFIG_USB_HIDINPUT=y
> > +# CONFIG_USB_HIDINPUT_POWERBOOK is not set
> >  # CONFIG_HID_FF is not set
> >  CONFIG_USB_HIDDEV=y
> >  # CONFIG_USB_AIPTEK is not set
> > @@ -1151,6 +1167,7 @@
> >  # CONFIG_USB_YEALINK is not set
> >  # CONFIG_USB_XPAD is not set
> >  # CONFIG_USB_ATI_REMOTE is not set
> > +# CONFIG_USB_ATI_REMOTE2 is not set
> >  # CONFIG_USB_KEYSPAN_REMOTE is not set
> >  # CONFIG_USB_APPLETOUCH is not set
> > 
> > @@ -1166,6 +1183,7 @@
> >  # CONFIG_USB_DABUSB is not set
> >  # CONFIG_USB_VICAM is not set
> >  # CONFIG_USB_DSBR is not set
> > +# CONFIG_USB_ET61X251 is not set
> >  # CONFIG_USB_IBMCAM is not set
> >  # CONFIG_USB_KONICAWC is not set
> >  # CONFIG_USB_OV511 is not set
> > @@ -1232,6 +1250,10 @@
> > 
> >  #
> >  # SN Devices
> > +#
> > +
> > +#
> > +# EDAC - error detection and reporting (RAS)
> >  #
> > 
> >  #
> > @@ -1263,6 +1285,7 @@
> >  # CONFIG_XFS_SECURITY is not set
> >  # CONFIG_XFS_POSIX_ACL is not set
> >  # CONFIG_XFS_RT is not set
> > +# CONFIG_OCFS2_FS is not set
> >  # CONFIG_MINIX_FS is not set
> >  # CONFIG_ROMFS_FS is not set
> >  CONFIG_INOTIFY=y
> > @@ -1301,6 +1324,7 @@
> >  # CONFIG_HUGETLB_PAGE is not set
> >  CONFIG_RAMFS=y
> >  # CONFIG_RELAYFS_FS is not set
> > +# CONFIG_CONFIGFS_FS is not set
> > 
> >  #
> >  # Miscellaneous filesystems
> > @@ -1370,6 +1394,7 @@
> >  CONFIG_SGI_PARTITION=y
> >  # CONFIG_ULTRIX_PARTITION is not set
> >  # CONFIG_SUN_PARTITION is not set
> > +# CONFIG_KARMA_PARTITION is not set
> >  CONFIG_EFI_PARTITION=y
> > 
> >  #
> > @@ -1437,18 +1462,20 @@
> >  # Kernel hacking
> >  #
> >  # CONFIG_PRINTK_TIME is not set
> > +CONFIG_MAGIC_SYSRQ=y
> >  CONFIG_DEBUG_KERNEL=y
> > -CONFIG_MAGIC_SYSRQ=y
> >  CONFIG_LOG_BUF_SHIFT=20
> >  CONFIG_DETECT_SOFTLOCKUP=y
> >  # CONFIG_SCHEDSTATS is not set
> >  # CONFIG_DEBUG_SLAB is not set
> > +CONFIG_DEBUG_MUTEXES=y
> >  # CONFIG_DEBUG_SPINLOCK is not set
> >  # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
> >  # CONFIG_DEBUG_KOBJECT is not set
> >  # CONFIG_DEBUG_INFO is not set
> >  # CONFIG_DEBUG_FS is not set
> >  # CONFIG_DEBUG_VM is not set
> > +CONFIG_FORCED_INLINING=y
> >  # CONFIG_RCU_TORTURE_TEST is not set
> >  CONFIG_IA64_GRANULE_16MB=y
> >  # CONFIG_IA64_GRANULE_64MB is not set
> > diff -r 57e6d7218427 buildconfigs/linux-defconfig_xenU_ia64
> > --- a/buildconfigs/linux-defconfig_xenU_ia64        Fri Feb 
>  3 18:45:14 2006
> > +++ b/buildconfigs/linux-defconfig_xenU_ia64        Mon Feb 
>  6 03:56:58 2006
> > @@ -1,7 +1,7 @@
> >  #
> >  # Automatically generated make config: don't edit
> > -# Linux kernel version: 2.6.15-xenU
> > -# Wed Feb  1 14:19:46 2006
> > +# Linux kernel version: 2.6.16-rc2-xenU
> > +# Mon Feb  6 03:35:30 2006
> >  #
> > 
> >  #
> > @@ -26,8 +26,6 @@
> >  # CONFIG_BSD_PROCESS_ACCT_V3 is not set
> >  CONFIG_SYSCTL=y
> >  # CONFIG_AUDIT is not set
> > -CONFIG_HOTPLUG=y
> > -CONFIG_KOBJECT_UEVENT=y
> >  # CONFIG_IKCONFIG is not set
> >  # CONFIG_CPUSETS is not set
> >  CONFIG_INITRAMFS_SOURCE=""
> > @@ -36,8 +34,10 @@
> >  CONFIG_KALLSYMS=y
> >  # CONFIG_KALLSYMS_ALL is not set
> >  # CONFIG_KALLSYMS_EXTRA_PASS is not set
> > +CONFIG_HOTPLUG=y
> >  CONFIG_PRINTK=y
> >  CONFIG_BUG=y
> > +CONFIG_ELF_CORE=y
> >  CONFIG_BASE_FULL=y
> >  CONFIG_FUTEX=y
> >  CONFIG_EPOLL=y
> > @@ -46,8 +46,10 @@
> >  CONFIG_CC_ALIGN_LABELS=0
> >  CONFIG_CC_ALIGN_LOOPS=0
> >  CONFIG_CC_ALIGN_JUMPS=0
> > +CONFIG_SLAB=y
> >  # CONFIG_TINY_SHMEM is not set
> >  CONFIG_BASE_SMALL=0
> > +# CONFIG_SLOB is not set
> > 
> >  #
> >  # Loadable module support
> > @@ -169,6 +171,7 @@
> >  CONFIG_ACPI_THERMAL=y
> >  CONFIG_ACPI_BLACKLIST_YEAR=0
> >  # CONFIG_ACPI_DEBUG is not set
> > +CONFIG_ACPI_EC=y
> >  CONFIG_ACPI_POWER=y
> >  CONFIG_ACPI_SYSTEM=y
> >  # CONFIG_ACPI_CONTAINER is not set
> > @@ -245,16 +248,13 @@
> >  #
> >  # CONFIG_NETFILTER_NETLINK is not set
> >  # CONFIG_NF_CONNTRACK is not set
> > +# CONFIG_NETFILTER_XTABLES is not set
> > 
> >  #
> >  # IP: Netfilter Configuration
> >  #
> >  # CONFIG_IP_NF_CONNTRACK is not set
> >  # CONFIG_IP_NF_QUEUE is not set
> > -# CONFIG_IP_NF_IPTABLES is not set
> > -CONFIG_IP_NF_ARPTABLES=y
> > -# CONFIG_IP_NF_ARPFILTER is not set
> > -# CONFIG_IP_NF_ARP_MANGLE is not set
> > 
> >  #
> >  # DCCP Configuration (EXPERIMENTAL)
> > @@ -265,6 +265,11 @@
> >  # SCTP Configuration (EXPERIMENTAL)
> >  #
> >  # CONFIG_IP_SCTP is not set
> > +
> > +#
> > +# TIPC Configuration (EXPERIMENTAL)
> > +#
> > +# CONFIG_TIPC is not set
> >  # CONFIG_ATM is not set
> >  # CONFIG_BRIDGE is not set
> >  # CONFIG_VLAN_8021Q is not set
> > @@ -412,13 +417,7 @@
> >  # CONFIG_SCSI_IPR is not set
> >  # CONFIG_SCSI_QLOGIC_FC is not set
> >  CONFIG_SCSI_QLOGIC_1280=y
> > -CONFIG_SCSI_QLA2XXX=y
> > -# CONFIG_SCSI_QLA21XX is not set
> > -# CONFIG_SCSI_QLA22XX is not set
> > -# CONFIG_SCSI_QLA2300 is not set
> > -# CONFIG_SCSI_QLA2322 is not set
> > -# CONFIG_SCSI_QLA6312 is not set
> > -# CONFIG_SCSI_QLA24XX is not set
> > +# CONFIG_SCSI_QLA_FC is not set
> >  # CONFIG_SCSI_LPFC is not set
> >  # CONFIG_SCSI_DC395x is not set
> >  # CONFIG_SCSI_DC390T is not set
> > @@ -519,12 +518,14 @@
> >  # CONFIG_DL2K is not set
> >  CONFIG_E1000=y
> >  # CONFIG_E1000_NAPI is not set
> > +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
> >  # CONFIG_NS83820 is not set
> >  # CONFIG_HAMACHI is not set
> >  # CONFIG_YELLOWFIN is not set
> >  # CONFIG_R8169 is not set
> >  # CONFIG_SIS190 is not set
> >  # CONFIG_SKGE is not set
> > +# CONFIG_SKY2 is not set
> >  # CONFIG_SK98LIN is not set
> >  # CONFIG_VIA_VELOCITY is not set
> >  CONFIG_TIGON3=y
> > @@ -619,6 +620,7 @@
> >  CONFIG_SERIAL_8250_CONSOLE=y
> >  CONFIG_SERIAL_8250_ACPI=y
> >  CONFIG_SERIAL_8250_NR_UARTS=8
> > +CONFIG_SERIAL_8250_RUNTIME_UARTS=4
> >  CONFIG_SERIAL_8250_EXTENDED=y
> >  CONFIG_SERIAL_8250_SHARE_IRQ=y
> >  # CONFIG_SERIAL_8250_DETECT_IRQ is not set
> > @@ -726,6 +728,12 @@
> >  # CONFIG_I2C_DEBUG_ALGO is not set
> >  # CONFIG_I2C_DEBUG_BUS is not set
> >  # CONFIG_I2C_DEBUG_CHIP is not set
> > +
> > +#
> > +# SPI support
> > +#
> > +# CONFIG_SPI is not set
> > +# CONFIG_SPI_MASTER is not set
> > 
> >  #
> >  # Dallas's 1-wire bus
> > @@ -766,6 +774,7 @@
> >  # CONFIG_SENSORS_SMSC47M1 is not set
> >  # CONFIG_SENSORS_SMSC47B397 is not set
> >  # CONFIG_SENSORS_VIA686A is not set
> > +# CONFIG_SENSORS_VT8231 is not set
> >  # CONFIG_SENSORS_W83781D is not set
> >  # CONFIG_SENSORS_W83792D is not set
> >  # CONFIG_SENSORS_W83L785TS is not set
> > @@ -793,6 +802,7 @@
> >  #
> >  # Video Adapters
> >  #
> > +# CONFIG_VIDEO_ADV_DEBUG is not set
> >  # CONFIG_VIDEO_BT848 is not set
> >  # CONFIG_VIDEO_CPIA is not set
> >  # CONFIG_VIDEO_SAA5246A is not set
> > @@ -855,7 +865,6 @@
> >  # CONFIG_FB_KYRO is not set
> >  # CONFIG_FB_3DFX is not set
> >  # CONFIG_FB_VOODOO1 is not set
> > -# CONFIG_FB_CYBLA is not set
> >  # CONFIG_FB_TRIDENT is not set
> >  # CONFIG_FB_PM3 is not set
> >  # CONFIG_FB_VIRTUAL is not set
> > @@ -878,8 +887,6 @@
> >  # Advanced Linux Sound Architecture
> >  #
> >  CONFIG_SND=y
> > -CONFIG_SND_AC97_CODEC=y
> > -CONFIG_SND_AC97_BUS=y
> >  CONFIG_SND_TIMER=y
> >  CONFIG_SND_PCM=y
> >  CONFIG_SND_HWDEP=y
> > @@ -890,6 +897,8 @@
> >  CONFIG_SND_MIXER_OSS=y
> >  CONFIG_SND_PCM_OSS=y
> >  CONFIG_SND_SEQUENCER_OSS=y
> > +# CONFIG_SND_DYNAMIC_MINORS is not set
> > +CONFIG_SND_SUPPORT_OLD_API=y
> >  # CONFIG_SND_VERBOSE_PRINTK is not set
> >  # CONFIG_SND_DEBUG is not set
> > 
> > @@ -898,6 +907,8 @@
> >  #
> >  CONFIG_SND_MPU401_UART=y
> >  CONFIG_SND_OPL3_LIB=y
> > +CONFIG_SND_AC97_CODEC=y
> > +CONFIG_SND_AC97_BUS=y
> >  # CONFIG_SND_DUMMY is not set
> >  # CONFIG_SND_VIRMIDI is not set
> >  # CONFIG_SND_MTPAV is not set
> > @@ -907,6 +918,7 @@
> >  #
> >  # PCI devices
> >  #
> > +# CONFIG_SND_AD1889 is not set
> >  # CONFIG_SND_ALI5451 is not set
> >  # CONFIG_SND_ATIIXP is not set
> >  # CONFIG_SND_ATIIXP_MODEM is not set
> > @@ -915,39 +927,39 @@
> >  # CONFIG_SND_AU8830 is not set
> >  # CONFIG_SND_AZT3328 is not set
> >  # CONFIG_SND_BT87X is not set
> > +# CONFIG_SND_CA0106 is not set
> > +# CONFIG_SND_CMIPCI is not set
> > +# CONFIG_SND_CS4281 is not set
> >  # CONFIG_SND_CS46XX is not set
> > -# CONFIG_SND_CS4281 is not set
> >  # CONFIG_SND_EMU10K1 is not set
> >  # CONFIG_SND_EMU10K1X is not set
> > -# CONFIG_SND_CA0106 is not set
> > -# CONFIG_SND_KORG1212 is not set
> > -# CONFIG_SND_MIXART is not set
> > -# CONFIG_SND_NM256 is not set
> > -# CONFIG_SND_RME32 is not set
> > -# CONFIG_SND_RME96 is not set
> > -# CONFIG_SND_RME9652 is not set
> > -# CONFIG_SND_HDSP is not set
> > -# CONFIG_SND_HDSPM is not set
> > -# CONFIG_SND_TRIDENT is not set
> > -# CONFIG_SND_YMFPCI is not set
> > -# CONFIG_SND_AD1889 is not set
> > -# CONFIG_SND_CMIPCI is not set
> >  # CONFIG_SND_ENS1370 is not set
> >  # CONFIG_SND_ENS1371 is not set
> >  # CONFIG_SND_ES1938 is not set
> >  # CONFIG_SND_ES1968 is not set
> > -# CONFIG_SND_MAESTRO3 is not set
> >  CONFIG_SND_FM801=y
> >  CONFIG_SND_FM801_TEA575X=y
> > +# CONFIG_SND_HDA_INTEL is not set
> > +# CONFIG_SND_HDSP is not set
> > +# CONFIG_SND_HDSPM is not set
> >  # CONFIG_SND_ICE1712 is not set
> >  # CONFIG_SND_ICE1724 is not set
> >  # CONFIG_SND_INTEL8X0 is not set
> >  # CONFIG_SND_INTEL8X0M is not set
> > +# CONFIG_SND_KORG1212 is not set
> > +# CONFIG_SND_MAESTRO3 is not set
> > +# CONFIG_SND_MIXART is not set
> > +# CONFIG_SND_NM256 is not set
> > +# CONFIG_SND_PCXHR is not set
> > +# CONFIG_SND_RME32 is not set
> > +# CONFIG_SND_RME96 is not set
> > +# CONFIG_SND_RME9652 is not set
> >  # CONFIG_SND_SONICVIBES is not set
> > +# CONFIG_SND_TRIDENT is not set
> >  # CONFIG_SND_VIA82XX is not set
> >  # CONFIG_SND_VIA82XX_MODEM is not set
> >  # CONFIG_SND_VX222 is not set
> > -# CONFIG_SND_HDA_INTEL is not set
> > +# CONFIG_SND_YMFPCI is not set
> > 
> >  #
> >  # USB devices
> > @@ -1012,12 +1024,15 @@
> >  # CONFIG_USB_STORAGE_SDDR09 is not set
> >  # CONFIG_USB_STORAGE_SDDR55 is not set
> >  # CONFIG_USB_STORAGE_JUMPSHOT is not set
> > +# CONFIG_USB_STORAGE_ALAUDA is not set
> > +# CONFIG_USB_LIBUSUAL is not set
> > 
> >  #
> >  # USB Input Devices
> >  #
> >  CONFIG_USB_HID=y
> >  CONFIG_USB_HIDINPUT=y
> > +# CONFIG_USB_HIDINPUT_POWERBOOK is not set
> >  # CONFIG_HID_FF is not set
> >  CONFIG_USB_HIDDEV=y
> >  # CONFIG_USB_AIPTEK is not set
> > @@ -1031,6 +1046,7 @@
> >  # CONFIG_USB_YEALINK is not set
> >  # CONFIG_USB_XPAD is not set
> >  # CONFIG_USB_ATI_REMOTE is not set
> > +# CONFIG_USB_ATI_REMOTE2 is not set
> >  # CONFIG_USB_KEYSPAN_REMOTE is not set
> >  # CONFIG_USB_APPLETOUCH is not set
> > 
> > @@ -1046,6 +1062,7 @@
> >  # CONFIG_USB_DABUSB is not set
> >  # CONFIG_USB_VICAM is not set
> >  # CONFIG_USB_DSBR is not set
> > +# CONFIG_USB_ET61X251 is not set
> >  # CONFIG_USB_IBMCAM is not set
> >  # CONFIG_USB_KONICAWC is not set
> >  # CONFIG_USB_OV511 is not set
> > @@ -1111,6 +1128,10 @@
> > 
> >  #
> >  # SN Devices
> > +#
> > +
> > +#
> > +# EDAC - error detection and reporting (RAS)
> >  #
> > 
> >  #
> > @@ -1132,6 +1153,7 @@
> >  # CONFIG_JFS_FS is not set
> >  # CONFIG_FS_POSIX_ACL is not set
> >  # CONFIG_XFS_FS is not set
> > +# CONFIG_OCFS2_FS is not set
> >  # CONFIG_MINIX_FS is not set
> >  # CONFIG_ROMFS_FS is not set
> >  CONFIG_INOTIFY=y
> > @@ -1170,6 +1192,7 @@
> >  # CONFIG_HUGETLB_PAGE is not set
> >  CONFIG_RAMFS=y
> >  # CONFIG_RELAYFS_FS is not set
> > +# CONFIG_CONFIGFS_FS is not set
> > 
> >  #
> >  # Miscellaneous filesystems
> > @@ -1234,6 +1257,7 @@
> >  # CONFIG_SGI_PARTITION is not set
> >  # CONFIG_ULTRIX_PARTITION is not set
> >  # CONFIG_SUN_PARTITION is not set
> > +# CONFIG_KARMA_PARTITION is not set
> >  CONFIG_EFI_PARTITION=y
> > 
> >  #
> > @@ -1301,18 +1325,20 @@
> >  # Kernel hacking
> >  #
> >  # CONFIG_PRINTK_TIME is not set
> > +CONFIG_MAGIC_SYSRQ=y
> >  CONFIG_DEBUG_KERNEL=y
> > -CONFIG_MAGIC_SYSRQ=y
> >  CONFIG_LOG_BUF_SHIFT=17
> >  CONFIG_DETECT_SOFTLOCKUP=y
> >  # CONFIG_SCHEDSTATS is not set
> >  # CONFIG_DEBUG_SLAB is not set
> > +CONFIG_DEBUG_MUTEXES=y
> >  # CONFIG_DEBUG_SPINLOCK is not set
> >  # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
> >  # CONFIG_DEBUG_KOBJECT is not set
> >  # CONFIG_DEBUG_INFO is not set
> >  # CONFIG_DEBUG_FS is not set
> >  # CONFIG_DEBUG_VM is not set
> > +CONFIG_FORCED_INLINING=y
> >  # CONFIG_RCU_TORTURE_TEST is not set
> >  CONFIG_IA64_GRANULE_16MB=y
> >  # CONFIG_IA64_GRANULE_64MB is not set
> > diff -r 57e6d7218427 linux-2.6-xen-sparse/arch/ia64/Makefile
> > --- a/linux-2.6-xen-sparse/arch/ia64/Makefile       Fri Feb 
>  3 18:45:14 2006
> > +++ b/linux-2.6-xen-sparse/arch/ia64/Makefile       Mon Feb 
>  6 03:56:58 2006
> > @@ -25,7 +25,6 @@
> >                -falign-functions=32 -frename-registers
> >  -fno-optimize-sibling-calls CFLAGS_KERNEL  := -mconstant-gp
> > 
> > -GCC_VERSION     := $(call cc-version)
> >  GAS_STATUS = $(shell $(srctree)/arch/ia64/scripts/check-gas "$(CC)"
> >  "$(OBJDUMP)") CPPFLAGS += $(shell
> > $(srctree)/arch/ia64/scripts/toolchain-flags "$(CC)" "$(OBJDUMP)"
> > "$(READELF)")  
> > 
> > @@ -37,11 +36,7 @@
> >             ftp://ftp.hpl.hp.com/pub/linux-ia64/gas-030124.tar.gz)
> >  endif
> > 
> > -ifneq ($(shell if [ $(GCC_VERSION) -lt 0300 ] ; then echo "bad"; fi
> > ;),) 
> > -$(error Sorry, your compiler is too old.  GCC v2.96 is known to
> > generate bad code.) 
> > -endif
> > -
> > -ifeq ($(GCC_VERSION),0304)
> > +ifeq ($(call cc-version),0304)
> >     cflags-$(CONFIG_ITANIUM)        += -mtune=merced
> >     cflags-$(CONFIG_MCKINLEY)       += -mtune=mckinley
> >  endif
> > diff -r 57e6d7218427 linux-2.6-xen-sparse/arch/ia64/kernel/entry.S
> > --- a/linux-2.6-xen-sparse/arch/ia64/kernel/entry.S Fri Feb  3
> > 18:45:14 2006 +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/entry.S
> Mon
> > Feb  6 03:56:58 2006 @@ -1606,5 +1606,6 @@
> >     data8 sys_inotify_init
> >     data8 sys_inotify_add_watch
> >     data8 sys_inotify_rm_watch
> > +   data8 sys_migrate_pages                 // 1280
> > 
> >     .org sys_call_table + 8*NR_syscalls     // guard against
> failures to
> > increase NR_syscalls 
> > diff -r 57e6d7218427 linux-2.6-xen-sparse/arch/ia64/kernel/head.S
> > --- a/linux-2.6-xen-sparse/arch/ia64/kernel/head.S  Fri Feb  3
> > 18:45:14 2006 +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/head.S
> Mon
> > Feb  6 03:56:58 2006 @@ -1064,7 +1064,7 @@
> >      * the clobber lists for spin_lock() in
> include/asm-ia64/spinlock.h.
> >      */
> > 
> > -#if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
> > +#if (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
> > 
> >  GLOBAL_ENTRY(ia64_spinlock_contention_pre3_4)
> >     .prologue
> > diff -r 57e6d7218427 linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
> > --- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c Fri Feb  3
> > 18:45:14 2006 +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
> Mon
> > Feb  6 03:56:58 2006 @@ -43,6 +43,7 @@
> >  #include <linux/initrd.h>
> >  #include <linux/platform.h>
> >  #include <linux/pm.h>
> > +#include <linux/cpufreq.h>
> > 
> >  #include <asm/ia32.h>
> >  #include <asm/machvec.h>
> > @@ -59,6 +60,7 @@
> >  #include <asm/smp.h>
> >  #include <asm/system.h>
> >  #include <asm/unistd.h>
> > +#include <asm/system.h>
> > 
> >  #if defined(CONFIG_SMP) && (IA64_CPU_SIZE > PAGE_SIZE)
> >  # error "struct cpuinfo_ia64 too big!"
> > @@ -521,6 +523,7 @@
> >     char family[32], features[128], *cp, sep;
> >     struct cpuinfo_ia64 *c = v;
> >     unsigned long mask;
> > +   unsigned long proc_freq;
> >     int i;
> > 
> >     mask = c->features;
> > @@ -552,6 +555,10 @@
> >                     *cp++ = sep;
> >             sprintf(cp, " 0x%lx", mask);
> >     }
> > +
> > +   proc_freq = cpufreq_quick_get(cpunum);
> > +   if (!proc_freq)
> > +           proc_freq = c->proc_freq / 1000;
> > 
> >     seq_printf(m,
> >                "processor  : %d\n"
> > @@ -569,7 +576,7 @@
> >                "BogoMIPS   : %lu.%02lu\n",
> >                cpunum, c->vendor, family, c->model, c->revision,
> c->archrev,
> >                features, c->ppn, c->number,
> > -              c->proc_freq / 1000000, c->proc_freq % 1000000,
> > +              proc_freq / 1000, proc_freq % 1000,
> >                c->itc_freq / 1000000, c->itc_freq % 1000000,
> >                lpj*HZ/500000, (lpj*HZ/5000) % 100);
> >  #ifdef CONFIG_SMP
> > @@ -693,6 +700,7 @@
> >  get_max_cacheline_size (void)
> >  {
> >     unsigned long line_size, max = 1;
> > +   unsigned int cache_size = 0;
> >     u64 l, levels, unique_caches;
> >          pal_cache_config_info_t cci;
> >          s64 status;
> > @@ -722,6 +730,8 @@
> >             line_size = 1 << cci.pcci_line_size;
> >             if (line_size > max)
> >                     max = line_size;
> > +           if (cache_size < cci.pcci_cache_size)
> > +                   cache_size = cci.pcci_cache_size;
> >             if (!cci.pcci_unified) {
> >                     status = ia64_pal_cache_config_info(l,
> >                                                 /* cache_type
> (instruction)= */ 1,
> > @@ -738,6 +748,9 @@
> >                     ia64_i_cache_stride_shift = cci.pcci_stride;
> >     }
> >    out:
> > +#ifdef CONFIG_SMP
> > +   max_cache_size = max(max_cache_size, cache_size);
> > +#endif
> >     if (max > ia64_max_cacheline_size)
> >             ia64_max_cacheline_size = max;
> >  }
> > @@ -792,7 +805,7 @@
> >  #endif
> > 
> >     /* Clear the stack memory reserved for pt_regs: */
> > -   memset(ia64_task_regs(current), 0, sizeof(struct pt_regs));
> > +   memset(task_pt_regs(current), 0, sizeof(struct pt_regs));
> > 
> >     ia64_set_kr(IA64_KR_FPU_OWNER, 0);
> > 
> > @@ -868,6 +881,15 @@
> >     pm_idle = default_idle;
> >  }
> > 
> > +/*
> > + * On SMP systems, when the scheduler does migration-cost
> > autodetection, + * it needs a way to flush as much of the CPU's
> > caches as possible. + */
> > +void sched_cacheflush(void)
> > +{
> > +   ia64_sal_cache_flush(3);
> > +}
> > +
> >  void
> >  check_bugs (void)
> >  {
> > diff -r 57e6d7218427 
> linux-2.6-xen-sparse/include/asm-ia64/hypercall.h
> > --- a/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h     Fri Feb
> 3
> > 18:45:14 2006 +++
> > b/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h Mon Feb  6
> >  03:56:58 2006 @@ -30,8 +30,8 @@ #ifndef __HYPERCALL_H__
> >  #define __HYPERCALL_H__
> > 
> > -#include <asm-xen/xen-public/xen.h>
> > -#include <asm-xen/xen-public/sched.h>
> > +#include <xen/interface/xen.h>
> > +#include <xen/interface/sched.h>
> > 
> >  /* FIXME: temp place to hold these page related macros */
> >  #include <asm/page.h>
> > diff -r 57e6d7218427
> > linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h ---
> > a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h        
> Fri Feb  3
> > 18:45:14 2006 +++
> >  b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h       
> Mon Feb  6
> >  03:56:58 2006 @@ -34,8 +34,8 @@ #include <linux/types.h> #include
> >  <linux/kernel.h> #include <linux/version.h>
> > -#include <asm-xen/xen-public/xen.h>
> > -#include <asm-xen/xen-public/dom0_ops.h>
> > +#include <xen/interface/xen.h>
> > +#include <xen/interface/dom0_ops.h>
> >  #include <asm/ptrace.h>
> >  #include <asm/page.h>
> > 
> > diff -r 57e6d7218427 linux-2.6-xen-sparse/include/asm-ia64/pal.h
> > --- a/linux-2.6-xen-sparse/include/asm-ia64/pal.h   Fri Feb  3
> 18:45:14
> > 2006 +++ b/linux-2.6-xen-sparse/include/asm-ia64/pal.h      Mon Feb
> 6
> > 03:56:58 2006 @@ -75,6 +75,8 @@
> >  #define PAL_CACHE_READ             259     /* read tag & data of
> cacheline for
> >  diagnostic testing */ #define PAL_CACHE_WRITE              260
> /* write tag &
> >  data of cacheline for diagnostic testing */ #define
> > PAL_VM_TR_READ              261     /* read contents of translation
> register */
> > +#define PAL_GET_PSTATE             262     /* get the current
> P-state */ +#define
> > PAL_SET_PSTATE              263     /* set the P-state */ 
> > 
> >  #ifndef __ASSEMBLY__
> > 
> > @@ -926,7 +928,7 @@
> >  ia64_pal_cache_flush (u64 cache_type, u64 invalidate, u64 
> *progress,
> >  u64 *vector) {
> >     struct ia64_pal_retval iprv;
> > -   PAL_CALL_IC_OFF(iprv, PAL_CACHE_FLUSH, cache_type, invalidate,
> > *progress); +       PAL_CALL(iprv, PAL_CACHE_FLUSH, 
> cache_type, invalidate,
> >     *progress); if (vector)
> >             *vector = iprv.v0;
> >     *progress = iprv.v1;
> > @@ -1109,6 +1111,25 @@
> >  {
> >     struct ia64_pal_retval iprv;
> >     PAL_CALL_STK(iprv, PAL_HALT_INFO, (unsigned long) power_buf, 0,
> 0);
> > +   return iprv.status;
> > +}
> > +
> > +/* Get the current P-state information */
> > +static inline s64
> > +ia64_pal_get_pstate (u64 *pstate_index)
> > +{
> > +   struct ia64_pal_retval iprv;
> > +   PAL_CALL_STK(iprv, PAL_GET_PSTATE, 0, 0, 0);
> > +   *pstate_index = iprv.v0;
> > +   return iprv.status;
> > +}
> > +
> > +/* Set the P-state */
> > +static inline s64
> > +ia64_pal_set_pstate (u64 pstate_index)
> > +{
> > +   struct ia64_pal_retval iprv;
> > +   PAL_CALL_STK(iprv, PAL_SET_PSTATE, pstate_index, 0, 0);
> >     return iprv.status;
> >  }
> > 
> > diff -r 57e6d7218427 
> linux-2.6-xen-sparse/include/asm-ia64/processor.h
> > --- a/linux-2.6-xen-sparse/include/asm-ia64/processor.h     Fri Feb
> 3
> > 18:45:14 2006 +++
> > b/linux-2.6-xen-sparse/include/asm-ia64/processor.h Mon Feb  6
> >  03:56:58 2006 @@ -21,16 +21,13 @@ #include <asm/ustack.h>
> >  #include <asm/privop.h>
> > 
> > -/* Our arch specific arch_init_sched_domain is in
> > arch/ia64/kernel/domain.c */ 
> > -#define ARCH_HAS_SCHED_DOMAIN
> > -
> >  #define IA64_NUM_DBG_REGS  8
> >  /*
> >   * Limits for PMC and PMD are set to less than maximum architected
> > values 
> >   * but should be sufficient for a while
> >   */
> > -#define IA64_NUM_PMC_REGS  32
> > -#define IA64_NUM_PMD_REGS  32
> > +#define IA64_NUM_PMC_REGS  64
> > +#define IA64_NUM_PMD_REGS  64
> > 
> >  #define DEFAULT_MAP_BASE   __IA64_UL_CONST(0x2000000000000000)
> >  #define DEFAULT_TASK_SIZE  __IA64_UL_CONST(0xa000000000000000)
> > @@ -356,7 +353,7 @@
> >  /* Return instruction pointer of blocked task TSK.  */
> >  #define KSTK_EIP(tsk)                                      \
> >    ({                                                       \
> > -   struct pt_regs *_regs = ia64_task_regs(tsk);    \
> > +   struct pt_regs *_regs = task_pt_regs(tsk);      \
> >     _regs->cr_iip + ia64_psr(_regs)->ri;            \
> >    })
> > 
> > diff -r 57e6d7218427 linux-2.6-xen-sparse/include/asm-ia64/system.h
> > --- a/linux-2.6-xen-sparse/include/asm-ia64/system.h        
> Fri Feb  3
> > 18:45:14 2006 +++
> > b/linux-2.6-xen-sparse/include/asm-ia64/system.h    Mon Feb  6
> 03:56:58
> >  2006 @@ -19,12 +19,13 @@ #include <asm/pal.h>
> >  #include <asm/percpu.h>
> > 
> > -#define GATE_ADDR          __IA64_UL_CONST(0xa000000000000000)
> > +#define GATE_ADDR          RGN_BASE(RGN_GATE)
> > +
> >  /*
> >   * 0xa000000000000000+2*PERCPU_PAGE_SIZE
> >   * - 0xa000000000000000+3*PERCPU_PAGE_SIZE remain unmapped (guard
> >   page) */
> > -#define KERNEL_START                
> __IA64_UL_CONST(0xa000000100000000)
> > +#define KERNEL_START                (GATE_ADDR+0x100000000)
> >  #define PERCPU_ADDR                (-PERCPU_PAGE_SIZE)
> > 
> >  #ifndef __ASSEMBLY__
> > @@ -183,8 +184,6 @@
> > 
> >  #ifdef __KERNEL__
> > 
> > -#define prepare_to_switch()    do { } while(0)
> > -
> >  #ifdef CONFIG_IA32_SUPPORT
> >  # define IS_IA32_PROCESS(regs)     (ia64_psr(regs)->is != 0)
> >  #else
> > @@ -220,14 +219,14 @@
> > 
> >  #define IA64_HAS_EXTRA_STATE(t)
> \
> >     ((t)->thread.flags &
> (IA64_THREAD_DBG_VALID|IA64_THREAD_PM_VALID)  \
> > -    || IS_IA32_PROCESS(ia64_task_regs(t)) || PERFMON_IS_SYSWIDE())
> > +    || IS_IA32_PROCESS(task_pt_regs(t)) || PERFMON_IS_SYSWIDE())
> > 
> >  #define __switch_to(prev,next,last) do {
> \
> >     if (IA64_HAS_EXTRA_STATE(prev))
> \
> >             ia64_save_extra(prev);
> \
> >     if (IA64_HAS_EXTRA_STATE(next))
> \
> >             ia64_load_extra(next);
> \
> > -   ia64_psr(ia64_task_regs(next))->dfh =
> > !ia64_is_local_fpu_owner(next);                      \
> >     +       ia64_psr(task_pt_regs(next))->dfh =
> >  !ia64_is_local_fpu_owner(next);                     \ (last) =
> > ia64_switch_to((next));
> \ } while (0) 
> > 
> > @@ -239,8 +238,8 @@
> >   * the latest fph state from another CPU.  In other words: eager
> >   save, lazy restore. */
> >  # define switch_to(prev,next,last) do {
> \
> > -   if (ia64_psr(ia64_task_regs(prev))->mfh &&
> > ia64_is_local_fpu_owner(prev)) {                            \ 
> > -           ia64_psr(ia64_task_regs(prev))->mfh = 0;
> \
> > +   if (ia64_psr(task_pt_regs(prev))->mfh &&
> > ia64_is_local_fpu_owner(prev)) {                            \
> >             +               ia64_psr(task_pt_regs(prev))->mfh = 0;
> \ (prev)->thread.flags
> >             |= IA64_THREAD_FPH_VALID;                       \
> >     __ia64_save_fpu((prev)->thread.fph);
> \ }
> \
> > @@ -274,17 +273,13 @@
> >   * of that CPU which will not be released, because there 
> we wait for
> > the 
> >   * tasklist_lock to become available.
> >   */
> > -#define prepare_arch_switch(rq, next)              \
> > -do {                                               \
> > -   spin_lock(&(next)->switch_lock);        \
> > -   spin_unlock(&(rq)->lock);               \
> > -} while (0)
> > -#define finish_arch_switch(rq,
> > prev)       spin_unlock_irq(&(prev)->switch_lock) 
> > -#define task_running(rq, p)                ((rq)->curr == (p) ||
> > spin_is_locked(&(p)->switch_lock)) -
> > +#define __ARCH_WANT_UNLOCKED_CTXSW
> > +
> > +#define ARCH_HAS_PREFETCH_SWITCH_STACK
> >  #define ia64_platform_is(x) (strcmp(x, platform_name) == 0)
> > 
> >  void cpu_idle_wait(void);
> > +void sched_cacheflush(void);
> > 
> >  #define arch_align_stack(x) (x)
> > 
> > 
> > 
> > 
> > _______________________________________________
> > Xen-ia64-devel mailing list
> > Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
> > http://lists.xensource.com/xen-ia64-devel
> 
> 

_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ia64-devel


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.