13 files changed, 97 insertions, 63 deletions

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 0b7f701d5cf7..70f7eb9fed35 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -516,7 +516,7 @@ source "arch/ia64/oprofile/Kconfig"
 
 config KPROBES
         bool "Kprobes (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && MODULES
+        depends on KALLSYMS && EXPERIMENTAL && MODULES
         help
           Kprobes allows you to trap at almost any kernel address and
           execute a callback function.  register_kprobe() establishes
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index 0daacc20ed36..246eb3d3757a 100644
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
@@ -940,7 +940,7 @@ static inline void show_serial_version(void)
         printk(KERN_INFO " no serial options enabled\n");
 }
 
-static struct tty_operations hp_ops = {
+static const struct tty_operations hp_ops = {
         .open = rs_open,
         .close = rs_close,
         .write = rs_write,
diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c
index bddbd22706ed..9d6a3f210148 100644
--- a/arch/ia64/ia32/sys_ia32.c
+++ b/arch/ia64/ia32/sys_ia32.c
@@ -125,6 +125,7 @@ sys32_execve (char __user *name, compat_uptr_t __user *argv, compat_uptr_t __use
 
 int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
 {
+        compat_ino_t ino;
         int err;
 
         if ((u64) stat->size > MAX_NON_LFS ||
@@ -132,11 +133,15 @@ int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
             !old_valid_dev(stat->rdev))
                 return -EOVERFLOW;
 
+        ino = stat->ino;
+        if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)
+                return -EOVERFLOW;
+
         if (clear_user(ubuf, sizeof(*ubuf)))
                 return -EFAULT;
 
         err  = __put_user(old_encode_dev(stat->dev), &ubuf->st_dev);
-        err |= __put_user(stat->ino, &ubuf->st_ino);
+        err |= __put_user(ino, &ubuf->st_ino);
         err |= __put_user(stat->mode, &ubuf->st_mode);
         err |= __put_user(stat->nlink, &ubuf->st_nlink);
         err |= __put_user(high2lowuid(stat->uid), &ubuf->st_uid);
@@ -1222,16 +1227,20 @@ struct readdir32_callback {
 };
 
 static int
-filldir32 (void *__buf, const char *name, int namlen, loff_t offset, ino_t ino,
+filldir32 (void *__buf, const char *name, int namlen, loff_t offset, u64 ino,
            unsigned int d_type)
 {
         struct compat_dirent __user * dirent;
         struct getdents32_callback * buf = (struct getdents32_callback *) __buf;
         int reclen = ROUND_UP(offsetof(struct compat_dirent, d_name) + namlen + 1, 4);
+        u32 d_ino;
 
         buf->error = -EINVAL;   /* only used if we fail.. */
         if (reclen > buf->count)
                 return -EINVAL;
+        d_ino = ino;
+        if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+                return -EOVERFLOW;
         buf->error = -EFAULT;   /* only used if we fail.. */
         dirent = buf->previous;
         if (dirent)
@@ -1239,7 +1248,7 @@ filldir32 (void *__buf, const char *name, int namlen, loff_t offset, ino_t ino,
                         return -EFAULT;
         dirent = buf->current_dir;
         buf->previous = dirent;
-        if (put_user(ino, &dirent->d_ino)
+        if (put_user(d_ino, &dirent->d_ino)
             || put_user(reclen, &dirent->d_reclen)
             || copy_to_user(dirent->d_name, name, namlen)
             || put_user(0, dirent->d_name + namlen))
@@ -1287,17 +1296,21 @@ out:
 }
 
 static int
-fillonedir32 (void * __buf, const char * name, int namlen, loff_t offset, ino_t ino,
+fillonedir32 (void * __buf, const char * name, int namlen, loff_t offset, u64 ino,
               unsigned int d_type)
 {
         struct readdir32_callback * buf = (struct readdir32_callback *) __buf;
         struct old_linux32_dirent __user * dirent;
+        u32 d_ino;
 
         if (buf->count)
                 return -EINVAL;
+        d_ino = ino;
+        if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
+                return -EOVERFLOW;
         buf->count++;
         dirent = buf->dirent;
-        if (put_user(ino, &dirent->d_ino)
+        if (put_user(d_ino, &dirent->d_ino)
             || put_user(offset, &dirent->d_offset)
             || put_user(namlen, &dirent->d_namlen)
             || copy_to_user(dirent->d_name, name, namlen)
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index 12701cf32d99..e5b1be51b197 100644
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -492,11 +492,11 @@ GLOBAL_ENTRY(prefetch_stack)
         br.ret.sptk.many rp
 END(prefetch_stack)
 
-GLOBAL_ENTRY(execve)
+GLOBAL_ENTRY(kernel_execve)
         mov r15=__NR_execve                     // put syscall number in place
         break __BREAK_SYSCALL
         br.ret.sptk.many rp
-END(execve)
+END(kernel_execve)
 
 GLOBAL_ENTRY(clone)
         mov r15=__NR_clone                      // put syscall number in place
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
index 169ec3a7156c..51217d63285e 100644
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
@@ -90,7 +90,7 @@ static void __kprobes update_kprobe_inst_flag(uint template, uint  slot,
         p->ainsn.target_br_reg = 0;
 
         /* Check for Break instruction
-         * Bits 37:40 Major opcode to be zero
+         * Bits 37:40 Major opcode to be zero
          * Bits 27:32 X6 to be zero
          * Bits 32:35 X3 to be zero
          */
@@ -104,19 +104,19 @@ static void __kprobes update_kprobe_inst_flag(uint template, uint  slot,
                 switch (major_opcode) {
                   case INDIRECT_CALL_OPCODE:
                         p->ainsn.inst_flag |= INST_FLAG_FIX_BRANCH_REG;
-                        p->ainsn.target_br_reg = ((kprobe_inst >> 6) & 0x7);
-                        break;
+                        p->ainsn.target_br_reg = ((kprobe_inst >> 6) & 0x7);
+                        break;
                   case IP_RELATIVE_PREDICT_OPCODE:
                   case IP_RELATIVE_BRANCH_OPCODE:
                         p->ainsn.inst_flag |= INST_FLAG_FIX_RELATIVE_IP_ADDR;
-                        break;
+                        break;
                   case IP_RELATIVE_CALL_OPCODE:
-                        p->ainsn.inst_flag |= INST_FLAG_FIX_RELATIVE_IP_ADDR;
-                        p->ainsn.inst_flag |= INST_FLAG_FIX_BRANCH_REG;
-                        p->ainsn.target_br_reg = ((kprobe_inst >> 6) & 0x7);
-                        break;
+                        p->ainsn.inst_flag |= INST_FLAG_FIX_RELATIVE_IP_ADDR;
+                        p->ainsn.inst_flag |= INST_FLAG_FIX_BRANCH_REG;
+                        p->ainsn.target_br_reg = ((kprobe_inst >> 6) & 0x7);
+                        break;
                 }
-        } else if (bundle_encoding[template][slot] == X) {
+        } else if (bundle_encoding[template][slot] == X) {
                 switch (major_opcode) {
                   case LONG_CALL_OPCODE:
                         p->ainsn.inst_flag |= INST_FLAG_FIX_BRANCH_REG;
@@ -258,18 +258,18 @@ static void __kprobes get_kprobe_inst(bundle_t *bundle, uint slot,
 
         switch (slot) {
           case 0:
-                *major_opcode = (bundle->quad0.slot0 >> SLOT0_OPCODE_SHIFT);
-                *kprobe_inst = bundle->quad0.slot0;
-                break;
+                *major_opcode = (bundle->quad0.slot0 >> SLOT0_OPCODE_SHIFT);
+                *kprobe_inst = bundle->quad0.slot0;
+                  break;
           case 1:
-                *major_opcode = (bundle->quad1.slot1_p1 >> SLOT1_p1_OPCODE_SHIFT);
-                kprobe_inst_p0 = bundle->quad0.slot1_p0;
-                kprobe_inst_p1 = bundle->quad1.slot1_p1;
-                *kprobe_inst = kprobe_inst_p0 | (kprobe_inst_p1 << (64-46));
+                *major_opcode = (bundle->quad1.slot1_p1 >> SLOT1_p1_OPCODE_SHIFT);
+                kprobe_inst_p0 = bundle->quad0.slot1_p0;
+                kprobe_inst_p1 = bundle->quad1.slot1_p1;
+                *kprobe_inst = kprobe_inst_p0 | (kprobe_inst_p1 << (64-46));
                 break;
           case 2:
-                *major_opcode = (bundle->quad1.slot2 >> SLOT2_OPCODE_SHIFT);
-                *kprobe_inst = bundle->quad1.slot2;
+                *major_opcode = (bundle->quad1.slot2 >> SLOT2_OPCODE_SHIFT);
+                *kprobe_inst = bundle->quad1.slot2;
                 break;
         }
 }
@@ -290,11 +290,11 @@ static int __kprobes valid_kprobe_addr(int template, int slot,
                 return -EINVAL;
         }
 
-        if (in_ivt_functions(addr)) {
-                printk(KERN_WARNING "Kprobes can't be inserted inside "
+        if (in_ivt_functions(addr)) {
+                printk(KERN_WARNING "Kprobes can't be inserted inside "
                                 "IVT functions at 0x%lx\n", addr);
-                return -EINVAL;
-        }
+                return -EINVAL;
+        }
 
         if (slot == 1 && bundle_encoding[template][1] != L) {
                 printk(KERN_WARNING "Inserting kprobes on slot #1 "
@@ -338,12 +338,13 @@ static void kretprobe_trampoline(void)
 int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
 {
         struct kretprobe_instance *ri = NULL;
-        struct hlist_head *head;
+        struct hlist_head *head, empty_rp;
         struct hlist_node *node, *tmp;
         unsigned long flags, orig_ret_address = 0;
         unsigned long trampoline_address =
                 ((struct fnptr *)kretprobe_trampoline)->ip;
 
+        INIT_HLIST_HEAD(&empty_rp);
         spin_lock_irqsave(&kretprobe_lock, flags);
         head = kretprobe_inst_table_head(current);
 
@@ -369,7 +370,7 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
                         ri->rp->handler(ri, regs);
 
                 orig_ret_address = (unsigned long)ri->ret_addr;
-                recycle_rp_inst(ri);
+                recycle_rp_inst(ri, &empty_rp);
 
                 if (orig_ret_address != trampoline_address)
                         /*
@@ -387,6 +388,10 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
         spin_unlock_irqrestore(&kretprobe_lock, flags);
         preempt_enable_no_resched();
 
+        hlist_for_each_entry_safe(ri, node, tmp, &empty_rp, hlist) {
+                hlist_del(&ri->hlist);
+                kfree(ri);
+        }
         /*
          * By returning a non-zero value, we are telling
          * kprobe_handler() that we don't want the post_handler
@@ -424,14 +429,14 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
         bundle_t *bundle;
 
         bundle = &((kprobe_opcode_t *)kprobe_addr)->bundle;
-        template = bundle->quad0.template;
+        template = bundle->quad0.template;
 
         if(valid_kprobe_addr(template, slot, addr))
                 return -EINVAL;
 
         /* Move to slot 2, if bundle is MLX type and kprobe slot is 1 */
-        if (slot == 1 && bundle_encoding[template][1] == L)
-                slot++;
+        if (slot == 1 && bundle_encoding[template][1] == L)
+                slot++;
 
         /* Get kprobe_inst and major_opcode from the bundle */
         get_kprobe_inst(bundle, slot, &kprobe_inst, &major_opcode);
@@ -489,21 +494,22 @@ void __kprobes arch_remove_kprobe(struct kprobe *p)
  */
 static void __kprobes resume_execution(struct kprobe *p, struct pt_regs *regs)
 {
-        unsigned long bundle_addr = (unsigned long) (&p->ainsn.insn->bundle);
-        unsigned long resume_addr = (unsigned long)p->addr & ~0xFULL;
-        unsigned long template;
-        int slot = ((unsigned long)p->addr & 0xf);
+        unsigned long bundle_addr = (unsigned long) (&p->ainsn.insn->bundle);
+        unsigned long resume_addr = (unsigned long)p->addr & ~0xFULL;
+        unsigned long template;
+        int slot = ((unsigned long)p->addr & 0xf);
 
         template = p->ainsn.insn->bundle.quad0.template;
 
-        if (slot == 1 && bundle_encoding[template][1] == L)
-                slot = 2;
+        if (slot == 1 && bundle_encoding[template][1] == L)
+                slot = 2;
 
         if (p->ainsn.inst_flag) {
 
                 if (p->ainsn.inst_flag & INST_FLAG_FIX_RELATIVE_IP_ADDR) {
                         /* Fix relative IP address */
-                        regs->cr_iip = (regs->cr_iip - bundle_addr) + resume_addr;
+                        regs->cr_iip = (regs->cr_iip - bundle_addr) +
+                                        resume_addr;
                 }
 
                 if (p->ainsn.inst_flag & INST_FLAG_FIX_BRANCH_REG) {
@@ -540,18 +546,18 @@ static void __kprobes resume_execution(struct kprobe *p, struct pt_regs *regs)
         }
 
         if (slot == 2) {
-                if (regs->cr_iip == bundle_addr + 0x10) {
-                        regs->cr_iip = resume_addr + 0x10;
-                }
-        } else {
-                if (regs->cr_iip == bundle_addr) {
-                        regs->cr_iip = resume_addr;
-                }
+                if (regs->cr_iip == bundle_addr + 0x10) {
+                        regs->cr_iip = resume_addr + 0x10;
+                }
+        } else {
+                if (regs->cr_iip == bundle_addr) {
+                        regs->cr_iip = resume_addr;
+                }
         }
 
 turn_ss_off:
-        /* Turn off Single Step bit */
-        ia64_psr(regs)->ss = 0;
+        /* Turn off Single Step bit */
+        ia64_psr(regs)->ss = 0;
 }
 
 static void __kprobes prepare_ss(struct kprobe *p, struct pt_regs *regs)
@@ -587,7 +593,7 @@ static int __kprobes is_ia64_break_inst(struct pt_regs *regs)
 
         /* Move to slot 2, if bundle is MLX type and kprobe slot is 1 */
         if (slot == 1 && bundle_encoding[template][1] == L)
-                slot++;
+                slot++;
 
         /* Get Kprobe probe instruction at given slot*/
         get_kprobe_inst(&bundle, slot, &kprobe_inst, &major_opcode);
@@ -627,7 +633,7 @@ static int __kprobes pre_kprobes_handler(struct die_args *args)
                 if (p) {
                         if ((kcb->kprobe_status == KPROBE_HIT_SS) &&
                              (p->ainsn.inst_flag == INST_FLAG_BREAK_INST)) {
-                                ia64_psr(regs)->ss = 0;
+                                ia64_psr(regs)->ss = 0;
                                 goto no_kprobe;
                         }
                         /* We have reentered the pre_kprobe_handler(), since
@@ -887,7 +893,7 @@ int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
          * fix the return address to our jprobe_inst_return() function
          * in the jprobes.S file
          */
-        regs->b0 = ((struct fnptr *)(jprobe_inst_return))->ip;
+        regs->b0 = ((struct fnptr *)(jprobe_inst_return))->ip;
 
         return 1;
 }
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index bfbd8986153b..663230183254 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -388,7 +388,7 @@ ia64_log_get(int sal_info_type, u8 **buffer, int irq_safe)
 {
         sal_log_record_header_t     *log_buffer;
         u64                         total_len = 0;
-        int                         s;
+        unsigned long               s;
 
         IA64_LOG_LOCK(sal_info_type);
 
diff --git a/arch/ia64/kernel/numa.c b/arch/ia64/kernel/numa.c
index 20340631179f..a78b45f5fe2f 100644
--- a/arch/ia64/kernel/numa.c
+++ b/arch/ia64/kernel/numa.c
@@ -28,6 +28,7 @@ u16 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
 EXPORT_SYMBOL(cpu_to_node_map);
 
 cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
+EXPORT_SYMBOL(node_to_cpu_mask);
 
 void __cpuinit map_cpu_to_node(int cpu, int nid)
 {
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index ea914cc6812a..51922b98086a 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -8,8 +8,6 @@
  * 2005-10-07 Keith Owens <kaos@sgi.com>
  *            Add notify_die() hooks.
  */
-#define __KERNEL_SYSCALLS__     /* see <asm/unistd.h> */
-
 #include <linux/cpu.h>
 #include <linux/pm.h>
 #include <linux/elf.h>
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index 16262687a103..62e07f906e05 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -29,8 +29,6 @@
 #include <asm/sections.h>
 #include <asm/system.h>
 
-extern unsigned long wall_jiffies;
-
 volatile int time_keeper_id = 0; /* smp_processor_id() of time-keeper */
 
 #ifdef CONFIG_IA64_DEBUG_IRQ
diff --git a/arch/ia64/mm/numa.c b/arch/ia64/mm/numa.c
index 64e4c21f311c..7807fc5c0422 100644
--- a/arch/ia64/mm/numa.c
+++ b/arch/ia64/mm/numa.c
@@ -16,6 +16,7 @@
 #include <linux/node.h>
 #include <linux/init.h>
 #include <linux/bootmem.h>
+#include <linux/module.h>
 #include <asm/mmzone.h>
 #include <asm/numa.h>
 
@@ -69,4 +70,21 @@ int early_pfn_to_nid(unsigned long pfn)
 
         return 0;
 }
+
+#ifdef CONFIG_MEMORY_HOTPLUG
+/*
+ *  SRAT information is stored in node_memblk[], then we can use SRAT
+ *  information at memory-hot-add if necessary.
+ */
+
+int memory_add_physaddr_to_nid(u64 addr)
+{
+        int nid = paddr_to_nid(addr);
+        if (nid < 0)
+                return 0;
+        return nid;
+}
+
+EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
+#endif
 #endif
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index b632b9c1e3b3..462ea178f49a 100644
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -423,7 +423,7 @@ static int sn_topology_show(struct seq_file *s, void *d)
                         "coherency_domain %d, "
                         "region_size %d\n",
 
-                        partid, system_utsname.nodename,
+                        partid, utsname()->nodename,
                         shubtype ? "shub2" : "shub1", 
                         (u64)nasid_mask << nasid_shift, nasid_msb, nasid_shift,
                         system_size, sharing_size, coher, region_size);
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_ate.c b/arch/ia64/sn/pci/pcibr/pcibr_ate.c
index 1f0253bfe0a0..5eb1e1e078b4 100644
--- a/arch/ia64/sn/pci/pcibr/pcibr_ate.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_ate.c
@@ -160,7 +160,7 @@ void pcibr_ate_free(struct pcibus_info *pcibus_info, int index)
 
         volatile u64 ate;
         int count;
-        u64 flags;
+        unsigned long flags;
 
         if (pcibr_invalidate_ate) {
                 /* For debugging purposes, clear the valid bit in the ATE */
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_dma.c b/arch/ia64/sn/pci/pcibr/pcibr_dma.c
index a86c7b945962..1ee977fb6ebb 100644
--- a/arch/ia64/sn/pci/pcibr/pcibr_dma.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_dma.c
@@ -237,7 +237,7 @@ void sn_dma_flush(u64 addr)
         int is_tio;
         int wid_num;
         int i, j;
-        u64 flags;
+        unsigned long flags;
         u64 itte;
         struct hubdev_info *hubinfo;
         struct sn_flush_device_kernel *p;