Merge branch 'clksrc' into devel

Conflicts:
	arch/arm/mach-vexpress/v2m.c
	arch/arm/plat-omap/counter_32k.c
	arch/arm/plat-versatile/Makefile

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/common/timer-sp.c
Simple merge

diff --cc arch/arm/include/asm/system.h
Simple merge

diff --cc arch/arm/kernel/entry-common.S
Simple merge

diff --cc arch/arm/kernel/smp.c
Simple merge

diff --cc arch/arm/mach-realview/core.c
index 14fbe50376b6888798f3821360d2175d1227944f,3d653e05b75d621186c1cccda457dc95a8490c01..aad806c5cb12058a2f9ff9f66004283a2a27c006
--- 1/arch/arm/mach-realview/core.c
--- 2/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@@ -50,10 -50,15 +50,12 @@@
  #include <mach/clkdev.h>
  #include <mach/platform.h>
  #include <mach/irqs.h>
 -#include <plat/timer-sp.h>
 +#include <asm/hardware/timer-sp.h>
  
+ #include <plat/sched_clock.h>
+ 
  #include "core.h"
  
 -/* used by entry-macro.S and platsmp.c */
 -void __iomem *gic_cpu_base_addr;
 -
  #ifdef CONFIG_ZONE_DMA
  /*
   * Adjust the zones if there are restrictions for DMA access.

diff --cc arch/arm/mach-sa1100/generic.c
Simple merge

diff --cc arch/arm/mach-versatile/core.c
index 6b93bd60027129f8bc107cec157a58e4a308218b,56cdc2257424d7fd1e2b9e012ecb293b796a0dcd..40a024c71e4b56e5b48c4068b197ba67f131a6a0
--- 1/arch/arm/mach-versatile/core.c
--- 2/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@@ -49,8 -49,10 +49,10 @@@
  #include <mach/clkdev.h>
  #include <mach/hardware.h>
  #include <mach/platform.h>
 -#include <plat/timer-sp.h>
 +#include <asm/hardware/timer-sp.h>
  
+ #include <plat/sched_clock.h>
+ 
  #include "core.h"
  
  /*

diff --cc arch/arm/mach-vexpress/v2m.c
index 91ff2e0df8569c235d22eeb720edfc144b49816b,8c283100a9a0c73232b7eaa4d8cd3b0ebc58f701..de13603dc028313966899de0154c1aa97fbaf394
--- 1/arch/arm/mach-vexpress/v2m.c
--- 2/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@@ -18,12 -18,14 +18,13 @@@
  #include <asm/mach/map.h>
  #include <asm/mach/time.h>
  #include <asm/hardware/arm_timer.h>
++#include <asm/hardware/timer-sp.h>
  
  #include <mach/clkdev.h>
  #include <mach/motherboard.h>
  
- #include <asm/hardware/timer-sp.h>
+ #include <plat/sched_clock.h>
  
 -#include <plat/timer-sp.h>
 -
  #include "core.h"
  
  #define V2M_PA_CS0    0x40000000

diff --cc arch/arm/plat-iop/time.c
index 558cdfaf76b6a22a4ff6ff3a5190263c662a3268,2db6e60d149deba6f1d6651ef4aa64f68cb69243..07f23bb42bed4c4d4a47cce31b018709fabe0a61
--- 1/arch/arm/plat-iop/time.c
--- 2/arch/arm/plat-iop/time.c
+++ b/arch/arm/plat-iop/time.c
@@@ -17,8 -17,8 +17,9 @@@
  #include <linux/interrupt.h>
  #include <linux/time.h>
  #include <linux/init.h>
+ #include <linux/sched.h>
  #include <linux/timex.h>
 +#include <linux/sched.h>
  #include <linux/io.h>
  #include <linux/clocksource.h>
  #include <linux/clockchips.h>

diff --cc arch/arm/plat-omap/counter_32k.c
index 8722a136f3a5bee844f5643dd195c95f077db666,1b558efbe7320ee2c9436893c2d402d9f667666e..ea4644021fb9c0867c2e4ca4bd4bcb118e863f80
--- 1/arch/arm/plat-omap/counter_32k.c
--- 2/arch/arm/plat-omap/counter_32k.c
+++ b/arch/arm/plat-omap/counter_32k.c
@@@ -15,8 -15,10 +15,11 @@@
  #include <linux/kernel.h>
  #include <linux/init.h>
  #include <linux/clk.h>
- #include <linux/io.h>
 +#include <linux/err.h>
+ #include <linux/io.h>
+ #include <linux/sched.h>
+ 
+ #include <asm/sched_clock.h>
  
  #include <plat/common.h>
  #include <plat/board.h>
@@@ -165,16 -181,16 +182,16 @@@ static int __init omap_init_clocksource
                        return -ENODEV;
  
                sync_32k_ick = clk_get(NULL, "omap_32ksync_ick");
 -              if (sync_32k_ick)
 +              if (!IS_ERR(sync_32k_ick))
                        clk_enable(sync_32k_ick);
  
-               clocksource_32k.mult = clocksource_hz2mult(32768,
-                                           clocksource_32k.shift);
- 
                offset_32k = clocksource_32k.read(&clocksource_32k);
  
-               if (clocksource_register(&clocksource_32k))
+               if (clocksource_register_hz(&clocksource_32k, 32768))
                        printk(err, clocksource_32k.name);
+ 
+               init_fixed_sched_clock(&cd, omap_update_sched_clock, 32,
+                                      32768, SC_MULT, SC_SHIFT);
        }
        return 0;
  }

diff --cc arch/arm/plat-versatile/Makefile
index aaa571d17924fc4085fb43e29f587f5026c4d472,8bb6ba6d3572b28ad64c075be7a6410f225a6e05..16dde08199349b4a004ab58746f43d40d0d88424
--- 1/arch/arm/plat-versatile/Makefile
--- 2/arch/arm/plat-versatile/Makefile
+++ b/arch/arm/plat-versatile/Makefile
@@@ -1,6 -1,8 +1,7 @@@
  obj-y := clock.o
- obj-$(CONFIG_ARCH_REALVIEW) += sched-clock.o
- obj-$(CONFIG_ARCH_VERSATILE) += sched-clock.o
 -obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o
+ ifneq ($(CONFIG_ARCH_INTEGRATOR),y)
+ obj-y += sched-clock.o
+ endif
  ifeq ($(CONFIG_LEDS_CLASS),y)
  obj-$(CONFIG_ARCH_REALVIEW) += leds.o
  obj-$(CONFIG_ARCH_VERSATILE) += leds.o