Pull error-inject into release branch

diff --combined arch/ia64/Kconfig
index e19185d,f1e7cc1..0986658
--- 1/arch/ia64/Kconfig
--- 2/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@@ -11,9 -11,6 +11,9 @@@ menu "Processor type and features
  
  config IA64
        bool
 +      select PCI if (!IA64_HP_SIM)
 +      select ACPI if (!IA64_HP_SIM)
 +      select PM if (!IA64_HP_SIM)
        default y
        help
          The Itanium Processor Family is Intel's 64-bit successor to
@@@ -23,19 -20,15 +23,19 @@@
  
  config 64BIT
        bool
 +      select ATA_NONSTANDARD if ATA
        default y
  
 +config ZONE_DMA
 +      def_bool y
 +      depends on !IA64_SGI_SN2
 +
  config MMU
        bool
        default y
  
  config SWIOTLB
         bool
 -       default y
  
  config RWSEM_XCHGADD_ALGORITHM
        bool
@@@ -91,9 -84,10 +91,9 @@@ choic
  
  config IA64_GENERIC
        bool "generic"
 -      select ACPI
 -      select PCI
        select NUMA
        select ACPI_NUMA
 +      select SWIOTLB
        help
          This selects the system type of your hardware.  A "generic" kernel
          will run on any supported IA-64 system.  However, if you configure
@@@ -110,7 -104,6 +110,7 @@@
  
  config IA64_DIG
        bool "DIG-compliant"
 +      select SWIOTLB
  
  config IA64_HP_ZX1
        bool "HP-zx1/sx1000"
@@@ -120,7 -113,6 +120,7 @@@
  
  config IA64_HP_ZX1_SWIOTLB
        bool "HP-zx1/sx1000 with software I/O TLB"
 +      select SWIOTLB
        help
          Build a kernel that runs on HP zx1 and sx1000 systems even when they
          have broken PCI devices which cannot DMA to full 32 bits.  Apart
@@@ -139,7 -131,6 +139,7 @@@ config IA64_SGI_SN
  
  config IA64_HP_SIM
        bool "Ski-simulator"
 +      select SWIOTLB
  
  endchoice
  
@@@ -438,6 -429,16 +438,16 @@@ config IA64_PALINF
          To use this option, you have to ensure that the "/proc file system
          support" (CONFIG_PROC_FS) is enabled, too.
  
+ config IA64_MC_ERR_INJECT
+       tristate "MC error injection support"
+       help
+         Selets whether support for MC error injection. By enabling the
+         support, kernel provide sysfs interface for user application to
+         call MC error injection PAL procedure to inject various errors.
+         This is a useful tool for MCA testing.
+ 
+         If you're unsure, do not select this option.
+ 
  config SGI_SN
        def_bool y if (IA64_SGI_SN2 || IA64_GENERIC)
  

diff --combined arch/ia64/defconfig
index 153bfdc,327e1f5..90bd960
--- 1/arch/ia64/defconfig
--- 2/arch/ia64/defconfig
+++ b/arch/ia64/defconfig
@@@ -1,9 -1,8 +1,9 @@@
  #
  # Automatically generated make config: don't edit
 -# Linux kernel version: 2.6.16-rc5
 -# Mon Feb 27 16:02:28 2006
 +# Linux kernel version: 2.6.21-rc3
 +# Thu Mar  8 11:01:03 2007
  #
 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
  
  #
  # Code maturity level options
@@@ -19,24 -18,16 +19,24 @@@ CONFIG_LOCALVERSION="
  CONFIG_LOCALVERSION_AUTO=y
  CONFIG_SWAP=y
  CONFIG_SYSVIPC=y
 +# CONFIG_IPC_NS is not set
 +CONFIG_SYSVIPC_SYSCTL=y
  CONFIG_POSIX_MQUEUE=y
  # CONFIG_BSD_PROCESS_ACCT is not set
 -CONFIG_SYSCTL=y
 +# CONFIG_TASKSTATS is not set
 +# CONFIG_UTS_NS is not set
  # CONFIG_AUDIT is not set
  CONFIG_IKCONFIG=y
  CONFIG_IKCONFIG_PROC=y
  # CONFIG_CPUSETS is not set
 +CONFIG_SYSFS_DEPRECATED=y
 +# CONFIG_RELAY is not set
 +CONFIG_BLK_DEV_INITRD=y
  CONFIG_INITRAMFS_SOURCE=""
  CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 +CONFIG_SYSCTL=y
  # CONFIG_EMBEDDED is not set
 +CONFIG_SYSCTL_SYSCALL=y
  CONFIG_KALLSYMS=y
  CONFIG_KALLSYMS_ALL=y
  # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@@ -48,9 -39,11 +48,9 @@@ CONFIG_BASE_FULL=
  CONFIG_FUTEX=y
  CONFIG_EPOLL=y
  CONFIG_SHMEM=y
 -CONFIG_CC_ALIGN_FUNCTIONS=0
 -CONFIG_CC_ALIGN_LABELS=0
 -CONFIG_CC_ALIGN_LOOPS=0
 -CONFIG_CC_ALIGN_JUMPS=0
  CONFIG_SLAB=y
 +CONFIG_VM_EVENT_COUNTERS=y
 +CONFIG_RT_MUTEXES=y
  # CONFIG_TINY_SHMEM is not set
  CONFIG_BASE_SMALL=0
  # CONFIG_SLOB is not set
@@@ -61,6 -54,7 +61,6 @@@
  CONFIG_MODULES=y
  CONFIG_MODULE_UNLOAD=y
  # CONFIG_MODULE_FORCE_UNLOAD is not set
 -CONFIG_OBSOLETE_MODPARM=y
  CONFIG_MODVERSIONS=y
  # CONFIG_MODULE_SRCVERSION_ALL is not set
  CONFIG_KMOD=y
@@@ -69,8 -63,6 +69,8 @@@ CONFIG_STOP_MACHINE=
  #
  # Block layer
  #
 +CONFIG_BLOCK=y
 +# CONFIG_BLK_DEV_IO_TRACE is not set
  
  #
  # IO Schedulers
@@@ -90,20 -82,15 +90,20 @@@ CONFIG_DEFAULT_IOSCHED="anticipatory
  #
  CONFIG_IA64=y
  CONFIG_64BIT=y
 +CONFIG_ZONE_DMA=y
  CONFIG_MMU=y
  CONFIG_SWIOTLB=y
  CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 +# CONFIG_ARCH_HAS_ILOG2_U32 is not set
 +# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 +CONFIG_GENERIC_FIND_NEXT_BIT=y
  CONFIG_GENERIC_CALIBRATE_DELAY=y
  CONFIG_TIME_INTERPOLATION=y
 +CONFIG_DMI=y
  CONFIG_EFI=y
  CONFIG_GENERIC_IOMAP=y
  CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 -CONFIG_DMA_IS_DMA32=y
 +CONFIG_AUDIT_ARCH=y
  CONFIG_IA64_GENERIC=y
  # CONFIG_IA64_DIG is not set
  # CONFIG_IA64_HP_ZX1 is not set
@@@ -120,7 -107,6 +120,7 @@@ CONFIG_PGTABLE_3=
  # CONFIG_PGTABLE_4 is not set
  # CONFIG_HZ_100 is not set
  CONFIG_HZ_250=y
 +# CONFIG_HZ_300 is not set
  # CONFIG_HZ_1000 is not set
  CONFIG_HZ=250
  CONFIG_IA64_L1_CACHE_SHIFT=7
@@@ -130,10 -116,9 +130,10 @@@ CONFIG_IOSAPIC=
  CONFIG_FORCE_MAX_ZONEORDER=17
  CONFIG_SMP=y
  CONFIG_NR_CPUS=512
 -CONFIG_IA64_NR_NODES=256
  CONFIG_HOTPLUG_CPU=y
 +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
  # CONFIG_SCHED_SMT is not set
 +# CONFIG_PERMIT_BSP_REMOVE is not set
  # CONFIG_PREEMPT is not set
  CONFIG_SELECT_MEMORY_MODEL=y
  # CONFIG_FLATMEM_MANUAL is not set
@@@ -145,34 -130,22 +145,35 @@@ CONFIG_NEED_MULTIPLE_NODES=
  # CONFIG_SPARSEMEM_STATIC is not set
  CONFIG_SPLIT_PTLOCK_CPUS=4
  CONFIG_MIGRATION=y
 +CONFIG_RESOURCES_64BIT=y
 +CONFIG_ZONE_DMA_FLAG=1
  CONFIG_ARCH_SELECT_MEMORY_MODEL=y
  CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
  CONFIG_ARCH_FLATMEM_ENABLE=y
  CONFIG_ARCH_SPARSEMEM_ENABLE=y
  CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
  CONFIG_NUMA=y
 +CONFIG_NODES_SHIFT=10
 +CONFIG_ARCH_POPULATES_NODE_MAP=y
  CONFIG_VIRTUAL_MEM_MAP=y
  CONFIG_HOLES_IN_ZONE=y
  CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
 +CONFIG_HAVE_ARCH_NODEDATA_EXTENSION=y
  CONFIG_IA32_SUPPORT=y
  CONFIG_COMPAT=y
  CONFIG_IA64_MCA_RECOVERY=y
  CONFIG_PERFMON=y
  CONFIG_IA64_PALINFO=y
+ # CONFIG_MC_ERR_INJECT is not set
  CONFIG_SGI_SN=y
 +# CONFIG_IA64_ESI is not set
 +
 +#
 +# SN Devices
 +#
 +CONFIG_SGI_IOC3=m
 +CONFIG_KEXEC=y
 +CONFIG_CRASH_DUMP=y
  
  #
  # Firmware Drivers
@@@ -188,16 -161,13 +189,16 @@@ CONFIG_BINFMT_MISC=
  CONFIG_PM=y
  CONFIG_PM_LEGACY=y
  # CONFIG_PM_DEBUG is not set
 +# CONFIG_PM_SYSFS_DEPRECATED is not set
  
  #
  # ACPI (Advanced Configuration and Power Interface) Support
  #
  CONFIG_ACPI=y
 +CONFIG_ACPI_PROCFS=y
  CONFIG_ACPI_BUTTON=m
  CONFIG_ACPI_FAN=m
 +# CONFIG_ACPI_DOCK is not set
  CONFIG_ACPI_PROCESSOR=m
  CONFIG_ACPI_HOTPLUG_CPU=y
  CONFIG_ACPI_THERMAL=m
@@@ -219,8 -189,8 +220,8 @@@ CONFIG_ACPI_CONTAINER=
  #
  CONFIG_PCI=y
  CONFIG_PCI_DOMAINS=y
 +# CONFIG_PCIEPORTBUS is not set
  # CONFIG_PCI_MSI is not set
 -CONFIG_PCI_LEGACY_PROC=y
  # CONFIG_PCI_DEBUG is not set
  
  #
@@@ -251,10 -221,6 +252,10 @@@ CONFIG_NET=
  CONFIG_PACKET=y
  # CONFIG_PACKET_MMAP is not set
  CONFIG_UNIX=y
 +CONFIG_XFRM=y
 +# CONFIG_XFRM_USER is not set
 +# CONFIG_XFRM_SUB_POLICY is not set
 +# CONFIG_XFRM_MIGRATE is not set
  # CONFIG_NET_KEY is not set
  CONFIG_INET=y
  CONFIG_IP_MULTICAST=y
@@@ -269,21 -235,12 +270,21 @@@ CONFIG_SYN_COOKIES=
  # CONFIG_INET_AH is not set
  # CONFIG_INET_ESP is not set
  # CONFIG_INET_IPCOMP is not set
 +# CONFIG_INET_XFRM_TUNNEL is not set
  # CONFIG_INET_TUNNEL is not set
 +CONFIG_INET_XFRM_MODE_TRANSPORT=y
 +CONFIG_INET_XFRM_MODE_TUNNEL=y
 +CONFIG_INET_XFRM_MODE_BEET=y
  CONFIG_INET_DIAG=y
  CONFIG_INET_TCP_DIAG=y
  # CONFIG_TCP_CONG_ADVANCED is not set
 -CONFIG_TCP_CONG_BIC=y
 +CONFIG_TCP_CONG_CUBIC=y
 +CONFIG_DEFAULT_TCP_CONG="cubic"
 +# CONFIG_TCP_MD5SIG is not set
  # CONFIG_IPV6 is not set
 +# CONFIG_INET6_XFRM_TUNNEL is not set
 +# CONFIG_INET6_TUNNEL is not set
 +# CONFIG_NETWORK_SECMARK is not set
  # CONFIG_NETFILTER is not set
  
  #
@@@ -309,6 -266,7 +310,6 @@@
  # CONFIG_ATALK is not set
  # CONFIG_X25 is not set
  # CONFIG_LAPB is not set
 -# CONFIG_NET_DIVERT is not set
  # CONFIG_ECONET is not set
  # CONFIG_WAN_ROUTER is not set
  
@@@ -337,8 -295,6 +338,8 @@@ CONFIG_STANDALONE=
  CONFIG_PREVENT_FIRMWARE_BUILD=y
  CONFIG_FW_LOADER=m
  # CONFIG_DEBUG_DRIVER is not set
 +# CONFIG_DEBUG_DEVRES is not set
 +# CONFIG_SYS_HYPERVISOR is not set
  
  #
  # Connector - unified userspace <-> kernelspace linker
@@@ -382,16 -338,10 +383,16 @@@ CONFIG_BLK_DEV_NBD=
  CONFIG_BLK_DEV_RAM=y
  CONFIG_BLK_DEV_RAM_COUNT=16
  CONFIG_BLK_DEV_RAM_SIZE=4096
 -CONFIG_BLK_DEV_INITRD=y
 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
  # CONFIG_CDROM_PKTCDVD is not set
  # CONFIG_ATA_OVER_ETH is not set
  
 +#
 +# Misc devices
 +#
 +CONFIG_SGI_IOC4=y
 +# CONFIG_TIFM_CORE is not set
 +
  #
  # ATA/ATAPI/MFM/RLL support
  #
@@@ -409,7 -359,6 +410,7 @@@ CONFIG_BLK_DEV_IDECD=
  # CONFIG_BLK_DEV_IDETAPE is not set
  CONFIG_BLK_DEV_IDEFLOPPY=y
  CONFIG_BLK_DEV_IDESCSI=m
 +# CONFIG_BLK_DEV_IDEACPI is not set
  # CONFIG_IDE_TASK_IOCTL is not set
  
  #
@@@ -436,10 -385,8 +437,10 @@@ CONFIG_BLK_DEV_CMD64X=
  # CONFIG_BLK_DEV_CS5530 is not set
  # CONFIG_BLK_DEV_HPT34X is not set
  # CONFIG_BLK_DEV_HPT366 is not set
 +# CONFIG_BLK_DEV_JMICRON is not set
  # CONFIG_BLK_DEV_SC1200 is not set
  CONFIG_BLK_DEV_PIIX=y
 +# CONFIG_BLK_DEV_IT8213 is not set
  # CONFIG_BLK_DEV_IT821X is not set
  # CONFIG_BLK_DEV_NS87415 is not set
  # CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@@ -450,7 -397,6 +451,7 @@@ CONFIG_BLK_DEV_SGIIOC4=
  # CONFIG_BLK_DEV_SLC90E66 is not set
  # CONFIG_BLK_DEV_TRM290 is not set
  # CONFIG_BLK_DEV_VIA82CXXX is not set
 +# CONFIG_BLK_DEV_TC86C001 is not set
  # CONFIG_IDE_ARM is not set
  CONFIG_BLK_DEV_IDEDMA=y
  # CONFIG_IDEDMA_IVB is not set
@@@ -462,8 -408,6 +463,8 @@@ CONFIG_IDEDMA_AUTO=
  #
  # CONFIG_RAID_ATTRS is not set
  CONFIG_SCSI=y
 +# CONFIG_SCSI_TGT is not set
 +CONFIG_SCSI_NETLINK=y
  CONFIG_SCSI_PROC_FS=y
  
  #
@@@ -483,16 -427,14 +484,16 @@@ CONFIG_CHR_DEV_SG=
  # CONFIG_SCSI_MULTI_LUN is not set
  # CONFIG_SCSI_CONSTANTS is not set
  # CONFIG_SCSI_LOGGING is not set
 +# CONFIG_SCSI_SCAN_ASYNC is not set
  
  #
 -# SCSI Transport Attributes
 +# SCSI Transports
  #
  CONFIG_SCSI_SPI_ATTRS=y
  CONFIG_SCSI_FC_ATTRS=y
  # CONFIG_SCSI_ISCSI_ATTRS is not set
  # CONFIG_SCSI_SAS_ATTRS is not set
 +# CONFIG_SCSI_SAS_LIBSAS is not set
  
  #
  # SCSI low-level drivers
@@@ -505,36 -447,43 +506,36 @@@
  # CONFIG_SCSI_AIC7XXX is not set
  # CONFIG_SCSI_AIC7XXX_OLD is not set
  # CONFIG_SCSI_AIC79XX is not set
 +# CONFIG_SCSI_AIC94XX is not set
 +# CONFIG_SCSI_ARCMSR is not set
  # CONFIG_MEGARAID_NEWGEN is not set
  # CONFIG_MEGARAID_LEGACY is not set
  # CONFIG_MEGARAID_SAS is not set
 -CONFIG_SCSI_SATA=y
 -# CONFIG_SCSI_SATA_AHCI is not set
 -# CONFIG_SCSI_SATA_SVW is not set
 -# CONFIG_SCSI_ATA_PIIX is not set
 -# CONFIG_SCSI_SATA_MV is not set
 -# CONFIG_SCSI_SATA_NV is not set
 -# CONFIG_SCSI_PDC_ADMA is not set
 -# CONFIG_SCSI_SATA_QSTOR is not set
 -# CONFIG_SCSI_SATA_PROMISE is not set
 -# CONFIG_SCSI_SATA_SX4 is not set
 -# CONFIG_SCSI_SATA_SIL is not set
 -# CONFIG_SCSI_SATA_SIL24 is not set
 -# CONFIG_SCSI_SATA_SIS is not set
 -# CONFIG_SCSI_SATA_ULI is not set
 -# CONFIG_SCSI_SATA_VIA is not set
 -CONFIG_SCSI_SATA_VITESSE=y
 +# CONFIG_SCSI_HPTIOP is not set
  # CONFIG_SCSI_DMX3191D is not set
  # CONFIG_SCSI_FUTURE_DOMAIN is not set
  # CONFIG_SCSI_IPS is not set
  # CONFIG_SCSI_INITIO is not set
  # CONFIG_SCSI_INIA100 is not set
 +# CONFIG_SCSI_STEX is not set
  CONFIG_SCSI_SYM53C8XX_2=y
  CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
  CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
  CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 -# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
 -# CONFIG_SCSI_IPR is not set
 -# CONFIG_SCSI_QLOGIC_FC is not set
 +CONFIG_SCSI_SYM53C8XX_MMIO=y
  CONFIG_SCSI_QLOGIC_1280=y
  # CONFIG_SCSI_QLA_FC is not set
 +# CONFIG_SCSI_QLA_ISCSI is not set
  # CONFIG_SCSI_LPFC is not set
  # CONFIG_SCSI_DC395x is not set
  # CONFIG_SCSI_DC390T is not set
  # CONFIG_SCSI_DEBUG is not set
 +# CONFIG_SCSI_SRP is not set
 +
 +#
 +# Serial ATA (prod) and Parallel ATA (experimental) drivers
 +#
 +# CONFIG_ATA is not set
  
  #
  # Multi-device support (RAID and LVM)
@@@ -545,11 -494,11 +546,11 @@@ CONFIG_MD_LINEAR=
  CONFIG_MD_RAID0=m
  CONFIG_MD_RAID1=m
  # CONFIG_MD_RAID10 is not set
 -CONFIG_MD_RAID5=m
 -CONFIG_MD_RAID6=m
 +# CONFIG_MD_RAID456 is not set
  CONFIG_MD_MULTIPATH=m
  # CONFIG_MD_FAULTY is not set
  CONFIG_BLK_DEV_DM=m
 +# CONFIG_DM_DEBUG is not set
  CONFIG_DM_CRYPT=m
  CONFIG_DM_SNAPSHOT=m
  CONFIG_DM_MIRROR=m
@@@ -639,7 -588,6 +640,7 @@@ CONFIG_E100=
  # CONFIG_EPIC100 is not set
  # CONFIG_SUNDANCE is not set
  # CONFIG_VIA_RHINE is not set
 +# CONFIG_SC92031 is not set
  
  #
  # Ethernet (1000 Mbit)
@@@ -660,18 -608,13 +661,18 @@@ CONFIG_E1000=
  # CONFIG_VIA_VELOCITY is not set
  CONFIG_TIGON3=y
  # CONFIG_BNX2 is not set
 +# CONFIG_QLA3XXX is not set
 +# CONFIG_ATL1 is not set
  
  #
  # Ethernet (10000 Mbit)
  #
  # CONFIG_CHELSIO_T1 is not set
 +# CONFIG_CHELSIO_T3 is not set
  # CONFIG_IXGB is not set
  # CONFIG_S2IO is not set
 +# CONFIG_MYRI10GE is not set
 +# CONFIG_NETXEN_NIC is not set
  
  #
  # Token Ring devices
@@@ -713,7 -656,6 +714,7 @@@ CONFIG_NET_POLL_CONTROLLER=
  # Input device support
  #
  CONFIG_INPUT=y
 +# CONFIG_INPUT_FF_MEMLESS is not set
  
  #
  # Userland interfaces
@@@ -736,7 -678,6 +737,7 @@@ CONFIG_KEYBOARD_ATKBD=
  # CONFIG_KEYBOARD_LKKBD is not set
  # CONFIG_KEYBOARD_XTKBD is not set
  # CONFIG_KEYBOARD_NEWTON is not set
 +# CONFIG_KEYBOARD_STOWAWAY is not set
  CONFIG_INPUT_MOUSE=y
  CONFIG_MOUSE_PS2=y
  # CONFIG_MOUSE_SERIAL is not set
@@@ -766,7 -707,6 +767,7 @@@ CONFIG_GAMEPORT=
  CONFIG_VT=y
  CONFIG_VT_CONSOLE=y
  CONFIG_HW_CONSOLE=y
 +# CONFIG_VT_HW_CONSOLE_BINDING is not set
  CONFIG_SERIAL_NONSTANDARD=y
  # CONFIG_COMPUTONE is not set
  # CONFIG_ROCKETPORT is not set
@@@ -774,14 -714,12 +775,14 @@@
  # CONFIG_DIGIEPCA is not set
  # CONFIG_MOXA_INTELLIO is not set
  # CONFIG_MOXA_SMARTIO is not set
 +# CONFIG_MOXA_SMARTIO_NEW 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
 +# CONFIG_RIO is not set
  # CONFIG_STALDRV is not set
  CONFIG_SGI_SNSC=y
  CONFIG_SGI_TIOCX=y
@@@ -792,8 -730,7 +793,8 @@@ CONFIG_SGI_MBCS=
  #
  CONFIG_SERIAL_8250=y
  CONFIG_SERIAL_8250_CONSOLE=y
 -CONFIG_SERIAL_8250_ACPI=y
 +CONFIG_SERIAL_8250_PCI=y
 +CONFIG_SERIAL_8250_PNP=y
  CONFIG_SERIAL_8250_NR_UARTS=6
  CONFIG_SERIAL_8250_RUNTIME_UARTS=4
  CONFIG_SERIAL_8250_EXTENDED=y
@@@ -828,6 -765,10 +829,6 @@@ CONFIG_EFI_RTC=
  # CONFIG_DTLK is not set
  # CONFIG_R3964 is not set
  # CONFIG_APPLICOM is not set
 -
 -#
 -# Ftape, the floppy tape device driver
 -#
  CONFIG_AGP=m
  CONFIG_AGP_I460=m
  CONFIG_AGP_HP_ZX1=m
@@@ -852,6 -793,7 +853,6 @@@ CONFIG_MMTIMER=
  # TPM devices
  #
  # CONFIG_TCG_TPM is not set
 -# CONFIG_TELCLOCK is not set
  
  #
  # I2C support
@@@ -874,16 -816,16 +875,16 @@@
  #
  CONFIG_HWMON=y
  # CONFIG_HWMON_VID is not set
 +# CONFIG_SENSORS_ABITUGURU is not set
  # CONFIG_SENSORS_F71805F is not set
 +# CONFIG_SENSORS_PC87427 is not set
 +# CONFIG_SENSORS_VT1211 is not set
  # CONFIG_HWMON_DEBUG_CHIP is not set
  
  #
 -# Misc devices
 -#
 -
 -#
 -# Multimedia Capabilities Port drivers
 +# Multifunction device drivers
  #
 +# CONFIG_MFD_SM501 is not set
  
  #
  # Multimedia devices
@@@ -894,19 -836,16 +895,19 @@@
  # Digital Video Broadcasting Devices
  #
  # CONFIG_DVB is not set
 +# CONFIG_USB_DABUSB is not set
  
  #
  # Graphics support
  #
 +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
  # CONFIG_FB is not set
  
  #
  # Console display driver support
  #
  CONFIG_VGA_CONSOLE=y
 +# CONFIG_VGACON_SOFT_SCROLLBACK is not set
  CONFIG_DUMMY_CONSOLE=y
  
  #
@@@ -927,11 -866,9 +928,11 @@@ CONFIG_SND_SEQ_DUMMY=
  CONFIG_SND_OSSEMUL=y
  CONFIG_SND_MIXER_OSS=m
  CONFIG_SND_PCM_OSS=m
 +CONFIG_SND_PCM_OSS_PLUGINS=y
  CONFIG_SND_SEQUENCER_OSS=y
  # CONFIG_SND_DYNAMIC_MINORS is not set
  CONFIG_SND_SUPPORT_OLD_API=y
 +CONFIG_SND_VERBOSE_PROCFS=y
  CONFIG_SND_VERBOSE_PRINTK=y
  # CONFIG_SND_DEBUG is not set
  
@@@ -941,6 -878,7 +942,6 @@@
  CONFIG_SND_MPU401_UART=m
  CONFIG_SND_OPL3_LIB=m
  CONFIG_SND_AC97_CODEC=m
 -CONFIG_SND_AC97_BUS=m
  CONFIG_SND_DUMMY=m
  CONFIG_SND_VIRMIDI=m
  CONFIG_SND_MTPAV=m
@@@ -951,7 -889,6 +952,7 @@@ CONFIG_SND_MPU401=
  # PCI devices
  #
  # CONFIG_SND_AD1889 is not set
 +# CONFIG_SND_ALS300 is not set
  # CONFIG_SND_ALI5451 is not set
  # CONFIG_SND_ATIIXP is not set
  # CONFIG_SND_ATIIXP_MODEM is not set
@@@ -965,18 -902,6 +966,18 @@@
  CONFIG_SND_CS4281=m
  CONFIG_SND_CS46XX=m
  CONFIG_SND_CS46XX_NEW_DSP=y
 +# CONFIG_SND_DARLA20 is not set
 +# CONFIG_SND_GINA20 is not set
 +# CONFIG_SND_LAYLA20 is not set
 +# CONFIG_SND_DARLA24 is not set
 +# CONFIG_SND_GINA24 is not set
 +# CONFIG_SND_LAYLA24 is not set
 +# CONFIG_SND_MONA is not set
 +# CONFIG_SND_MIA is not set
 +# CONFIG_SND_ECHO3G is not set
 +# CONFIG_SND_INDIGO is not set
 +# CONFIG_SND_INDIGOIO is not set
 +# CONFIG_SND_INDIGODJ is not set
  CONFIG_SND_EMU10K1=m
  # CONFIG_SND_EMU10K1X is not set
  # CONFIG_SND_ENS1370 is not set
@@@ -984,7 -909,7 +985,7 @@@
  # CONFIG_SND_ES1938 is not set
  # CONFIG_SND_ES1968 is not set
  CONFIG_SND_FM801=m
 -# CONFIG_SND_FM801_TEA575X is not set
 +# CONFIG_SND_FM801_TEA575X_BOOL is not set
  # CONFIG_SND_HDA_INTEL is not set
  # CONFIG_SND_HDSP is not set
  # CONFIG_SND_HDSPM is not set
@@@ -997,7 -922,6 +998,7 @@@
  # CONFIG_SND_MIXART is not set
  # CONFIG_SND_NM256 is not set
  # CONFIG_SND_PCXHR is not set
 +# CONFIG_SND_RIPTIDE is not set
  # CONFIG_SND_RME32 is not set
  # CONFIG_SND_RME96 is not set
  # CONFIG_SND_RME9652 is not set
@@@ -1007,36 -931,22 +1008,36 @@@
  # CONFIG_SND_VIA82XX_MODEM is not set
  # CONFIG_SND_VX222 is not set
  # CONFIG_SND_YMFPCI is not set
 +# CONFIG_SND_AC97_POWER_SAVE is not set
  
  #
  # USB devices
  #
  # CONFIG_SND_USB_AUDIO is not set
  
 +#
 +# SoC audio support
 +#
 +# CONFIG_SND_SOC is not set
 +
  #
  # Open Sound System
  #
  # CONFIG_SOUND_PRIME is not set
 +CONFIG_AC97_BUS=m
 +
 +#
 +# HID Devices
 +#
 +CONFIG_HID=y
 +# CONFIG_HID_DEBUG is not set
  
  #
  # USB support
  #
  CONFIG_USB_ARCH_HAS_HCD=y
  CONFIG_USB_ARCH_HAS_OHCI=y
 +CONFIG_USB_ARCH_HAS_EHCI=y
  CONFIG_USB=m
  # CONFIG_USB_DEBUG is not set
  
@@@ -1044,6 -954,7 +1045,6 @@@
  # Miscellaneous USB options
  #
  CONFIG_USB_DEVICEFS=y
 -# CONFIG_USB_BANDWIDTH is not set
  # CONFIG_USB_DYNAMIC_MINORS is not set
  # CONFIG_USB_SUSPEND is not set
  # CONFIG_USB_OTG is not set
@@@ -1054,12 -965,9 +1055,12 @@@
  CONFIG_USB_EHCI_HCD=m
  # CONFIG_USB_EHCI_SPLIT_ISO is not set
  # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 +# CONFIG_USB_EHCI_TT_NEWSCHED is not set
 +# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
  # CONFIG_USB_ISP116X_HCD is not set
  CONFIG_USB_OHCI_HCD=m
 -# CONFIG_USB_OHCI_BIG_ENDIAN is not set
 +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
  CONFIG_USB_OHCI_LITTLE_ENDIAN=y
  CONFIG_USB_UHCI_HCD=m
  # CONFIG_USB_SL811_HCD is not set
@@@ -1067,6 -975,7 +1068,6 @@@
  #
  # USB Device Class drivers
  #
 -# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
  # CONFIG_USB_ACM is not set
  # CONFIG_USB_PRINTER is not set
  
@@@ -1088,13 -997,13 +1089,13 @@@ CONFIG_USB_STORAGE=
  # CONFIG_USB_STORAGE_SDDR55 is not set
  # CONFIG_USB_STORAGE_JUMPSHOT is not set
  # CONFIG_USB_STORAGE_ALAUDA is not set
 +# CONFIG_USB_STORAGE_KARMA is not set
  # CONFIG_USB_LIBUSUAL is not set
  
  #
  # USB Input Devices
  #
  CONFIG_USB_HID=m
 -CONFIG_USB_HIDINPUT=y
  # CONFIG_USB_HIDINPUT_POWERBOOK is not set
  # CONFIG_HID_FF is not set
  # CONFIG_USB_HIDDEV is not set
@@@ -1109,14 -1018,15 +1110,14 @@@
  # CONFIG_USB_ACECAD is not set
  # CONFIG_USB_KBTAB is not set
  # CONFIG_USB_POWERMATE is not set
 -# CONFIG_USB_MTOUCH is not set
 -# CONFIG_USB_ITMTOUCH is not set
 -# CONFIG_USB_EGALAX is not set
 +# CONFIG_USB_TOUCHSCREEN is not set
  # 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
 +# CONFIG_USB_GTCO is not set
  
  #
  # USB Imaging devices
@@@ -1124,6 -1034,15 +1125,6 @@@
  # CONFIG_USB_MDC800 is not set
  # CONFIG_USB_MICROTEK is not set
  
 -#
 -# USB Multimedia devices
 -#
 -# CONFIG_USB_DABUSB is not set
 -
 -#
 -# Video4Linux support is needed for USB Multimedia device support
 -#
 -
  #
  # USB Network Adapters
  #
@@@ -1131,7 -1050,6 +1132,7 @@@
  # CONFIG_USB_KAWETH is not set
  # CONFIG_USB_PEGASUS is not set
  # CONFIG_USB_RTL8150 is not set
 +# CONFIG_USB_USBNET_MII is not set
  # CONFIG_USB_USBNET is not set
  CONFIG_USB_MON=y
  
@@@ -1149,23 -1067,17 +1150,23 @@@
  #
  # CONFIG_USB_EMI62 is not set
  # CONFIG_USB_EMI26 is not set
 +# CONFIG_USB_ADUTUX is not set
  # CONFIG_USB_AUERSWALD is not set
  # CONFIG_USB_RIO500 is not set
  # CONFIG_USB_LEGOTOWER is not set
  # CONFIG_USB_LCD is not set
 +# CONFIG_USB_BERRY_CHARGE is not set
  # CONFIG_USB_LED is not set
 +# CONFIG_USB_CYPRESS_CY7C63 is not set
  # CONFIG_USB_CYTHERM is not set
 -# CONFIG_USB_PHIDGETKIT is not set
 -# CONFIG_USB_PHIDGETSERVO is not set
 +# CONFIG_USB_PHIDGET is not set
  # CONFIG_USB_IDMOUSE is not set
 +# CONFIG_USB_FTDI_ELAN is not set
 +# CONFIG_USB_APPLEDISPLAY is not set
  # CONFIG_USB_SISUSBVGA is not set
  # CONFIG_USB_LD is not set
 +# CONFIG_USB_TRANCEVIBRATOR is not set
 +# CONFIG_USB_IOWARRIOR is not set
  # CONFIG_USB_TEST is not set
  
  #
@@@ -1182,66 -1094,27 +1183,66 @@@
  #
  # CONFIG_MMC is not set
  
 +#
 +# LED devices
 +#
 +# CONFIG_NEW_LEDS is not set
 +
 +#
 +# LED drivers
 +#
 +
 +#
 +# LED Triggers
 +#
 +
  #
  # InfiniBand support
  #
  CONFIG_INFINIBAND=m
  # CONFIG_INFINIBAND_USER_MAD is not set
  # CONFIG_INFINIBAND_USER_ACCESS is not set
 +CONFIG_INFINIBAND_ADDR_TRANS=y
  CONFIG_INFINIBAND_MTHCA=m
 -# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
 +CONFIG_INFINIBAND_MTHCA_DEBUG=y
 +# CONFIG_INFINIBAND_AMSO1100 is not set
  CONFIG_INFINIBAND_IPOIB=m
 -# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
 +# CONFIG_INFINIBAND_IPOIB_CM is not set
 +CONFIG_INFINIBAND_IPOIB_DEBUG=y
 +# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
  # CONFIG_INFINIBAND_SRP is not set
 +# CONFIG_INFINIBAND_ISER is not set
  
  #
 -# SN Devices
 +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
 +#
 +
 +#
 +# Real Time Clock
 +#
 +# CONFIG_RTC_CLASS is not set
 +
 +#
 +# DMA Engine support
 +#
 +# CONFIG_DMA_ENGINE is not set
 +
 +#
 +# DMA Clients
 +#
 +
 +#
 +# DMA Devices
 +#
 +
 +#
 +# Auxiliary Display support
  #
 -CONFIG_SGI_IOC4=y
 -CONFIG_SGI_IOC3=m
  
  #
 -# EDAC - error detection and reporting (RAS)
 +# Virtualization
  #
 +# CONFIG_MSPEC is not set
  
  #
  # File systems
@@@ -1255,7 -1128,6 +1256,7 @@@ CONFIG_EXT3_FS=
  CONFIG_EXT3_FS_XATTR=y
  CONFIG_EXT3_FS_POSIX_ACL=y
  CONFIG_EXT3_FS_SECURITY=y
 +# CONFIG_EXT4DEV_FS is not set
  CONFIG_JBD=y
  # CONFIG_JBD_DEBUG is not set
  CONFIG_FS_MBCACHE=y
@@@ -1268,16 -1140,15 +1269,16 @@@ CONFIG_REISERFS_FS_SECURITY=
  # CONFIG_JFS_FS is not set
  CONFIG_FS_POSIX_ACL=y
  CONFIG_XFS_FS=y
 -CONFIG_XFS_EXPORT=y
  # CONFIG_XFS_QUOTA is not set
  # CONFIG_XFS_SECURITY is not set
  # CONFIG_XFS_POSIX_ACL is not set
  # CONFIG_XFS_RT is not set
 +# CONFIG_GFS2_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
 +CONFIG_INOTIFY_USER=y
  # CONFIG_QUOTA is not set
  CONFIG_DNOTIFY=y
  CONFIG_AUTOFS_FS=y
@@@ -1310,14 -1181,12 +1311,14 @@@ CONFIG_NTFS_FS=
  #
  CONFIG_PROC_FS=y
  CONFIG_PROC_KCORE=y
 +CONFIG_PROC_VMCORE=y
 +CONFIG_PROC_SYSCTL=y
  CONFIG_SYSFS=y
  CONFIG_TMPFS=y
 +# CONFIG_TMPFS_POSIX_ACL is not set
  CONFIG_HUGETLBFS=y
  CONFIG_HUGETLB_PAGE=y
  CONFIG_RAMFS=y
 -# CONFIG_RELAYFS_FS is not set
  # CONFIG_CONFIGFS_FS is not set
  
  #
@@@ -1352,7 -1221,7 +1353,7 @@@ CONFIG_NFSD_V4=
  CONFIG_NFSD_TCP=y
  CONFIG_LOCKD=m
  CONFIG_LOCKD_V4=y
 -CONFIG_EXPORTFS=y
 +CONFIG_EXPORTFS=m
  CONFIG_NFS_COMMON=y
  CONFIG_SUNRPC=m
  CONFIG_SUNRPC_GSS=m
@@@ -1363,9 -1232,7 +1364,9 @@@ CONFIG_SMB_NLS_DEFAULT=
  CONFIG_SMB_NLS_REMOTE="cp437"
  CONFIG_CIFS=m
  # CONFIG_CIFS_STATS is not set
 +# CONFIG_CIFS_WEAK_PW_HASH is not set
  # CONFIG_CIFS_XATTR is not set
 +# CONFIG_CIFS_DEBUG2 is not set
  # CONFIG_CIFS_EXPERIMENTAL is not set
  # CONFIG_NCP_FS is not set
  # CONFIG_CODA_FS is not set
@@@ -1437,26 -1304,16 +1438,26 @@@ CONFIG_NLS_KOI8_R=
  CONFIG_NLS_KOI8_U=m
  CONFIG_NLS_UTF8=m
  
 +#
 +# Distributed Lock Manager
 +#
 +# CONFIG_DLM is not set
 +
  #
  # Library routines
  #
 +CONFIG_BITREVERSE=y
  # CONFIG_CRC_CCITT is not set
  # CONFIG_CRC16 is not set
  CONFIG_CRC32=y
  # CONFIG_LIBCRC32C is not set
 +CONFIG_PLIST=y
 +CONFIG_HAS_IOMEM=y
 +CONFIG_HAS_IOPORT=y
  CONFIG_GENERIC_HARDIRQS=y
  CONFIG_GENERIC_IRQ_PROBE=y
  CONFIG_GENERIC_PENDING_IRQ=y
 +CONFIG_IRQ_PER_CPU=y
  
  #
  # HP Simulator drivers
@@@ -1475,31 -1332,21 +1476,31 @@@
  # Kernel hacking
  #
  # CONFIG_PRINTK_TIME is not set
 +CONFIG_ENABLE_MUST_CHECK=y
  CONFIG_MAGIC_SYSRQ=y
 +# CONFIG_UNUSED_SYMBOLS is not set
 +# CONFIG_DEBUG_FS is not set
 +# CONFIG_HEADERS_CHECK is not set
  CONFIG_DEBUG_KERNEL=y
 +# CONFIG_DEBUG_SHIRQ is not set
  CONFIG_LOG_BUF_SHIFT=20
  CONFIG_DETECT_SOFTLOCKUP=y
  # CONFIG_SCHEDSTATS is not set
 +# CONFIG_TIMER_STATS is not set
  # CONFIG_DEBUG_SLAB is not set
 -CONFIG_DEBUG_MUTEXES=y
 +# CONFIG_DEBUG_RT_MUTEXES is not set
 +# CONFIG_RT_MUTEX_TESTER is not set
  # CONFIG_DEBUG_SPINLOCK is not set
 +CONFIG_DEBUG_MUTEXES=y
  # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 +# CONFIG_DEBUG_LOCKING_API_SELFTESTS 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_DEBUG_LIST is not set
  CONFIG_FORCED_INLINING=y
  # CONFIG_RCU_TORTURE_TEST is not set
 +# CONFIG_FAULT_INJECTION is not set
  CONFIG_IA64_GRANULE_16MB=y
  # CONFIG_IA64_GRANULE_64MB is not set
  # CONFIG_IA64_PRINT_HAZARDS is not set
@@@ -1518,11 -1365,7 +1519,11 @@@ CONFIG_SYSVIPC_COMPAT=
  # Cryptographic options
  #
  CONFIG_CRYPTO=y
 +CONFIG_CRYPTO_ALGAPI=y
 +CONFIG_CRYPTO_BLKCIPHER=m
 +CONFIG_CRYPTO_MANAGER=m
  # CONFIG_CRYPTO_HMAC is not set
 +# CONFIG_CRYPTO_XCBC is not set
  # CONFIG_CRYPTO_NULL is not set
  # CONFIG_CRYPTO_MD4 is not set
  CONFIG_CRYPTO_MD5=y
@@@ -1531,13 -1374,7 +1532,13 @@@
  # CONFIG_CRYPTO_SHA512 is not set
  # CONFIG_CRYPTO_WP512 is not set
  # CONFIG_CRYPTO_TGR192 is not set
 +# CONFIG_CRYPTO_GF128MUL is not set
 +CONFIG_CRYPTO_ECB=m
 +CONFIG_CRYPTO_CBC=m
 +CONFIG_CRYPTO_PCBC=m
 +# CONFIG_CRYPTO_LRW is not set
  CONFIG_CRYPTO_DES=m
 +# CONFIG_CRYPTO_FCRYPT is not set
  # CONFIG_CRYPTO_BLOWFISH is not set
  # CONFIG_CRYPTO_TWOFISH is not set
  # CONFIG_CRYPTO_SERPENT is not set
@@@ -1551,7 -1388,6 +1552,7 @@@
  # CONFIG_CRYPTO_DEFLATE is not set
  # CONFIG_CRYPTO_MICHAEL_MIC is not set
  # CONFIG_CRYPTO_CRC32C is not set
 +# CONFIG_CRYPTO_CAMELLIA is not set
  # CONFIG_CRYPTO_TEST is not set
  
  #

diff --combined include/asm-ia64/pal.h
index 67656ce,56e9210..abfcb3a
--- 1/include/asm-ia64/pal.h
--- 2/include/asm-ia64/pal.h
+++ b/include/asm-ia64/pal.h
@@@ -32,7 -32,7 +32,7 @@@
  #define PAL_CACHE_FLUSH               1       /* flush i/d cache */
  #define PAL_CACHE_INFO                2       /* get detailed i/d cache info */
  #define PAL_CACHE_INIT                3       /* initialize i/d cache */
 -#define PAL_CACHE_SUMMARY     4       /* get summary of cache heirarchy */
 +#define PAL_CACHE_SUMMARY     4       /* get summary of cache hierarchy */
  #define PAL_MEM_ATTRIB                5       /* list supported memory attributes */
  #define PAL_PTCE_INFO         6       /* purge TLB info */
  #define PAL_VM_INFO           7       /* return supported virtual memory features */
@@@ -89,6 -89,8 +89,8 @@@
  #define PAL_GET_PSTATE_TYPE_AVGNORESET        2
  #define PAL_GET_PSTATE_TYPE_INSTANT   3
  
+ #define PAL_MC_ERROR_INJECT   276     /* Injects processor error or returns injection capabilities */
+ 
  #ifndef __ASSEMBLY__
  
  #include <linux/types.h>
@@@ -113,14 -115,14 +115,14 @@@ typedef s64                             pal_status_t
                                                 */
  #define PAL_STATUS_REQUIRES_MEMORY    (-9)    /* Call requires PAL memory buffer */
  
 -/* Processor cache level in the heirarchy */
 +/* Processor cache level in the hierarchy */
  typedef u64                           pal_cache_level_t;
  #define PAL_CACHE_LEVEL_L0            0       /* L0 */
  #define PAL_CACHE_LEVEL_L1            1       /* L1 */
  #define PAL_CACHE_LEVEL_L2            2       /* L2 */
  
  
 -/* Processor cache type at a particular level in the heirarchy */
 +/* Processor cache type at a particular level in the hierarchy */
  
  typedef u64                           pal_cache_type_t;
  #define PAL_CACHE_TYPE_INSTRUCTION    1       /* Instruction cache */
@@@ -272,14 -274,14 +274,14 @@@ typedef struct pal_cache_protection_inf
  #define PAL_CACHE_PROT_METHOD_ECC             3       /* ECC protection */
  
  
 -/* Processor cache line identification in the heirarchy */
 +/* Processor cache line identification in the hierarchy */
  typedef union pal_cache_line_id_u {
        u64                     pclid_data;
        struct {
                u64             cache_type      : 8,    /* 7-0 cache type */
                                level           : 8,    /* 15-8 level of the
                                                         * cache in the
 -                                                       * heirarchy.
 +                                                       * hierarchy.
                                                         */
                                way             : 8,    /* 23-16 way in the set
                                                         */
@@@ -292,7 -294,7 +294,7 @@@
                u64             cache_type      : 8,    /* 7-0 cache type */
                                level           : 8,    /* 15-8 level of the
                                                         * cache in the
 -                                                       * heirarchy.
 +                                                       * hierarchy.
                                                         */
                                way             : 8,    /* 23-16 way in the set
                                                         */
@@@ -371,7 -373,6 +373,7 @@@ typedef u64                                        pal_mc_info_index_t
                                                         * dependent
                                                         */
  
 +#define PAL_TLB_CHECK_OP_PURGE                        8
  
  typedef struct pal_process_state_info_s {
        u64             reserved1       : 2,
@@@ -979,7 -980,7 +981,7 @@@ ia64_pal_cache_read (pal_cache_line_id_
        return iprv.status;
  }
  
 -/* Return summary information about the heirarchy of caches controlled by the processor */
 +/* Return summary information about the hierarchy of caches controlled by the processor */
  static inline s64
  ia64_pal_cache_summary (u64 *cache_levels, u64 *unique_caches)
  {
@@@ -1235,6 -1236,37 +1237,37 @@@ ia64_pal_mc_error_info (u64 info_index
        return iprv.status;
  }
  
+ /* Injects the requested processor error or returns info on
+  * supported injection capabilities for current processor implementation
+  */
+ static inline s64
+ ia64_pal_mc_error_inject_phys (u64 err_type_info, u64 err_struct_info,
+                       u64 err_data_buffer, u64 *capabilities, u64 *resources)
+ {
+       struct ia64_pal_retval iprv;
+       PAL_CALL_PHYS_STK(iprv, PAL_MC_ERROR_INJECT, err_type_info,
+                         err_struct_info, err_data_buffer);
+       if (capabilities)
+               *capabilities= iprv.v0;
+       if (resources)
+               *resources= iprv.v1;
+       return iprv.status;
+ }
+ 
+ static inline s64
+ ia64_pal_mc_error_inject_virt (u64 err_type_info, u64 err_struct_info,
+                       u64 err_data_buffer, u64 *capabilities, u64 *resources)
+ {
+       struct ia64_pal_retval iprv;
+       PAL_CALL_STK(iprv, PAL_MC_ERROR_INJECT, err_type_info,
+                         err_struct_info, err_data_buffer);
+       if (capabilities)
+               *capabilities= iprv.v0;
+       if (resources)
+               *resources= iprv.v1;
+       return iprv.status;
+ }
+ 
  /* Inform PALE_CHECK whether a machine check is expected so that PALE_CHECK willnot
   * attempt to correct any expected machine checks.
   */