Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

Pull timer core updates from Thomas Gleixner:
 "The timer changes contain:

   - posix timer code consolidation and fixes for odd corner cases

   - sched_clock implementation moved from ARM to core code to avoid
     duplication by other architectures

   - alarm timer updates

   - clocksource and clockevents unregistration facilities

   - clocksource/events support for new hardware

   - precise nanoseconds RTC readout (Xen feature)

   - generic support for Xen suspend/resume oddities

   - the usual lot of fixes and cleanups all over the place

  The parts which touch other areas (ARM/XEN) have been coordinated with
  the relevant maintainers.  Though this results in an handful of
  trivial to solve merge conflicts, which we preferred over nasty cross
  tree merge dependencies.

  The patches which have been committed in the last few days are bug
  fixes plus the posix timer lot.  The latter was in akpms queue and
  next for quite some time; they just got forgotten and Frederic
  collected them last minute."

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (59 commits)
  hrtimer: Remove unused variable
  hrtimers: Move SMP function call to thread context
  clocksource: Reselect clocksource when watchdog validated high-res capability
  posix-cpu-timers: don't account cpu timer after stopped thread runtime accounting
  posix_timers: fix racy timer delta caching on task exit
  posix-timers: correctly get dying task time sample in posix_cpu_timer_schedule()
  selftests: add basic posix timers selftests
  posix_cpu_timers: consolidate expired timers check
  posix_cpu_timers: consolidate timer list cleanups
  posix_cpu_timer: consolidate expiry time type
  tick: Sanitize broadcast control logic
  tick: Prevent uncontrolled switch to oneshot mode
  tick: Make oneshot broadcast robust vs. CPU offlining
  x86: xen: Sync the CMOS RTC as well as the Xen wallclock
  x86: xen: Sync the wallclock when the system time is set
  timekeeping: Indicate that clock was set in the pvclock gtod notifier
  timekeeping: Pass flags instead of multiple bools to timekeeping_update()
  xen: Remove clock_was_set() call in the resume path
  hrtimers: Support resuming with two or more CPUs online (but stopped)
  timer: Fix jiffies wrap behavior of round_jiffies_common()
  ...

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/kernel/Makefile
index fccfbdb,97cb057..86d10dd
--- 1/arch/arm/kernel/Makefile
--- 2/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@@ -15,8 -15,8 +15,8 @@@ CFLAGS_REMOVE_return_address.o = -p
  
  # Object file lists.
  
 -obj-y         := elf.o entry-armv.o entry-common.o irq.o opcodes.o \
 +obj-y         := elf.o entry-common.o irq.o opcodes.o \
-                  process.o ptrace.o return_address.o sched_clock.o \
+                  process.o ptrace.o return_address.o \
                   setup.o signal.o stacktrace.o sys_arm.o time.o traps.o
  
  obj-$(CONFIG_ATAGS)           += atags_parse.o

diff --cc arch/arm/mach-integrator/integrator_ap.c
index a5b15c4,aa43462..d9e95e6
--- 1/arch/arm/mach-integrator/integrator_ap.c
--- 2/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@@ -41,6 -41,8 +41,7 @@@
  #include <linux/stat.h>
  #include <linux/sys_soc.h>
  #include <linux/termios.h>
 -#include <video/vga.h>
+ #include <linux/sched_clock.h>
  
  #include <mach/hardware.h>
  #include <mach/platform.h>

diff --cc arch/arm/mach-ixp4xx/common.c
Simple merge

diff --cc arch/arm/mach-omap2/timer.c
Simple merge

diff --cc arch/arm/mach-u300/timer.c
index 390ae5f,af771b7..b5db207
--- 1/arch/arm/mach-u300/timer.c
--- 2/arch/arm/mach-u300/timer.c
+++ b/arch/arm/mach-u300/timer.c
@@@ -18,12 -18,12 +18,12 @@@
  #include <linux/clk.h>
  #include <linux/err.h>
  #include <linux/irq.h>
 +#include <linux/delay.h>
 +#include <linux/of_address.h>
 +#include <linux/of_irq.h>
+ #include <linux/sched_clock.h>
  
 -#include <mach/hardware.h>
 -#include <mach/irqs.h>
 -
  /* Generic stuff */
- #include <asm/sched_clock.h>
  #include <asm/mach/map.h>
  #include <asm/mach/time.h>
  

diff --cc arch/x86/lguest/boot.c
Simple merge

diff --cc arch/x86/platform/efi/efi.c
Simple merge

diff --cc arch/x86/xen/time.c
index a690868,7a5671b..ee36589
--- 1/arch/x86/xen/time.c
--- 2/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
@@@ -14,7 -14,7 +14,8 @@@
  #include <linux/kernel_stat.h>
  #include <linux/math64.h>
  #include <linux/gfp.h>
 +#include <linux/slab.h>
+ #include <linux/pvclock_gtod.h>
  
  #include <asm/pvclock.h>
  #include <asm/xen/hypervisor.h>

diff --cc drivers/clocksource/Kconfig
Simple merge

diff --cc drivers/clocksource/clksrc-dbx500-prcmu.c
Simple merge

diff --cc drivers/clocksource/dw_apb_timer_of.c
index cef5544,d9a1e8d..4cbae4f
--- 1/drivers/clocksource/dw_apb_timer_of.c
--- 2/drivers/clocksource/dw_apb_timer_of.c
+++ b/drivers/clocksource/dw_apb_timer_of.c
@@@ -20,10 -20,7 +20,8 @@@
  #include <linux/of.h>
  #include <linux/of_address.h>
  #include <linux/of_irq.h>
- 
- #include <asm/mach/time.h>
- #include <asm/sched_clock.h>
 +#include <linux/clk.h>
+ #include <linux/sched_clock.h>
  
  static void timer_get_base_and_rate(struct device_node *np,
                                    void __iomem **base, u32 *rate)

diff --cc drivers/clocksource/nomadik-mtu.c
Simple merge

diff --cc drivers/xen/manage.c
Simple merge

diff --cc include/linux/dw_apb_timer.h
index 07261d5,b1cd959..1f79b20
--- 1/include/linux/dw_apb_timer.h
--- 2/include/linux/dw_apb_timer.h
+++ b/include/linux/dw_apb_timer.h
@@@ -51,6 -51,6 +51,5 @@@ dw_apb_clocksource_init(unsigned rating
  void dw_apb_clocksource_register(struct dw_apb_clocksource *dw_cs);
  void dw_apb_clocksource_start(struct dw_apb_clocksource *dw_cs);
  cycle_t dw_apb_clocksource_read(struct dw_apb_clocksource *dw_cs);
- void dw_apb_clocksource_unregister(struct dw_apb_clocksource *dw_cs);
  
 -extern void dw_apb_timer_init(void);
  #endif /* __DW_APB_TIMER_H__ */

diff --cc include/linux/efi.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc init/main.c
index f236653,bef4a6a..d03d2ec
--- 1/init/main.c
--- 2/init/main.c
+++ b/init/main.c
@@@ -554,7 -556,7 +555,8 @@@ asmlinkage void __init start_kernel(voi
        softirq_init();
        timekeeping_init();
        time_init();
+       sched_clock_postinit();
 +      perf_event_init();
        profile_init();
        call_function_init();
        WARN(!irqs_disabled(), "Interrupts were enabled early\n");

diff --cc kernel/hrtimer.c
Simple merge

diff --cc kernel/sched/stats.h
Simple merge