35 files changed, 178 insertions, 174 deletions

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index bef47725d4ad..c9307c99a1dc 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -42,6 +42,11 @@ config MMU
 config SWIOTLB
        bool
 
+config GENERIC_LOCKBREAK
+        bool
+        default y
+        depends on SMP && PREEMPT
+
 config RWSEM_XCHGADD_ALGORITHM
         bool
         default y
@@ -75,6 +80,9 @@ config GENERIC_TIME_VSYSCALL
         bool
         default y
 
+config HAVE_SETUP_PER_CPU_AREA
+        def_bool y
+
 config DMI
         bool
         default y
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
index 34951aa2370b..b916ccfdef84 100644
--- a/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
@@ -77,7 +77,7 @@ vmlinux.gz: vmlinux
         $(Q)$(MAKE) $(build)=$(boot) $@
 
 unwcheck: vmlinux
-        -$(Q)READELF=$(READELF) $(srctree)/arch/ia64/scripts/unwcheck.py $<
+        -$(Q)READELF=$(READELF) python $(srctree)/arch/ia64/scripts/unwcheck.py $<
 
 archclean:
         $(Q)$(MAKE) $(clean)=$(boot)
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index bc859a311eaf..45bf04eb7d70 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -2034,7 +2034,8 @@ sba_init(void)
         if (!ia64_platform_is("hpzx1") && !ia64_platform_is("hpzx1_swiotlb"))
                 return 0;
 
-#if defined(CONFIG_IA64_GENERIC) && defined(CONFIG_CRASH_DUMP)
+#if defined(CONFIG_IA64_GENERIC) && defined(CONFIG_CRASH_DUMP) && \
+        defined(CONFIG_PROC_FS)
         /* If we are booting a kdump kernel, the sba_iommu will
          * cause devices that were not shutdown properly to MCA
          * as soon as they are turned back on.  Our only option for
diff --git a/arch/ia64/hp/sim/boot/Makefile b/arch/ia64/hp/sim/boot/Makefile
index df6e9968c845..2e805e0cc560 100644
--- a/arch/ia64/hp/sim/boot/Makefile
+++ b/arch/ia64/hp/sim/boot/Makefile
@@ -33,5 +33,5 @@ $(obj)/vmlinux.bin: vmlinux FORCE
 LDFLAGS_bootloader = -static -T
 
 $(obj)/bootloader: $(src)/bootloader.lds $(obj)/bootloader.o $(obj)/boot_head.o $(obj)/fw-emu.o \
-                   lib/lib.a arch/ia64/lib/lib.a FORCE
+                   lib/lib.a arch/ia64/lib/built-in.o arch/ia64/lib/lib.a FORCE
         $(call if_changed,ld)
diff --git a/arch/ia64/hp/sim/boot/bootloader.lds b/arch/ia64/hp/sim/boot/bootloader.lds
index 69ae58531033..3977f25a1265 100644
--- a/arch/ia64/hp/sim/boot/bootloader.lds
+++ b/arch/ia64/hp/sim/boot/bootloader.lds
@@ -22,10 +22,11 @@ SECTIONS
   .sdata     : { *(.sdata) }
   _edata  =  .;
 
-  _bss = .;
+  __bss_start = .;
   .sbss      : { *(.sbss) *(.scommon) }
   .bss       : { *(.bss) *(COMMON) }
   . = ALIGN(64 / 8);
+  __bss_stop = .;
   _end = . ;
 
   /* Stabs debugging sections.  */
diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c
index 08b117e2c54b..9898febf609a 100644
--- a/arch/ia64/hp/sim/simeth.c
+++ b/arch/ia64/hp/sim/simeth.c
@@ -497,11 +497,6 @@ simeth_interrupt(int irq, void *dev_id)
 {
         struct net_device *dev = dev_id;
 
-        if ( dev == NULL ) {
-                printk(KERN_WARNING "simeth: irq %d for unknown device\n", irq);
-                return IRQ_NONE;
-        }
-
         /*
          * very simple loop because we get interrupts only when receiving
          */
diff --git a/arch/ia64/hp/sim/simscsi.c b/arch/ia64/hp/sim/simscsi.c
index 6ef9b5219930..7661bb065fa5 100644
--- a/arch/ia64/hp/sim/simscsi.c
+++ b/arch/ia64/hp/sim/simscsi.c
@@ -360,7 +360,6 @@ static struct scsi_host_template driver_template = {
         .max_sectors            = 1024,
         .cmd_per_lun            = SIMSCSI_REQ_QUEUE_LEN,
         .use_clustering         = DISABLE_CLUSTERING,
-        .use_sg_chaining        = ENABLE_SG_CHAINING,
 };
 
 static int __init
diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c
index f6ae3ec93810..4f0c30c38e99 100644
--- a/arch/ia64/ia32/binfmt_elf32.c
+++ b/arch/ia64/ia32/binfmt_elf32.c
@@ -52,33 +52,29 @@ extern struct page *ia32_shared_page[];
 extern unsigned long *ia32_gdt;
 extern struct page *ia32_gate_page;
 
-struct page *
-ia32_install_shared_page (struct vm_area_struct *vma, unsigned long address, int *type)
+int
+ia32_install_shared_page (struct vm_area_struct *vma, struct vm_fault *vmf)
 {
-        struct page *pg = ia32_shared_page[smp_processor_id()];
-        get_page(pg);
-        if (type)
-                *type = VM_FAULT_MINOR;
-        return pg;
+        vmf->page = ia32_shared_page[smp_processor_id()];
+        get_page(vmf->page);
+        return 0;
 }
 
-struct page *
-ia32_install_gate_page (struct vm_area_struct *vma, unsigned long address, int *type)
+int
+ia32_install_gate_page (struct vm_area_struct *vma, struct vm_fault *vmf)
 {
-        struct page *pg = ia32_gate_page;
-        get_page(pg);
-        if (type)
-                *type = VM_FAULT_MINOR;
-        return pg;
+        vmf->page = ia32_gate_page;
+        get_page(vmf->page);
+        return 0;
 }
 
 
 static struct vm_operations_struct ia32_shared_page_vm_ops = {
-        .nopage = ia32_install_shared_page
+        .fault = ia32_install_shared_page
 };
 
 static struct vm_operations_struct ia32_gate_page_vm_ops = {
-        .nopage = ia32_install_gate_page
+        .fault = ia32_install_gate_page
 };
 
 void
@@ -226,7 +222,8 @@ elf32_set_personality (void)
 }
 
 static unsigned long
-elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type)
+elf32_map(struct file *filep, unsigned long addr, struct elf_phdr *eppnt,
+                int prot, int type, unsigned long unused)
 {
         unsigned long pgoff = (eppnt->p_vaddr) & ~IA32_PAGE_MASK;
 
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 897e2083a3b1..00b5d08f6da8 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -860,7 +860,7 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)
         lsapic = (struct acpi_madt_local_sapic *)obj->buffer.pointer;
 
         if ((lsapic->header.type != ACPI_MADT_TYPE_LOCAL_SAPIC) ||
-            (!lsapic->lapic_flags & ACPI_MADT_ENABLED)) {
+            (!(lsapic->lapic_flags & ACPI_MADT_ENABLED))) {
                 kfree(buffer.pointer);
                 return -EINVAL;
         }
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c
index 8e8f8b6193ee..242d79341120 100644
--- a/arch/ia64/kernel/efi.c
+++ b/arch/ia64/kernel/efi.c
@@ -370,7 +370,7 @@ efi_get_pal_addr (void)
                         continue;
                 }
 
-                if (md->num_pages << EFI_PAGE_SHIFT > IA64_GRANULE_SIZE)
+                if (efi_md_size(md) > IA64_GRANULE_SIZE)
                         panic("Woah!  PAL code size bigger than a granule!");
 
 #if EFI_DEBUG
@@ -378,7 +378,7 @@ efi_get_pal_addr (void)
 
                 printk(KERN_INFO "CPU %d: mapping PAL code [0x%lx-0x%lx) into [0x%lx-0x%lx)\n",
                         smp_processor_id(), md->phys_addr,
-                        md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT),
+                        md->phys_addr + efi_md_size(md),
                         vaddr & mask, (vaddr & mask) + IA64_GRANULE_SIZE);
 #endif
                 return __va(md->phys_addr);
@@ -523,7 +523,7 @@ efi_init (void)
                         md = p;
                         printk("mem%02u: type=%u, attr=0x%lx, range=[0x%016lx-0x%016lx) (%luMB)\n",
                                i, md->type, md->attribute, md->phys_addr,
-                               md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT),
+                               md->phys_addr + efi_md_size(md),
                                md->num_pages >> (20 - EFI_PAGE_SHIFT));
                 }
         }
@@ -656,7 +656,7 @@ efi_memory_descriptor (unsigned long phys_addr)
         for (p = efi_map_start; p < efi_map_end; p += efi_desc_size) {
                 md = p;
 
-                if (phys_addr - md->phys_addr < (md->num_pages << EFI_PAGE_SHIFT))
+                if (phys_addr - md->phys_addr < efi_md_size(md))
                          return md;
         }
         return NULL;
@@ -1158,7 +1158,7 @@ efi_initialize_iomem_resources(struct resource *code_resource,
 
                 res->name = name;
                 res->start = md->phys_addr;
-                res->end = md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT) - 1;
+                res->end = md->phys_addr + efi_md_size(md) - 1;
                 res->flags = flags;
 
                 if (insert_resource(&iomem_resource, res) < 0)
diff --git a/arch/ia64/kernel/gate.lds.S b/arch/ia64/kernel/gate.lds.S
index 454d7a7dfa9d..3cb1abc00e24 100644
--- a/arch/ia64/kernel/gate.lds.S
+++ b/arch/ia64/kernel/gate.lds.S
@@ -30,7 +30,7 @@ SECTIONS
          * the dynamic symbol table et al.  If this amount is insufficient,
          * ld -shared will barf.  Just increase it here.
          */
-        . = GATE_ADDR + 0x500;
+        . = GATE_ADDR + 0x600;
 
         .data.patch             : {
                 __start_gate_mckinley_e9_patchlist = .;
diff --git a/arch/ia64/kernel/head.S b/arch/ia64/kernel/head.S
index 4e5e27540e27..d3a41d5f8d12 100644
--- a/arch/ia64/kernel/head.S
+++ b/arch/ia64/kernel/head.S
@@ -1176,6 +1176,7 @@ tlb_purge_done:
         RESTORE_REG(cr.dcr, r25, r17);;
         RESTORE_REG(cr.iva, r25, r17);;
         RESTORE_REG(cr.pta, r25, r17);;
+        srlz.d;;        // required not to violate RAW dependency
         RESTORE_REG(cr.itv, r25, r17);;
         RESTORE_REG(cr.pmv, r25, r17);;
         RESTORE_REG(cr.cmcv, r25, r17);;
diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c
index bd17190bebb6..c3b4412ccc67 100644
--- a/arch/ia64/kernel/ia64_ksyms.c
+++ b/arch/ia64/kernel/ia64_ksyms.c
@@ -63,6 +63,9 @@ EXPORT_SYMBOL(__udivdi3);
 EXPORT_SYMBOL(__moddi3);
 EXPORT_SYMBOL(__umoddi3);
 
+#include <asm/page.h>
+EXPORT_SYMBOL(copy_page);
+
 #if defined(CONFIG_MD_RAID456) || defined(CONFIG_MD_RAID456_MODULE)
 extern void xor_ia64_2(void);
 extern void xor_ia64_3(void);
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index 274a59383043..398e2fd1cd25 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -199,19 +199,6 @@ static inline int __gsi_to_irq(unsigned int gsi)
         return -1;
 }
 
-/*
- * Translate GSI number to the corresponding IA-64 interrupt vector.  If no
- * entry exists, return -1.
- */
-inline int
-gsi_to_vector (unsigned int gsi)
-{
-        int irq = __gsi_to_irq(gsi);
-        if (check_irq_used(irq) < 0)
-                return -1;
-        return irq_to_vector(irq);
-}
-
 int
 gsi_to_irq (unsigned int gsi)
 {
@@ -429,7 +416,7 @@ iosapic_end_level_irq (unsigned int irq)
 #define iosapic_disable_level_irq       mask_irq
 #define iosapic_ack_level_irq           nop
 
-struct irq_chip irq_type_iosapic_level = {
+static struct irq_chip irq_type_iosapic_level = {
         .name =         "IO-SAPIC-level",
         .startup =      iosapic_startup_level_irq,
         .shutdown =     iosapic_shutdown_level_irq,
@@ -478,7 +465,7 @@ iosapic_ack_edge_irq (unsigned int irq)
 #define iosapic_disable_edge_irq        nop
 #define iosapic_end_edge_irq            nop
 
-struct irq_chip irq_type_iosapic_edge = {
+static struct irq_chip irq_type_iosapic_edge = {
         .name =         "IO-SAPIC-edge",
         .startup =      iosapic_startup_edge_irq,
         .shutdown =     iosapic_disable_edge_irq,
@@ -491,7 +478,7 @@ struct irq_chip irq_type_iosapic_edge = {
         .set_affinity = iosapic_set_affinity
 };
 
-unsigned int
+static unsigned int
 iosapic_version (char __iomem *addr)
 {
         /*
@@ -938,7 +925,7 @@ iosapic_register_platform_intr (u32 int_type, unsigned int gsi,
               case ACPI_INTERRUPT_CPEI:
                 irq = vector = IA64_CPE_VECTOR;
                 BUG_ON(bind_irq_vector(irq, vector, CPU_MASK_ALL));
-                delivery = IOSAPIC_LOWEST_PRIORITY;
+                delivery = IOSAPIC_FIXED;
                 mask = 1;
                 break;
               default:
diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
index 00a4599e5f47..0b52f19ed046 100644
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@ -200,7 +200,7 @@ assign_irq_vector (int irq)
 {
         unsigned long flags;
         int vector, cpu;
-        cpumask_t domain;
+        cpumask_t domain = CPU_MASK_NONE;
 
         vector = -ENOSPC;
 
@@ -340,7 +340,7 @@ int create_irq(void)
 {
         unsigned long flags;
         int irq, vector, cpu;
-        cpumask_t domain;
+        cpumask_t domain = CPU_MASK_NONE;
 
         irq = vector = -ENOSPC;
         spin_lock_irqsave(&vector_lock, flags);
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
index 5fd65d8302c8..fc4d2676264f 100644
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
@@ -182,8 +182,8 @@ static int __kprobes unsupported_inst(uint template, uint  slot,
         qp = kprobe_inst & 0x3f;
         if (is_cmp_ctype_unc_inst(template, slot, major_opcode, kprobe_inst)) {
                 if (slot == 1 && qp)  {
-                        printk(KERN_WARNING "Kprobes on cmp unc"
-                                        "instruction on slot 1 at <0x%lx>"
+                        printk(KERN_WARNING "Kprobes on cmp unc "
+                                        "instruction on slot 1 at <0x%lx> "
                                         "is not supported\n", addr);
                         return -EINVAL;
 
@@ -221,8 +221,8 @@ static int __kprobes unsupported_inst(uint template, uint  slot,
                          * bit 12 to be equal to 1
                          */
                         if (slot == 1 && qp) {
-                                printk(KERN_WARNING "Kprobes on test bit"
-                                                "instruction on slot at <0x%lx>"
+                                printk(KERN_WARNING "Kprobes on test bit "
+                                                "instruction on slot at <0x%lx> "
                                                 "is not supported\n", addr);
                                 return -EINVAL;
                         }
@@ -242,7 +242,7 @@ static int __kprobes unsupported_inst(uint template, uint  slot,
                          */
                         int x6=(kprobe_inst >> 27) & 0x3F;
                         if ((x6 == 0x10) || (x6 == 0x11)) {
-                                printk(KERN_WARNING "Kprobes on"
+                                printk(KERN_WARNING "Kprobes on "
                                         "Indirect Predict is not supported\n");
                                 return -EINVAL;
                         }
@@ -435,6 +435,23 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
                         /* another task is sharing our hash bucket */
                         continue;
 
+                orig_ret_address = (unsigned long)ri->ret_addr;
+                if (orig_ret_address != trampoline_address)
+                        /*
+                         * This is the real return address. Any other
+                         * instances associated with this task are for
+                         * other calls deeper on the call stack
+                         */
+                        break;
+        }
+
+        regs->cr_iip = orig_ret_address;
+
+        hlist_for_each_entry_safe(ri, node, tmp, head, hlist) {
+                if (ri->task != current)
+                        /* another task is sharing our hash bucket */
+                        continue;
+
                 if (ri->rp && ri->rp->handler)
                         ri->rp->handler(ri, regs);
 
@@ -452,8 +469,6 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
 
         kretprobe_assert(ri, orig_ret_address, trampoline_address);
 
-        regs->cr_iip = orig_ret_address;
-
         reset_current_kprobe();
         spin_unlock_irqrestore(&kretprobe_lock, flags);
         preempt_enable_no_resched();
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 10b48cd15a87..6dbf5919d2d0 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -75,6 +75,7 @@
 #include <linux/workqueue.h>
 #include <linux/cpumask.h>
 #include <linux/kdebug.h>
+#include <linux/cpu.h>
 
 #include <asm/delay.h>
 #include <asm/machvec.h>
@@ -1813,6 +1814,36 @@ ia64_mca_cpu_init(void *cpu_data)
                                                               PAGE_KERNEL));
 }
 
+static void __cpuinit ia64_mca_cmc_vector_adjust(void *dummy)
+{
+        unsigned long flags;
+
+        local_irq_save(flags);
+        if (!cmc_polling_enabled)
+                ia64_mca_cmc_vector_enable(NULL);
+        local_irq_restore(flags);
+}
+
+static int __cpuinit mca_cpu_callback(struct notifier_block *nfb,
+                                      unsigned long action,
+                                      void *hcpu)
+{
+        int hotcpu = (unsigned long) hcpu;
+
+        switch (action) {
+        case CPU_ONLINE:
+        case CPU_ONLINE_FROZEN:
+                smp_call_function_single(hotcpu, ia64_mca_cmc_vector_adjust,
+                                         NULL, 1, 0);
+                break;
+        }
+        return NOTIFY_OK;
+}
+
+static struct notifier_block mca_cpu_notifier __cpuinitdata = {
+        .notifier_call = mca_cpu_callback
+};
+
 /*
  * ia64_mca_init
  *
@@ -1996,6 +2027,8 @@ ia64_mca_late_init(void)
         if (!mca_init)
                 return 0;
 
+        register_hotcpu_notifier(&mca_cpu_notifier);
+
         /* Setup the CMCI/P vector and handler */
         init_timer(&cmc_poll_timer);
         cmc_poll_timer.function = ia64_mca_cmc_poll;
diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
index 196287928bae..e58f4367cf11 100644
--- a/arch/ia64/kernel/module.c
+++ b/arch/ia64/kernel/module.c
@@ -940,14 +940,3 @@ module_arch_cleanup (struct module *mod)
         if (mod->arch.core_unw_table)
                 unw_remove_unwind_table(mod->arch.core_unw_table);
 }
-
-#ifdef CONFIG_SMP
-void
-percpu_modcopy (void *pcpudst, const void *src, unsigned long size)
-{
-        unsigned int i;
-        for_each_possible_cpu(i) {
-                memcpy(pcpudst + __per_cpu_offset[i], src, size);
-        }
-}
-#endif /* CONFIG_SMP */
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 2418289ee5ca..7377d323131d 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -27,6 +27,7 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/kdebug.h>
+#include <linux/utsname.h>
 
 #include <asm/cpu.h>
 #include <asm/delay.h>
@@ -107,8 +108,9 @@ show_regs (struct pt_regs *regs)
         print_modules();
         printk("\nPid: %d, CPU %d, comm: %20s\n", task_pid_nr(current),
                         smp_processor_id(), current->comm);
-        printk("psr : %016lx ifs : %016lx ip  : [<%016lx>]    %s\n",
-               regs->cr_ipsr, regs->cr_ifs, ip, print_tainted());
+        printk("psr : %016lx ifs : %016lx ip  : [<%016lx>]    %s (%s)\n",
+               regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
+               init_utsname()->release);
         print_symbol("ip is at %s\n", ip);
         printk("unat: %016lx pfs : %016lx rsc : %016lx\n",
                regs->ar_unat, regs->ar_pfs, regs->ar_rsc);
@@ -737,6 +739,7 @@ flush_thread (void)
                 ia32_drop_ia64_partial_page_list(current);
                 current->thread.task_size = IA32_PAGE_OFFSET;
                 set_fs(USER_DS);
+                memset(current->thread.tls_array, 0, sizeof(current->thread.tls_array));
         }
 #endif
 }
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 2b3751eef5ce..86028c69861e 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -71,8 +71,6 @@ unsigned long __per_cpu_offset[NR_CPUS];
 EXPORT_SYMBOL(__per_cpu_offset);
 #endif
 
-extern void ia64_setup_printk_clock(void);
-
 DEFINE_PER_CPU(struct cpuinfo_ia64, cpu_info);
 DEFINE_PER_CPU(unsigned long, local_per_cpu_offset);
 unsigned long ia64_cycles_per_usec;
@@ -95,7 +93,6 @@ static struct resource bss_resource = {
         .name   = "Kernel bss",
         .flags  = IORESOURCE_BUSY | IORESOURCE_MEM
 };
-extern char _text[], _end[], _etext[], _edata[], _bss[];
 
 unsigned long ia64_max_cacheline_size;
 
@@ -206,7 +203,7 @@ static int __init register_memory(void)
         code_resource.end   = ia64_tpa(_etext) - 1;
         data_resource.start = ia64_tpa(_etext);
         data_resource.end   = ia64_tpa(_edata) - 1;
-        bss_resource.start  = ia64_tpa(_bss);
+        bss_resource.start  = ia64_tpa(__bss_start);
         bss_resource.end    = ia64_tpa(_end) - 1;
         efi_initialize_iomem_resources(&code_resource, &data_resource,
                         &bss_resource);
@@ -508,8 +505,6 @@ setup_arch (char **cmdline_p)
         /* process SAL system table: */
         ia64_sal_init(__va(efi.sal_systab));
 
-        ia64_setup_printk_clock();
-
 #ifdef CONFIG_SMP
         cpu_physical_id(0) = hard_smp_processor_id();
 #endif
diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c
index cdb64cc4d9c8..309da3567bc8 100644
--- a/arch/ia64/kernel/signal.c
+++ b/arch/ia64/kernel/signal.c
@@ -98,7 +98,7 @@ restore_sigcontext (struct sigcontext __user *sc, struct sigscratch *scr)
         if ((flags & IA64_SC_FLAG_FPH_VALID) != 0) {
                 struct ia64_psr *psr = ia64_psr(&scr->pt);
 
-                __copy_from_user(current->thread.fph, &sc->sc_fr[32], 96*16);
+                err |= __copy_from_user(current->thread.fph, &sc->sc_fr[32], 96*16);
                 psr->mfh = 0;   /* drop signal handler's fph contents... */
                 preempt_disable();
                 if (psr->dfh)
@@ -244,7 +244,7 @@ static long
 setup_sigcontext (struct sigcontext __user *sc, sigset_t *mask, struct sigscratch *scr)
 {
         unsigned long flags = 0, ifs, cfm, nat;
-        long err;
+        long err = 0;
 
         ifs = scr->pt.cr_ifs;
 
@@ -257,12 +257,12 @@ setup_sigcontext (struct sigcontext __user *sc, sigset_t *mask, struct sigscratc
         ia64_flush_fph(current);
         if ((current->thread.flags & IA64_THREAD_FPH_VALID)) {
                 flags |= IA64_SC_FLAG_FPH_VALID;
-                __copy_to_user(&sc->sc_fr[32], current->thread.fph, 96*16);
+                err = __copy_to_user(&sc->sc_fr[32], current->thread.fph, 96*16);
         }
 
         nat = ia64_get_scratch_nat_bits(&scr->pt, scr->scratch_unat);
 
-        err  = __put_user(flags, &sc->sc_flags);
+        err |= __put_user(flags, &sc->sc_flags);
         err |= __put_user(nat, &sc->sc_nat);
         err |= PUT_SIGSET(mask, &sc->sc_mask);
         err |= __put_user(cfm, &sc->sc_cfm);
@@ -280,15 +280,7 @@ setup_sigcontext (struct sigcontext __user *sc, sigset_t *mask, struct sigscratc
         err |= __copy_to_user(&sc->sc_gr[15], &scr->pt.r15, 8);         /* r15 */
         err |= __put_user(scr->pt.cr_iip + ia64_psr(&scr->pt)->ri, &sc->sc_ip);
 
-        if (flags & IA64_SC_FLAG_IN_SYSCALL) {
-                /* Clear scratch registers if the signal interrupted a system call. */
-                err |= __put_user(0, &sc->sc_ar_ccv);                           /* ar.ccv */
-                err |= __put_user(0, &sc->sc_br[7]);                            /* b7 */
-                err |= __put_user(0, &sc->sc_gr[14]);                           /* r14 */
-                err |= __clear_user(&sc->sc_ar25, 2*8);                 /* ar.csd & ar.ssd */
-                err |= __clear_user(&sc->sc_gr[2], 2*8);                        /* r2-r3 */
-                err |= __clear_user(&sc->sc_gr[16], 16*8);                      /* r16-r31 */
-        } else {
+        if (!(flags & IA64_SC_FLAG_IN_SYSCALL)) {
                 /* Copy scratch regs to sigcontext if the signal didn't interrupt a syscall. */
                 err |= __put_user(scr->pt.ar_ccv, &sc->sc_ar_ccv);              /* ar.ccv */
                 err |= __put_user(scr->pt.b7, &sc->sc_br[7]);                   /* b7 */
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index 2bb84214e5f1..3ab042720970 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -344,33 +344,6 @@ udelay (unsigned long usecs)
 }
 EXPORT_SYMBOL(udelay);
 
-static unsigned long long ia64_itc_printk_clock(void)
-{
-        if (ia64_get_kr(IA64_KR_PER_CPU_DATA))
-                return sched_clock();
-        return 0;
-}
-
-static unsigned long long ia64_default_printk_clock(void)
-{
-        return (unsigned long long)(jiffies_64 - INITIAL_JIFFIES) *
-                (1000000000/HZ);
-}
-
-unsigned long long (*ia64_printk_clock)(void) = &ia64_default_printk_clock;
-
-unsigned long long printk_clock(void)
-{
-        return ia64_printk_clock();
-}
-
-void __init
-ia64_setup_printk_clock(void)
-{
-        if (!(sal_platform_features & IA64_SAL_PLATFORM_FEATURE_ITC_DRIFT))
-                ia64_printk_clock = ia64_itc_printk_clock;
-}
-
 /* IA64 doesn't cache the timezone */
 void update_vsyscall_tz(void)
 {
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
index 14261fee5f4d..a2484fc1a06c 100644
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
@@ -354,27 +354,27 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev)
         if (unlikely(retval < 0))
                 return retval;
 
-        all_cpu_cache_info[cpu].kobj.parent = &sys_dev->kobj;
-        kobject_set_name(&all_cpu_cache_info[cpu].kobj, "%s", "cache");
-        all_cpu_cache_info[cpu].kobj.ktype = &cache_ktype_percpu_entry;
-        retval = kobject_register(&all_cpu_cache_info[cpu].kobj);
+        retval = kobject_init_and_add(&all_cpu_cache_info[cpu].kobj,
+                                      &cache_ktype_percpu_entry, &sys_dev->kobj,
+                                      "%s", "cache");
 
         for (i = 0; i < all_cpu_cache_info[cpu].num_cache_leaves; i++) {
                 this_object = LEAF_KOBJECT_PTR(cpu,i);
-                this_object->kobj.parent = &all_cpu_cache_info[cpu].kobj;
-                kobject_set_name(&(this_object->kobj), "index%1lu", i);
-                this_object->kobj.ktype = &cache_ktype;
-                retval = kobject_register(&(this_object->kobj));
+                retval = kobject_init_and_add(&(this_object->kobj),
+                                              &cache_ktype,
+                                              &all_cpu_cache_info[cpu].kobj,
+                                              "index%1lu", i);
                 if (unlikely(retval)) {
                         for (j = 0; j < i; j++) {
-                                kobject_unregister(
-                                        &(LEAF_KOBJECT_PTR(cpu,j)->kobj));
+                                kobject_put(&(LEAF_KOBJECT_PTR(cpu,j)->kobj));
                         }
-                        kobject_unregister(&all_cpu_cache_info[cpu].kobj);
+                        kobject_put(&all_cpu_cache_info[cpu].kobj);
                         cpu_cache_sysfs_exit(cpu);
                         break;
                 }
+                kobject_uevent(&(this_object->kobj), KOBJ_ADD);
         }
+        kobject_uevent(&all_cpu_cache_info[cpu].kobj, KOBJ_ADD);
         return retval;
 }
 
@@ -385,10 +385,10 @@ static int __cpuinit cache_remove_dev(struct sys_device * sys_dev)
         unsigned long i;
 
         for (i = 0; i < all_cpu_cache_info[cpu].num_cache_leaves; i++)
-                kobject_unregister(&(LEAF_KOBJECT_PTR(cpu,i)->kobj));
+                kobject_put(&(LEAF_KOBJECT_PTR(cpu,i)->kobj));
 
         if (all_cpu_cache_info[cpu].kobj.parent) {
-                kobject_unregister(&all_cpu_cache_info[cpu].kobj);
+                kobject_put(&all_cpu_cache_info[cpu].kobj);
                 memset(&all_cpu_cache_info[cpu].kobj,
                         0,
                         sizeof(struct kobject));
diff --git a/arch/ia64/kernel/unaligned.c b/arch/ia64/kernel/unaligned.c
index 2173de9fe917..f6a1aeb742b3 100644
--- a/arch/ia64/kernel/unaligned.c
+++ b/arch/ia64/kernel/unaligned.c
@@ -1488,16 +1488,19 @@ ia64_handle_unaligned (unsigned long ifa, struct pt_regs *regs)
               case LDFA_OP:
               case LDFCCLR_OP:
               case LDFCNC_OP:
-              case LDF_IMM_OP:
-              case LDFA_IMM_OP:
-              case LDFCCLR_IMM_OP:
-              case LDFCNC_IMM_OP:
                 if (u.insn.x)
                         ret = emulate_load_floatpair(ifa, u.insn, regs);
                 else
                         ret = emulate_load_float(ifa, u.insn, regs);
                 break;
 
+              case LDF_IMM_OP:
+              case LDFA_IMM_OP:
+              case LDFCCLR_IMM_OP:
+              case LDFCNC_IMM_OP:
+                ret = emulate_load_float(ifa, u.insn, regs);
+                break;
+
               case STF_OP:
               case STF_IMM_OP:
                 ret = emulate_store_float(ifa, u.insn, regs);
diff --git a/arch/ia64/kernel/uncached.c b/arch/ia64/kernel/uncached.c
index a7be4f203420..2a90c32024f4 100644
--- a/arch/ia64/kernel/uncached.c
+++ b/arch/ia64/kernel/uncached.c
@@ -118,7 +118,7 @@ static int uncached_add_chunk(struct uncached_pool *uc_pool, int nid)
         for (i = 0; i < (IA64_GRANULE_SIZE / PAGE_SIZE); i++)
                 SetPageUncached(&page[i]);
 
-        flush_tlb_kernel_range(uc_addr, uc_adddr + IA64_GRANULE_SIZE);
+        flush_tlb_kernel_range(uc_addr, uc_addr + IA64_GRANULE_SIZE);
 
         status = ia64_pal_prefetch_visibility(PAL_VISIBILITY_PHYSICAL);
         if (status == PAL_VISIBILITY_OK_REMOTE_NEEDED) {
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
index 00232b4357ba..80622acc95de 100644
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
@@ -27,8 +27,8 @@ SECTIONS
 {
   /* Sections to be discarded */
   /DISCARD/ : {
-        *(.exit.text)
-        *(.exit.data)
+        EXIT_TEXT
+        EXIT_DATA
         *(.exitcall.exit)
         *(.IA_64.unwind.exit.text)
         *(.IA_64.unwind_info.exit.text)
@@ -119,12 +119,12 @@ SECTIONS
   .init.text : AT(ADDR(.init.text) - LOAD_OFFSET)
         {
           _sinittext = .;
-          *(.init.text)
+          INIT_TEXT
           _einittext = .;
         }
 
   .init.data : AT(ADDR(.init.data) - LOAD_OFFSET)
-        { *(.init.data) }
+        { INIT_DATA }
 
 #ifdef CONFIG_BLK_DEV_INITRD
   .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET)
@@ -240,11 +240,12 @@ SECTIONS
   .sdata : AT(ADDR(.sdata) - LOAD_OFFSET)
         { *(.sdata) *(.sdata1) *(.srdata) }
   _edata  =  .;
-  _bss = .;
+  __bss_start = .;
   .sbss : AT(ADDR(.sbss) - LOAD_OFFSET)
         { *(.sbss) *(.scommon) }
   .bss : AT(ADDR(.bss) - LOAD_OFFSET)
         { *(.bss) *(COMMON) }
+  __bss_stop = .;
 
   _end = .;
 
diff --git a/arch/ia64/lib/Makefile b/arch/ia64/lib/Makefile
index 46edf8444c7e..98771e2a78af 100644
--- a/arch/ia64/lib/Makefile
+++ b/arch/ia64/lib/Makefile
@@ -11,8 +11,8 @@ lib-y := __divsi3.o __udivsi3.o __modsi3.o __umodsi3.o			\
         flush.o ip_fast_csum.o do_csum.o                                \
         memset.o strlen.o xor.o
 
-lib-$(CONFIG_ITANIUM)   += copy_page.o copy_user.o memcpy.o
-lib-$(CONFIG_MCKINLEY)  += copy_page_mck.o memcpy_mck.o
+obj-$(CONFIG_ITANIUM)   += copy_page.o copy_user.o memcpy.o
+obj-$(CONFIG_MCKINLEY)  += copy_page_mck.o memcpy_mck.o
 lib-$(CONFIG_PERFMON)   += carta_random.o
 
 AFLAGS___divdi3.o       =
diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c
index 1682fc639038..655da240d13c 100644
--- a/arch/ia64/mm/tlb.c
+++ b/arch/ia64/mm/tlb.c
@@ -10,6 +10,7 @@
  *              IPI based ptc implementation and A-step IPI implementation.
  * Rohit Seth <rohit.seth@intel.com>
  * Ken Chen <kenneth.w.chen@intel.com>
+ * Christophe de Dinechin <ddd@hp.com>: Avoid ptc.e on memory allocation
  */
 #include <linux/module.h>
 #include <linux/init.h>
@@ -89,9 +90,16 @@ ia64_global_tlb_purge (struct mm_struct *mm, unsigned long start,
 {
         static DEFINE_SPINLOCK(ptcg_lock);
 
-        if (mm != current->active_mm || !current->mm) {
-                flush_tlb_all();
-                return;
+        struct mm_struct *active_mm = current->active_mm;
+
+        if (mm != active_mm) {
+                /* Restore region IDs for mm */
+                if (mm && active_mm) {
+                        activate_context(mm);
+                } else {
+                        flush_tlb_all();
+                        return;
+                }
         }
 
         /* HW requires global serialization of ptc.ga.  */
@@ -107,6 +115,10 @@ ia64_global_tlb_purge (struct mm_struct *mm, unsigned long start,
                 } while (start < end);
         }
         spin_unlock(&ptcg_lock);
+
+        if (mm != active_mm) {
+                activate_context(active_mm);
+        }
 }
 
 void
@@ -180,7 +192,7 @@ ia64_tlb_init (void)
         long status;
 
         if ((status = ia64_pal_vm_page_size(&tr_pgbits, &purge.mask)) != 0) {
-                printk(KERN_ERR "PAL_VM_PAGE_SIZE failed with status=%ld;"
+                printk(KERN_ERR "PAL_VM_PAGE_SIZE failed with status=%ld; "
                        "defaulting to architected purge page-sizes.\n", status);
                 purge.mask = 0x115557000UL;
         }
diff --git a/arch/ia64/scripts/unwcheck.py b/arch/ia64/scripts/unwcheck.py
index c27849889e19..c27849889e19 100755..100644
--- a/arch/ia64/scripts/unwcheck.py
+++ b/arch/ia64/scripts/unwcheck.py
diff --git a/arch/ia64/sn/kernel/bte.c b/arch/ia64/sn/kernel/bte.c
index b362d6d6a8c8..9456d4034024 100644
--- a/arch/ia64/sn/kernel/bte.c
+++ b/arch/ia64/sn/kernel/bte.c
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (c) 2000-2006 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2007 Silicon Graphics, Inc.  All Rights Reserved.
  */
 
 #include <linux/module.h>
@@ -227,7 +227,7 @@ retry_bteop:
                      BTE_LNSTAT_LOAD(bte), *bte->most_rcnt_na));
 
         if (transfer_stat & IBLS_ERROR) {
-                bte_status = transfer_stat & ~IBLS_ERROR;
+                bte_status = BTE_GET_ERROR_STATUS(transfer_stat);
         } else {
                 bte_status = BTE_SUCCESS;
         }
diff --git a/arch/ia64/sn/kernel/bte_error.c b/arch/ia64/sn/kernel/bte_error.c
index 27c5936ccfe9..4cb09f3f1efc 100644
--- a/arch/ia64/sn/kernel/bte_error.c
+++ b/arch/ia64/sn/kernel/bte_error.c
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2007 Silicon Graphics, Inc.  All Rights Reserved.
  */
 
 #include <linux/types.h>
@@ -148,7 +148,11 @@ int shub2_bte_error_handler(unsigned long _nodepda)
         for (i = 0; i < BTES_PER_NODE; i++) {
                 bte = &err_nodepda->bte_if[i];
                 status = BTE_LNSTAT_LOAD(bte);
-                if ((status & IBLS_ERROR) || !(status & IBLS_BUSY))
+                if (status & IBLS_ERROR) {
+                        bte->bh_error = BTE_SHUB2_ERROR(status);
+                        continue;
+                }
+                if (!(status & IBLS_BUSY))
                         continue;
                 mod_timer(recovery_timer, jiffies + (HZ * 5));
                 BTE_PRINTK(("eh:%p:%d Marked Giving up\n", err_nodepda,
diff --git a/arch/ia64/sn/kernel/io_common.c b/arch/ia64/sn/kernel/io_common.c
index 4594770e685a..c4eb84f9e781 100644
--- a/arch/ia64/sn/kernel/io_common.c
+++ b/arch/ia64/sn/kernel/io_common.c
@@ -347,7 +347,7 @@ sn_common_bus_fixup(struct pci_bus *bus,
         if (controller->node >= num_online_nodes()) {
                 struct pcibus_bussoft *b = SN_PCIBUS_BUSSOFT(bus);
 
-                printk(KERN_WARNING "Device ASIC=%u XID=%u PBUSNUM=%u"
+                printk(KERN_WARNING "Device ASIC=%u XID=%u PBUSNUM=%u "
                        "L_IO=%lx L_MEM=%lx BASE=%lx\n",
                        b->bs_asic_type, b->bs_xid, b->bs_persist_busnum,
                        b->bs_legacy_io, b->bs_legacy_mem, b->bs_base);
@@ -545,19 +545,18 @@ sn_io_late_init(void)
                 nasid = NASID_GET(bussoft->bs_base);
                 cnode = nasid_to_cnodeid(nasid);
                 if ((bussoft->bs_asic_type == PCIIO_ASIC_TYPE_TIOCP) ||
-                    (bussoft->bs_asic_type == PCIIO_ASIC_TYPE_TIOCE)) {
-                        /* TIO PCI Bridge: find nearest node with CPUs */
+                    (bussoft->bs_asic_type == PCIIO_ASIC_TYPE_TIOCE) ||
+                    (bussoft->bs_asic_type == PCIIO_ASIC_TYPE_PIC)) {
+                        /* PCI Bridge: find nearest node with CPUs */
                         int e = sn_hwperf_get_nearest_node(cnode, NULL,
                                                            &near_cnode);
                         if (e < 0) {
                                 near_cnode = (cnodeid_t)-1; /* use any node */
-                                printk(KERN_WARNING "pcibr_bus_fixup: failed "
-                                       "to find near node with CPUs to TIO "
+                                printk(KERN_WARNING "sn_io_late_init: failed "
+                                       "to find near node with CPUs for "
                                        "node %d, err=%d\n", cnode, e);
                         }
                         PCI_CONTROLLER(bus)->node = near_cnode;
-                } else if (bussoft->bs_asic_type == PCIIO_ASIC_TYPE_PIC) {
-                        PCI_CONTROLLER(bus)->node = cnode;
                 }
         }
 
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index 1f38a3a68390..bb1d24929640 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -64,7 +64,6 @@ extern void sn_timer_init(void);
 extern unsigned long last_time_offset;
 extern void (*ia64_mark_idle) (int);
 extern void snidle(int);
-extern unsigned long long (*ia64_printk_clock)(void);
 
 unsigned long sn_rtc_cycles_per_second;
 EXPORT_SYMBOL(sn_rtc_cycles_per_second);
@@ -360,14 +359,6 @@ sn_scan_pcdp(void)
 
 static unsigned long sn2_rtc_initial;
 
-static unsigned long long ia64_sn2_printk_clock(void)
-{
-        unsigned long rtc_now = rtc_time();
-
-        return (rtc_now - sn2_rtc_initial) *
-                (1000000000 / sn_rtc_cycles_per_second);
-}
-
 /**
  * sn_setup - SN platform setup routine
  * @cmdline_p: kernel command line
@@ -468,8 +459,6 @@ void __init sn_setup(char **cmdline_p)
 
         platform_intr_list[ACPI_INTERRUPT_CPEI] = IA64_CPE_VECTOR;
 
-        ia64_printk_clock = ia64_sn2_printk_clock;
-
         printk("SGI SAL version %x.%02x\n", version >> 8, version & 0x00FF);
 
         /*
diff --git a/arch/ia64/sn/kernel/xp_nofault.S b/arch/ia64/sn/kernel/xp_nofault.S
index 54e8973b6e99..98e7c7dbfdd8 100644
--- a/arch/ia64/sn/kernel/xp_nofault.S
+++ b/arch/ia64/sn/kernel/xp_nofault.S
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (c) 2004-2005 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2004-2007 Silicon Graphics, Inc.  All Rights Reserved.
  */
 
 
@@ -14,6 +14,11 @@
  * PIO read fails, the MCA handler will force the error to look
  * corrected and vector to the xp_error_PIOR which will return an error.
  *
+ * The definition of "consumption" and the time it takes for an MCA
+ * to surface is processor implementation specific.  This code
+ * is sufficient on Itanium through the Montvale processor family.
+ * It may need to be adjusted for future processor implementations.
+ *
  *      extern int xp_nofault_PIOR(void *remote_register);
  */
 
@@ -22,11 +27,10 @@ xp_nofault_PIOR:
         mov     r8=r0                   // Stage a success return value
         ld8.acq r9=[r32];;              // PIO Read the specified register
         adds    r9=1,r9;;               // Add to force consumption
-        or      r9=r9,r9;;              // Or to force consumption
+        srlz.i;;                        // Allow time for MCA to surface
         br.ret.sptk.many b0;;           // Return success
 
         .global xp_error_PIOR
 xp_error_PIOR:
         mov     r8=1                    // Return value of 1
         br.ret.sptk.many b0;;           // Return failure
-
diff --git a/arch/ia64/sn/pci/tioce_provider.c b/arch/ia64/sn/pci/tioce_provider.c
index cee9379d44e0..e1a3e19d3d9c 100644
--- a/arch/ia64/sn/pci/tioce_provider.c
+++ b/arch/ia64/sn/pci/tioce_provider.c
@@ -41,7 +41,7 @@
  *      } else
  *              do desired mmr access
  *
- * According to hw, we can use reads instead of writes to the above addres
+ * According to hw, we can use reads instead of writes to the above address
  *
  * Note this WAR can only to be used for accessing internal MMR's in the
  * TIOCE Coretalk Address Range 0x0 - 0x07ff_ffff.  This includes the