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

Commit 60d8ce2c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  timers, init: Limit the number of per cpu calibration bootup messages
  posix-cpu-timers: optimize and document timer_create callback
  clockevents: Add missing include to pacify sparse
  x86: vmiclock: Fix printk format
  x86: Fix printk format due to variable type change
  sparc: fix printk for change of variable type
  clocksource/events: Fix fallout of generic code changes
  nohz: Allow 32-bit machines to sleep for more than 2.15 seconds
  nohz: Track last do_timer() cpu
  nohz: Prevent clocksource wrapping during idle
  nohz: Type cast printk argument
  mips: Use generic mult/shift factor calculation for clocks
  clocksource: Provide a generic mult/shift factor calculation
  clockevents: Use u32 for mult and shift factors
  nohz: Introduce arch_needs_cpu
  nohz: Reuse ktime in sub-functions of tick_check_idle.
  time: Remove xtime_cache
  time: Implement logarithmic time accumulation
parents 849e8dea feae3203

arch/mips/include/asm/time.h

+11 −3
Original line number Diff line number Diff line
@@ -84,8 +84,16 @@ static inline int init_mips_clocksource(void) 
#endif

}



extern void clocksource_set_clock(struct clocksource *cs, unsigned int clock);

extern void clockevent_set_clock(struct clock_event_device *cd,

		unsigned int clock);

static inline void clocksource_set_clock(struct clocksource *cs,

					 unsigned int clock)

{

	clocksource_calc_mult_shift(cs, clock, 4);

}



static inline void clockevent_set_clock(struct clock_event_device *cd,

					unsigned int clock)

{

	clockevents_calc_mult_shift(cd, clock, 4);

}



#endif /* _ASM_TIME_H */

arch/mips/kernel/time.c

+0 −33
Original line number Diff line number Diff line
@@ -71,39 +71,6 @@ EXPORT_SYMBOL(perf_irq); 


unsigned int mips_hpt_frequency;



void __init clocksource_set_clock(struct clocksource *cs, unsigned int clock)

{

	u64 temp;

	u32 shift;



	/* Find a shift value */

	for (shift = 32; shift > 0; shift--) {

		temp = (u64) NSEC_PER_SEC << shift;

		do_div(temp, clock);

		if ((temp >> 32) == 0)

			break;

	}

	cs->shift = shift;

	cs->mult = (u32) temp;

}



void __cpuinit clockevent_set_clock(struct clock_event_device *cd,

	unsigned int clock)

{

	u64 temp;

	u32 shift;



	/* Find a shift value */

	for (shift = 32; shift > 0; shift--) {

		temp = (u64) clock << shift;

		do_div(temp, NSEC_PER_SEC);

		if ((temp >> 32) == 0)

			break;

	}

	cd->shift = shift;

	cd->mult = (u32) temp;

}



/*

 * This function exists in order to cause an error due to a duplicate

 * definition if platform code should have its own implementation.  The hook

arch/powerpc/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -924,7 +924,7 @@ static void register_decrementer_clockevent(int cpu) 
	*dec = decrementer_clockevent;

	dec->cpumask = cpumask_of(cpu);



	printk(KERN_DEBUG "clockevent: %s mult[%lx] shift[%d] cpu[%d]\n",

	printk(KERN_DEBUG "clockevent: %s mult[%x] shift[%d] cpu[%d]\n",

	       dec->name, dec->mult, dec->shift, cpu);



	clockevents_register_device(dec);

arch/s390/include/asm/cputime.h

+8 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ struct s390_idle_data { 
	unsigned long long idle_count;

	unsigned long long idle_enter;

	unsigned long long idle_time;

	int nohz_delay;

};



DECLARE_PER_CPU(struct s390_idle_data, s390_idle);
@@ -198,4 +199,11 @@ static inline void s390_idle_check(void) 
		vtime_start_cpu();

}



static inline int s390_nohz_delay(int cpu)

{

	return per_cpu(s390_idle, cpu).nohz_delay != 0;

}



#define arch_needs_cpu(cpu) s390_nohz_delay(cpu)



#endif /* _S390_CPUTIME_H */

arch/s390/kernel/s390_ext.c

+2 −0
Original line number Diff line number Diff line
@@ -126,6 +126,8 @@ void __irq_entry do_extint(struct pt_regs *regs, unsigned short code) 
		/* Serve timer interrupts first. */

		clock_comparator_work();

	kstat_cpu(smp_processor_id()).irqs[EXTERNAL_INTERRUPT]++;

	if (code != 0x1004)

		__get_cpu_var(s390_idle).nohz_delay = 1;

        index = ext_hash(code);

	for (p = ext_int_hash[index]; p; p = p->next) {

		if (likely(p->code == code))