Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 420c1c57 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-core-for-linus' of... 

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

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (62 commits)
  posix-clocks: Check write permissions in posix syscalls
  hrtimer: Remove empty hrtimer_init_hres_timer()
  hrtimer: Update hrtimer->state documentation
  hrtimer: Update base[CLOCK_BOOTTIME].offset correctly
  timers: Export CLOCK_BOOTTIME via the posix timers interface
  timers: Add CLOCK_BOOTTIME hrtimer base
  time: Extend get_xtime_and_monotonic_offset() to also return sleep
  time: Introduce get_monotonic_boottime and ktime_get_boottime
  hrtimers: extend hrtimer base code to handle more then 2 clockids
  ntp: Remove redundant and incorrect parameter check
  mn10300: Switch do_timer() to xtimer_update()
  posix clocks: Introduce dynamic clocks
  posix-timers: Cleanup namespace
  posix-timers: Add support for fd based clocks
  x86: Add clock_adjtime for x86
  posix-timers: Introduce a syscall for clock tuning.
  time: Splitout compat timex accessors
  ntp: Add ADJ_SETOFFSET mode bit
  time: Introduce timekeeping_inject_offset
  posix-timer: Update comment
  ...

Fix up new system-call-related conflicts in
	arch/x86/ia32/ia32entry.S
	arch/x86/include/asm/unistd_32.h
	arch/x86/include/asm/unistd_64.h
	arch/x86/kernel/syscall_table_32.S
(name_to_handle_at()/open_by_handle_at() vs clock_adjtime()), and some
due to movement of get_jiffies_64() in:
	kernel/time.c
parents 9620639b 6e6823d1

arch/alpha/kernel/time.c

+2 −6
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ void read_persistent_clock(struct timespec *ts) 


/*

 * timer_interrupt() needs to keep up the real-time clock,

 * as well as call the "do_timer()" routine every clocktick

 * as well as call the "xtime_update()" routine every clocktick

 */

irqreturn_t timer_interrupt(int irq, void *dev)

{
@@ -172,8 +172,6 @@ irqreturn_t timer_interrupt(int irq, void *dev) 
	profile_tick(CPU_PROFILING);

#endif



	write_seqlock(&xtime_lock);



	/*

	 * Calculate how many ticks have passed since the last update,

	 * including any previous partial leftover.  Save any resulting
@@ -187,9 +185,7 @@ irqreturn_t timer_interrupt(int irq, void *dev) 
	nticks = delta >> FIX_SHIFT;



	if (nticks)

		do_timer(nticks);



	write_sequnlock(&xtime_lock);

		xtime_update(nticks);



	if (test_irq_work_pending()) {

		clear_irq_work_pending();

arch/arm/kernel/time.c

+1 −3
Original line number Diff line number Diff line
@@ -107,9 +107,7 @@ void timer_tick(void) 
{

	profile_tick(CPU_PROFILING);

	do_leds();

	write_seqlock(&xtime_lock);

	do_timer(1);

	write_sequnlock(&xtime_lock);

	xtime_update(1);

#ifndef CONFIG_SMP

	update_process_times(user_mode(get_irq_regs()));

#endif

arch/arm/mach-clps711x/include/mach/time.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ p720t_timer_interrupt(int irq, void *dev_id) 
{

	struct pt_regs *regs = get_irq_regs();

	do_leds();

	do_timer(1);

	xtime_update(1);

#ifndef CONFIG_SMP

	update_process_times(user_mode(regs));

#endif

arch/blackfin/kernel/time.c

+2 −4
Original line number Diff line number Diff line
@@ -114,16 +114,14 @@ u32 arch_gettimeoffset(void) 


/*

 * timer_interrupt() needs to keep up the real-time clock,

 * as well as call the "do_timer()" routine every clocktick

 * as well as call the "xtime_update()" routine every clocktick

 */

#ifdef CONFIG_CORE_TIMER_IRQ_L1

__attribute__((l1_text))

#endif

irqreturn_t timer_interrupt(int irq, void *dummy)

{

	write_seqlock(&xtime_lock);

	do_timer(1);

	write_sequnlock(&xtime_lock);

	xtime_update(1);



#ifdef CONFIG_IPIPE

	update_root_process_times(get_irq_regs());

arch/cris/arch-v10/kernel/time.c

+2 −2
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ stop_watchdog(void) 


/*

 * timer_interrupt() needs to keep up the real-time clock,

 * as well as call the "do_timer()" routine every clocktick

 * as well as call the "xtime_update()" routine every clocktick

 */



//static unsigned short myjiff; /* used by our debug routine print_timestamp */
@@ -176,7 +176,7 @@ timer_interrupt(int irq, void *dev_id) 


	/* call the real timer interrupt handler */



	do_timer(1);

	xtime_update(1);

	

        cris_do_profile(regs); /* Save profiling information */

        return IRQ_HANDLED;