6 files changed, 43 insertions, 6 deletions

diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
index 2895d6e6062f..89a70400c4f6 100644
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
@@ -630,7 +630,7 @@ static int __kprobes pre_kprobes_handler(struct die_args *args)
                          */
                         save_previous_kprobe(kcb);
                         set_current_kprobe(p, kcb);
-                        p->nmissed++;
+                        kprobes_inc_nmissed_count(p);
                         prepare_ss(p, regs);
                         kcb->kprobe_status = KPROBE_REENTER;
                         return 1;
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 2e33665d9c18..e9904c74d2ba 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -721,8 +721,13 @@ flush_thread (void)
         /* drop floating-point and debug-register state if it exists: */
         current->thread.flags &= ~(IA64_THREAD_FPH_VALID | IA64_THREAD_DBG_VALID);
         ia64_drop_fpu(current);
-        if (IS_IA32_PROCESS(ia64_task_regs(current)))
+#ifdef CONFIG_IA32_SUPPORT
+        if (IS_IA32_PROCESS(ia64_task_regs(current))) {
                 ia32_drop_partial_page_list(current);
+                current->thread.task_size = IA32_PAGE_OFFSET;
+                set_fs(USER_DS);
+        }
+#endif
 }
 
 /*
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
index ca68e6e44a72..1461dc660b43 100644
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
@@ -293,7 +293,7 @@ retry:
                 if (file->f_flags & O_NONBLOCK)
                         return -EAGAIN;
                 if (down_interruptible(&data->sem))
-                        return -ERESTARTSYS;
+                        return -EINTR;
         }
 
         n = data->cpu_check;
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index 5b7e736f3b49..028a2b95936c 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -249,3 +249,32 @@ time_init (void)
          */
         set_normalized_timespec(&wall_to_monotonic, -xtime.tv_sec, -xtime.tv_nsec);
 }
+
+#define SMALLUSECS 100
+
+void
+udelay (unsigned long usecs)
+{
+        unsigned long start;
+        unsigned long cycles;
+        unsigned long smallusecs;
+
+        /*
+         * Execute the non-preemptible delay loop (because the ITC might
+         * not be synchronized between CPUS) in relatively short time
+         * chunks, allowing preemption between the chunks.
+         */
+        while (usecs > 0) {
+                smallusecs = (usecs > SMALLUSECS) ? SMALLUSECS : usecs;
+                preempt_disable();
+                cycles = smallusecs*local_cpu_data->cyc_per_usec;
+                start = ia64_get_itc();
+
+                while (ia64_get_itc() - start < cycles)
+                        cpu_relax();
+
+                preempt_enable();
+                usecs -= smallusecs;
+        }
+}
+EXPORT_SYMBOL(udelay);
diff --git a/arch/ia64/kernel/uncached.c b/arch/ia64/kernel/uncached.c
index c6d40446c2c4..b631cf86ed44 100644
--- a/arch/ia64/kernel/uncached.c
+++ b/arch/ia64/kernel/uncached.c
@@ -53,7 +53,7 @@ static void uncached_ipi_visibility(void *data)
         if ((status != PAL_VISIBILITY_OK) &&
             (status != PAL_VISIBILITY_OK_REMOTE_NEEDED))
                 printk(KERN_DEBUG "pal_prefetch_visibility() returns %i on "
-                       "CPU %i\n", status, get_cpu());
+                       "CPU %i\n", status, raw_smp_processor_id());
 }
 
 
@@ -63,7 +63,7 @@ static void uncached_ipi_mc_drain(void *data)
         status = ia64_pal_mc_drain();
         if (status)
                 printk(KERN_WARNING "ia64_pal_mc_drain() failed with %i on "
-                       "CPU %i\n", status, get_cpu());
+                       "CPU %i\n", status, raw_smp_processor_id());
 }
 
 
@@ -105,7 +105,7 @@ uncached_get_new_chunk(struct gen_pool *poolp)
         status = ia64_pal_prefetch_visibility(PAL_VISIBILITY_PHYSICAL);
 
         dprintk(KERN_INFO "pal_prefetch_visibility() returns %i on cpu %i\n",
-                status, get_cpu());
+                status, raw_smp_processor_id());
 
         if (!status) {
                 status = smp_call_function(uncached_ipi_visibility, NULL, 0, 1);
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
index 30d8564e9603..73af6267d2ef 100644
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
@@ -177,6 +177,9 @@ SECTIONS
         }
   . = ALIGN(PAGE_SIZE);         /* make sure the gate page doesn't expose kernel data */
 
+  .data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET)
+        { *(.data.read_mostly) }
+
   .data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET)
         { *(.data.cacheline_aligned) }