4 files changed, 22 insertions, 18 deletions

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 6bbd93dd186a..29efc9f82057 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -357,6 +357,9 @@ static void __init setup_processor(void)
 #ifndef CONFIG_VFP
         elf_hwcap &= ~HWCAP_VFP;
 #endif
+#ifndef CONFIG_IWMMXT
+        elf_hwcap &= ~HWCAP_IWMMXT;
+#endif
 
         cpu_proc_init();
 }
@@ -854,6 +857,7 @@ static const char *hwcap_str[] = {
         "vfp",
         "edsp",
         "java",
+        "iwmmxt",
         NULL
 };
 
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 421329f5e18e..070bcb7a6306 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -7,6 +7,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+#include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
@@ -19,6 +20,7 @@
 #include <linux/cpu.h>
 #include <linux/smp.h>
 #include <linux/seq_file.h>
+#include <linux/irq.h>
 
 #include <asm/atomic.h>
 #include <asm/cacheflush.h>
@@ -449,6 +451,7 @@ int smp_call_function(void (*func)(void *info), void *info, int retry,
         return smp_call_function_on_cpu(func, info, retry, wait,
                                         cpu_online_map);
 }
+EXPORT_SYMBOL_GPL(smp_call_function);
 
 void show_ipi_list(struct seq_file *p)
 {
@@ -474,25 +477,26 @@ void show_local_irqs(struct seq_file *p)
         seq_putc(p, '\n');
 }
 
-static void ipi_timer(struct pt_regs *regs)
+static void ipi_timer(void)
 {
-        int user = user_mode(regs);
-
         irq_enter();
-        profile_tick(CPU_PROFILING, regs);
-        update_process_times(user);
+        profile_tick(CPU_PROFILING);
+        update_process_times(user_mode(get_irq_regs()));
         irq_exit();
 }
 
 #ifdef CONFIG_LOCAL_TIMERS
 asmlinkage void do_local_timer(struct pt_regs *regs)
 {
+        struct pt_regs *old_regs = set_irq_regs(regs);
         int cpu = smp_processor_id();
 
         if (local_timer_ack()) {
                 irq_stat[cpu].local_timer_irqs++;
-                ipi_timer(regs);
+                ipi_timer();
         }
+
+        set_irq_regs(old_regs);
 }
 #endif
 
@@ -551,6 +555,7 @@ asmlinkage void do_IPI(struct pt_regs *regs)
 {
         unsigned int cpu = smp_processor_id();
         struct ipi_data *ipi = &per_cpu(ipi_data, cpu);
+        struct pt_regs *old_regs = set_irq_regs(regs);
 
         ipi->ipi_count++;
 
@@ -574,7 +579,7 @@ asmlinkage void do_IPI(struct pt_regs *regs)
 
                         switch (nextmsg) {
                         case IPI_TIMER:
-                                ipi_timer(regs);
+                                ipi_timer();
                                 break;
 
                         case IPI_RESCHEDULE:
@@ -599,6 +604,8 @@ asmlinkage void do_IPI(struct pt_regs *regs)
                         }
                 } while (msgs);
         }
+
+        set_irq_regs(old_regs);
 }
 
 void smp_send_reschedule(int cpu)
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index c03cab5c4c79..6ff5e3ff6cb5 100644
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -220,10 +220,10 @@ EXPORT_SYMBOL(leds_event);
 #ifdef CONFIG_LEDS_TIMER
 static inline void do_leds(void)
 {
-        static unsigned int count = 50;
+        static unsigned int count = HZ/2;
 
         if (--count == 0) {
-                count = 50;
+                count = HZ/2;
                 leds_event(led_timer);
         }
 }
@@ -327,13 +327,12 @@ EXPORT_SYMBOL(restore_time_delta);
  */
 void timer_tick(void)
 {
-        struct pt_regs *regs = get_irq_regs();
         profile_tick(CPU_PROFILING);
         do_leds();
         do_set_rtc();
         do_timer(1);
 #ifndef CONFIG_SMP
-        update_process_times(user_mode(regs));
+        update_process_times(user_mode(get_irq_regs()));
 #endif
 }
 
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index 3ca574ee2772..a8fa75ea07a9 100644
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -45,13 +45,7 @@ SECTIONS
                         *(.early_param.init)
                 __early_end = .;
                 __initcall_start = .;
-                        *(.initcall1.init)
-                        *(.initcall2.init)
-                        *(.initcall3.init)
-                        *(.initcall4.init)
-                        *(.initcall5.init)
-                        *(.initcall6.init)
-                        *(.initcall7.init)
+                        INITCALLS
                 __initcall_end = .;
                 __con_initcall_start = .;
                         *(.con_initcall.init)