Re: [GIT PULL] timers for 3.7
On Fri, 12 Oct 2012, Thomas Gleixner wrote:
> Linus,
>
> please pull the latest timers-core-for-linus git tree from:
>
>git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
> timers-core-for-linus
Forgot to add the short description:
* Bug fixes (one for a long standing dead loop issue)
* Rework of time related vsyscalls
* Timer extensions for workqueues
* Alarm timer updates
* Jiffies updates to remove compile time dependencies
Thanks,
tglx
> -->
> Arnd Bergmann (1):
> time/jiffies: bring back unconditional LATCH definition
>
> Dan Carpenter (1):
> timekeeping: Cast raw_interval to u64 to avoid shift overflow
>
> Hildner, Christian (1):
> timers: Fix endless looping between cascade() and internal_add_timer()
>
> John Stultz (11):
> alarmtimer: Use hrtimer per-alarm instead of per-base
> alarmtimer: Remove unused helpers & defines
> alarmtimer: Rename alarmtimer_remove to alarmtimer_dequeue
> jiffies: Kill unused TICK_USEC_TO_NSEC
> jiffies: Remove compile time assumptions about CLOCK_TICK_RATE
> time: Move timekeeper structure to timekeeper_internal.h for vsyscall
> changes
> time: Move update_vsyscall definitions to timekeeper_internal.h
> time: Convert CONFIG_GENERIC_TIME_VSYSCALL to
> CONFIG_GENERIC_TIME_VSYSCALL_OLD
> time: Introduce new GENERIC_TIME_VSYSCALL
> time: Only do nanosecond rounding on GENERIC_TIME_VSYSCALL_OLD systems
> time: Convert x86_64 to using new update_vsyscall
>
> Tejun Heo (4):
> timer: Generalize timer->base flags handling
> timer: Relocate declarations of init_timer_on_stack_key()
> timer: Clean up timer initializers
> timer: Implement TIMER_IRQSAFE
>
> Todd Poynor (1):
> alarmtimer: Implement minimum alarm interval for allowing suspend
>
>
> arch/ia64/Kconfig |2 +-
> arch/ia64/kernel/time.c |4 +-
> arch/powerpc/Kconfig|2 +-
> arch/powerpc/kernel/time.c |4 +-
> arch/s390/Kconfig |2 +-
> arch/s390/kernel/time.c |4 +-
> arch/x86/include/asm/vgtod.h|4 +-
> arch/x86/kernel/setup.c |3 +
> arch/x86/kernel/vsyscall_64.c | 49 ++
> arch/x86/vdso/vclock_gettime.c | 22 +++--
> include/linux/alarmtimer.h | 31 +--
> include/linux/clocksource.h | 16
> include/linux/jiffies.h | 20 +
> include/linux/timekeeper_internal.h | 108 +++
> include/linux/timer.h | 165
> ++-
> kernel/time.c |2 +-
> kernel/time/Kconfig |4 +
> kernel/time/alarmtimer.c| 118 +
> kernel/time/jiffies.c | 32 +++-
> kernel/time/timekeeping.c | 117 +++--
> kernel/timer.c | 118 -
> 21 files changed, 403 insertions(+), 424 deletions(-)
> create mode 100644 include/linux/timekeeper_internal.h
>
> diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
> index 310cf57..f9e673c 100644
> --- a/arch/ia64/Kconfig
> +++ b/arch/ia64/Kconfig
> @@ -38,7 +38,7 @@ config IA64
> select ARCH_TASK_STRUCT_ALLOCATOR
> select ARCH_THREAD_INFO_ALLOCATOR
> select ARCH_CLOCKSOURCE_DATA
> - select GENERIC_TIME_VSYSCALL
> + select GENERIC_TIME_VSYSCALL_OLD
> default y
> help
> The Itanium Processor Family is Intel's 64-bit successor to
> diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
> index ecc904b..d2f4e26 100644
> --- a/arch/ia64/kernel/time.c
> +++ b/arch/ia64/kernel/time.c
> @@ -19,7 +19,7 @@
> #include
> #include
> #include
> -#include
> +#include
> #include
>
> #include
> @@ -454,7 +454,7 @@ void update_vsyscall_tz(void)
> {
> }
>
> -void update_vsyscall(struct timespec *wall, struct timespec *wtm,
> +void update_vsyscall_old(struct timespec *wall, struct timespec *wtm,
> struct clocksource *c, u32 mult)
> {
> write_seqcount_begin(_gtod_data.seq);
> diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
> index 352f416..0881660 100644
> --- a/arch/powerpc/Kconfig
> +++ b/arch/powerpc/Kconfig
> @@ -135,7 +135,7 @@ config PPC
> select ARCH_HAVE_NMI_SAFE_CMPXCHG
> select GENERIC_SMP_IDLE_THREAD
> select GENERIC_CMOS_UPDATE
> - select GENERIC_TIME_VSYSCALL
> + select GENERIC_TIME_VSYSCALL_OLD
> select GENERIC_CLOCKEVENTS
> select GENERIC_STRNCPY_FROM_USER
> select GENERIC_STRNLEN_USER
> diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
> index e49e931..c825809 100644
> --- a/arch/powerpc/kernel/time.c
> +++ b/arch/powerpc/kernel/time.c
> @@ -73,7 +73,7 @@
> /* powerpc clocksource/clockevent code */
>
>
[GIT PULL] timers for 3.7
Linus,
please pull the latest timers-core-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
timers-core-for-linus
Thanks,
tglx
-->
Arnd Bergmann (1):
time/jiffies: bring back unconditional LATCH definition
Dan Carpenter (1):
timekeeping: Cast raw_interval to u64 to avoid shift overflow
Hildner, Christian (1):
timers: Fix endless looping between cascade() and internal_add_timer()
John Stultz (11):
alarmtimer: Use hrtimer per-alarm instead of per-base
alarmtimer: Remove unused helpers & defines
alarmtimer: Rename alarmtimer_remove to alarmtimer_dequeue
jiffies: Kill unused TICK_USEC_TO_NSEC
jiffies: Remove compile time assumptions about CLOCK_TICK_RATE
time: Move timekeeper structure to timekeeper_internal.h for vsyscall
changes
time: Move update_vsyscall definitions to timekeeper_internal.h
time: Convert CONFIG_GENERIC_TIME_VSYSCALL to
CONFIG_GENERIC_TIME_VSYSCALL_OLD
time: Introduce new GENERIC_TIME_VSYSCALL
time: Only do nanosecond rounding on GENERIC_TIME_VSYSCALL_OLD systems
time: Convert x86_64 to using new update_vsyscall
Tejun Heo (4):
timer: Generalize timer->base flags handling
timer: Relocate declarations of init_timer_on_stack_key()
timer: Clean up timer initializers
timer: Implement TIMER_IRQSAFE
Todd Poynor (1):
alarmtimer: Implement minimum alarm interval for allowing suspend
arch/ia64/Kconfig |2 +-
arch/ia64/kernel/time.c |4 +-
arch/powerpc/Kconfig|2 +-
arch/powerpc/kernel/time.c |4 +-
arch/s390/Kconfig |2 +-
arch/s390/kernel/time.c |4 +-
arch/x86/include/asm/vgtod.h|4 +-
arch/x86/kernel/setup.c |3 +
arch/x86/kernel/vsyscall_64.c | 49 ++
arch/x86/vdso/vclock_gettime.c | 22 +++--
include/linux/alarmtimer.h | 31 +--
include/linux/clocksource.h | 16
include/linux/jiffies.h | 20 +
include/linux/timekeeper_internal.h | 108 +++
include/linux/timer.h | 165 ++-
kernel/time.c |2 +-
kernel/time/Kconfig |4 +
kernel/time/alarmtimer.c| 118 +
kernel/time/jiffies.c | 32 +++-
kernel/time/timekeeping.c | 117 +++--
kernel/timer.c | 118 -
21 files changed, 403 insertions(+), 424 deletions(-)
create mode 100644 include/linux/timekeeper_internal.h
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 310cf57..f9e673c 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -38,7 +38,7 @@ config IA64
select ARCH_TASK_STRUCT_ALLOCATOR
select ARCH_THREAD_INFO_ALLOCATOR
select ARCH_CLOCKSOURCE_DATA
- select GENERIC_TIME_VSYSCALL
+ select GENERIC_TIME_VSYSCALL_OLD
default y
help
The Itanium Processor Family is Intel's 64-bit successor to
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index ecc904b..d2f4e26 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -19,7 +19,7 @@
#include
#include
#include
-#include
+#include
#include
#include
@@ -454,7 +454,7 @@ void update_vsyscall_tz(void)
{
}
-void update_vsyscall(struct timespec *wall, struct timespec *wtm,
+void update_vsyscall_old(struct timespec *wall, struct timespec *wtm,
struct clocksource *c, u32 mult)
{
write_seqcount_begin(_gtod_data.seq);
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 352f416..0881660 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -135,7 +135,7 @@ config PPC
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select GENERIC_SMP_IDLE_THREAD
select GENERIC_CMOS_UPDATE
- select GENERIC_TIME_VSYSCALL
+ select GENERIC_TIME_VSYSCALL_OLD
select GENERIC_CLOCKEVENTS
select GENERIC_STRNCPY_FROM_USER
select GENERIC_STRNLEN_USER
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index e49e931..c825809 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -73,7 +73,7 @@
/* powerpc clocksource/clockevent code */
#include
-#include
+#include
static cycle_t rtc_read(struct clocksource *);
static struct clocksource clocksource_rtc = {
@@ -712,7 +712,7 @@ static cycle_t timebase_read(struct clocksource *cs)
return (cycle_t)get_tb();
}
-void update_vsyscall(struct timespec *wall_time, struct timespec *wtm,
+void update_vsyscall_old(struct timespec *wall_time, struct timespec *wtm,
struct clocksource *clock, u32 mult)
{
u64 new_tb_to_xs, new_stamp_xsec;
diff --git a/arch/s390/Kconfig
[GIT PULL] timers for 3.7
Linus,
please pull the latest timers-core-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
timers-core-for-linus
Thanks,
tglx
--
Arnd Bergmann (1):
time/jiffies: bring back unconditional LATCH definition
Dan Carpenter (1):
timekeeping: Cast raw_interval to u64 to avoid shift overflow
Hildner, Christian (1):
timers: Fix endless looping between cascade() and internal_add_timer()
John Stultz (11):
alarmtimer: Use hrtimer per-alarm instead of per-base
alarmtimer: Remove unused helpers defines
alarmtimer: Rename alarmtimer_remove to alarmtimer_dequeue
jiffies: Kill unused TICK_USEC_TO_NSEC
jiffies: Remove compile time assumptions about CLOCK_TICK_RATE
time: Move timekeeper structure to timekeeper_internal.h for vsyscall
changes
time: Move update_vsyscall definitions to timekeeper_internal.h
time: Convert CONFIG_GENERIC_TIME_VSYSCALL to
CONFIG_GENERIC_TIME_VSYSCALL_OLD
time: Introduce new GENERIC_TIME_VSYSCALL
time: Only do nanosecond rounding on GENERIC_TIME_VSYSCALL_OLD systems
time: Convert x86_64 to using new update_vsyscall
Tejun Heo (4):
timer: Generalize timer-base flags handling
timer: Relocate declarations of init_timer_on_stack_key()
timer: Clean up timer initializers
timer: Implement TIMER_IRQSAFE
Todd Poynor (1):
alarmtimer: Implement minimum alarm interval for allowing suspend
arch/ia64/Kconfig |2 +-
arch/ia64/kernel/time.c |4 +-
arch/powerpc/Kconfig|2 +-
arch/powerpc/kernel/time.c |4 +-
arch/s390/Kconfig |2 +-
arch/s390/kernel/time.c |4 +-
arch/x86/include/asm/vgtod.h|4 +-
arch/x86/kernel/setup.c |3 +
arch/x86/kernel/vsyscall_64.c | 49 ++
arch/x86/vdso/vclock_gettime.c | 22 +++--
include/linux/alarmtimer.h | 31 +--
include/linux/clocksource.h | 16
include/linux/jiffies.h | 20 +
include/linux/timekeeper_internal.h | 108 +++
include/linux/timer.h | 165 ++-
kernel/time.c |2 +-
kernel/time/Kconfig |4 +
kernel/time/alarmtimer.c| 118 +
kernel/time/jiffies.c | 32 +++-
kernel/time/timekeeping.c | 117 +++--
kernel/timer.c | 118 -
21 files changed, 403 insertions(+), 424 deletions(-)
create mode 100644 include/linux/timekeeper_internal.h
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 310cf57..f9e673c 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -38,7 +38,7 @@ config IA64
select ARCH_TASK_STRUCT_ALLOCATOR
select ARCH_THREAD_INFO_ALLOCATOR
select ARCH_CLOCKSOURCE_DATA
- select GENERIC_TIME_VSYSCALL
+ select GENERIC_TIME_VSYSCALL_OLD
default y
help
The Itanium Processor Family is Intel's 64-bit successor to
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index ecc904b..d2f4e26 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -19,7 +19,7 @@
#include linux/interrupt.h
#include linux/efi.h
#include linux/timex.h
-#include linux/clocksource.h
+#include linux/timekeeper_internal.h
#include linux/platform_device.h
#include asm/machvec.h
@@ -454,7 +454,7 @@ void update_vsyscall_tz(void)
{
}
-void update_vsyscall(struct timespec *wall, struct timespec *wtm,
+void update_vsyscall_old(struct timespec *wall, struct timespec *wtm,
struct clocksource *c, u32 mult)
{
write_seqcount_begin(fsyscall_gtod_data.seq);
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 352f416..0881660 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -135,7 +135,7 @@ config PPC
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select GENERIC_SMP_IDLE_THREAD
select GENERIC_CMOS_UPDATE
- select GENERIC_TIME_VSYSCALL
+ select GENERIC_TIME_VSYSCALL_OLD
select GENERIC_CLOCKEVENTS
select GENERIC_STRNCPY_FROM_USER
select GENERIC_STRNLEN_USER
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index e49e931..c825809 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -73,7 +73,7 @@
/* powerpc clocksource/clockevent code */
#include linux/clockchips.h
-#include linux/clocksource.h
+#include linux/timekeeper_internal.h
static cycle_t rtc_read(struct clocksource *);
static struct clocksource clocksource_rtc = {
@@ -712,7 +712,7 @@ static cycle_t timebase_read(struct clocksource *cs)
return (cycle_t)get_tb();
}
-void update_vsyscall(struct timespec *wall_time, struct timespec *wtm,
+void
Re: [GIT PULL] timers for 3.7
On Fri, 12 Oct 2012, Thomas Gleixner wrote:
Linus,
please pull the latest timers-core-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
timers-core-for-linus
Forgot to add the short description:
* Bug fixes (one for a long standing dead loop issue)
* Rework of time related vsyscalls
* Timer extensions for workqueues
* Alarm timer updates
* Jiffies updates to remove compile time dependencies
Thanks,
tglx
--
Arnd Bergmann (1):
time/jiffies: bring back unconditional LATCH definition
Dan Carpenter (1):
timekeeping: Cast raw_interval to u64 to avoid shift overflow
Hildner, Christian (1):
timers: Fix endless looping between cascade() and internal_add_timer()
John Stultz (11):
alarmtimer: Use hrtimer per-alarm instead of per-base
alarmtimer: Remove unused helpers defines
alarmtimer: Rename alarmtimer_remove to alarmtimer_dequeue
jiffies: Kill unused TICK_USEC_TO_NSEC
jiffies: Remove compile time assumptions about CLOCK_TICK_RATE
time: Move timekeeper structure to timekeeper_internal.h for vsyscall
changes
time: Move update_vsyscall definitions to timekeeper_internal.h
time: Convert CONFIG_GENERIC_TIME_VSYSCALL to
CONFIG_GENERIC_TIME_VSYSCALL_OLD
time: Introduce new GENERIC_TIME_VSYSCALL
time: Only do nanosecond rounding on GENERIC_TIME_VSYSCALL_OLD systems
time: Convert x86_64 to using new update_vsyscall
Tejun Heo (4):
timer: Generalize timer-base flags handling
timer: Relocate declarations of init_timer_on_stack_key()
timer: Clean up timer initializers
timer: Implement TIMER_IRQSAFE
Todd Poynor (1):
alarmtimer: Implement minimum alarm interval for allowing suspend
arch/ia64/Kconfig |2 +-
arch/ia64/kernel/time.c |4 +-
arch/powerpc/Kconfig|2 +-
arch/powerpc/kernel/time.c |4 +-
arch/s390/Kconfig |2 +-
arch/s390/kernel/time.c |4 +-
arch/x86/include/asm/vgtod.h|4 +-
arch/x86/kernel/setup.c |3 +
arch/x86/kernel/vsyscall_64.c | 49 ++
arch/x86/vdso/vclock_gettime.c | 22 +++--
include/linux/alarmtimer.h | 31 +--
include/linux/clocksource.h | 16
include/linux/jiffies.h | 20 +
include/linux/timekeeper_internal.h | 108 +++
include/linux/timer.h | 165
++-
kernel/time.c |2 +-
kernel/time/Kconfig |4 +
kernel/time/alarmtimer.c| 118 +
kernel/time/jiffies.c | 32 +++-
kernel/time/timekeeping.c | 117 +++--
kernel/timer.c | 118 -
21 files changed, 403 insertions(+), 424 deletions(-)
create mode 100644 include/linux/timekeeper_internal.h
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 310cf57..f9e673c 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -38,7 +38,7 @@ config IA64
select ARCH_TASK_STRUCT_ALLOCATOR
select ARCH_THREAD_INFO_ALLOCATOR
select ARCH_CLOCKSOURCE_DATA
- select GENERIC_TIME_VSYSCALL
+ select GENERIC_TIME_VSYSCALL_OLD
default y
help
The Itanium Processor Family is Intel's 64-bit successor to
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index ecc904b..d2f4e26 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -19,7 +19,7 @@
#include linux/interrupt.h
#include linux/efi.h
#include linux/timex.h
-#include linux/clocksource.h
+#include linux/timekeeper_internal.h
#include linux/platform_device.h
#include asm/machvec.h
@@ -454,7 +454,7 @@ void update_vsyscall_tz(void)
{
}
-void update_vsyscall(struct timespec *wall, struct timespec *wtm,
+void update_vsyscall_old(struct timespec *wall, struct timespec *wtm,
struct clocksource *c, u32 mult)
{
write_seqcount_begin(fsyscall_gtod_data.seq);
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 352f416..0881660 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -135,7 +135,7 @@ config PPC
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select GENERIC_SMP_IDLE_THREAD
select GENERIC_CMOS_UPDATE
- select GENERIC_TIME_VSYSCALL
+ select GENERIC_TIME_VSYSCALL_OLD
select GENERIC_CLOCKEVENTS
select GENERIC_STRNCPY_FROM_USER
select GENERIC_STRNLEN_USER
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index e49e931..c825809 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -73,7 +73,7 @@
/* powerpc clocksource/clockevent code */
