Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Fix iosapic interrupt delivery mode for CPE
  [IA64] kprobe: make kreturn probe handler stack unwind correct
  [IA64] operator priority fix in acpi_map_lsapic()
  [IA64] Add missing "space" to concatenated strings
  [IA64] make full use of macro efi_md_size
  [IA64] rename _bss to __bss_start
  [IA64] SGI Altix : fix bug in sn_io_late_init()
  [IA64] iosapic cleanup
  [IA64] signal : fix missing error checkings
  [IA64] export copy_page() to modules
  [IA64] don't assume that unwcheck.py is executable
  [IA64] increase .data.patch offset

16 files changed, 56 insertions, 51 deletions

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/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/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/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/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/setup.c b/arch/ia64/kernel/setup.c
index 2b3751eef5ce..4ac2b1f1bd3b 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -95,7 +95,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 +205,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);
diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c
index cdb64cc4d9c8..4c730099d58f 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);
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
index 00232b4357ba..757e419ebcf8 100644
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
@@ -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..cef164729db7 100644
--- a/arch/ia64/mm/tlb.c
+++ b/arch/ia64/mm/tlb.c
@@ -180,7 +180,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/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;
                 }
         }