From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Oct 2012 13:17:48 +0000 (+0900)
Subject: Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.7-rc1~35
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=03d3602a833715f83ea53b9feb078b9c4c5f6c1a;p=platform%2Fkernel%2Flinux-3.10.git

Merge branch 'timers-core-for-linus' of git://git./linux/kernel/git/tip/tip

Pull timer core update from Thomas Gleixner:
 - Bug fixes (one for a longstanding dead loop issue)
 - Rework of time related vsyscalls
 - Alarm timer updates
 - Jiffies updates to remove compile time dependencies

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timekeeping: Cast raw_interval to u64 to avoid shift overflow
  timers: Fix endless looping between cascade() and internal_add_timer()
  time/jiffies: bring back unconditional LATCH definition
  time: Convert x86_64 to using new update_vsyscall
  time: Only do nanosecond rounding on GENERIC_TIME_VSYSCALL_OLD systems
  time: Introduce new GENERIC_TIME_VSYSCALL
  time: Convert CONFIG_GENERIC_TIME_VSYSCALL to CONFIG_GENERIC_TIME_VSYSCALL_OLD
  time: Move update_vsyscall definitions to timekeeper_internal.h
  time: Move timekeeper structure to timekeeper_internal.h for vsyscall changes
  jiffies: Remove compile time assumptions about CLOCK_TICK_RATE
  jiffies: Kill unused TICK_USEC_TO_NSEC
  alarmtimer: Rename alarmtimer_remove to alarmtimer_dequeue
  alarmtimer: Remove unused helpers & defines
  alarmtimer: Use hrtimer per-alarm instead of per-base
  alarmtimer: Implement minimum alarm interval for allowing suspend
---

03d3602a833715f83ea53b9feb078b9c4c5f6c1a
diff --cc arch/s390/Kconfig
index 99d2d79,ba488aa..e5dac12
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -128,10 -119,9 +128,10 @@@ config S39
  	select ARCH_INLINE_WRITE_UNLOCK_BH
  	select ARCH_INLINE_WRITE_UNLOCK_IRQ
  	select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
 +	select HAVE_UID16 if 32BIT
  	select ARCH_WANT_IPC_PARSE_VERSION
  	select GENERIC_SMP_IDLE_THREAD
- 	select GENERIC_TIME_VSYSCALL
+ 	select GENERIC_TIME_VSYSCALL_OLD
  	select GENERIC_CLOCKEVENTS
  	select KTIME_SCALAR if 32BIT
  	select HAVE_ARCH_SECCOMP_FILTER