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

Commit 73e3e648 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt 

* git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
  clocksource: make clocksource watchdog cycle through online CPUs
  Documentation: move timer related documentation to a single place
  clockevents: optimise tick_nohz_stop_sched_tick() a bit
  locking: remove unused double_spin_lock()
  hrtimers: simplify lockdep handling
  timers: simplify lockdep handling
  posix-timers: fix shadowed variables
  timer_list: add annotations to workqueue.c
  hrtimer: use nanosleep specific restart_block fields
  hrtimer: add nanosleep specific restart_block member
parents 4adeaaf5 6993fc5b

Documentation/00-INDEX

+2 −4
Original line number Diff line number Diff line
@@ -167,10 +167,8 @@ highuid.txt 
	- notes on the change from 16 bit to 32 bit user/group IDs.

hpet.txt

	- High Precision Event Timer Driver for Linux.

hrtimer/

	- info on the timer_stats debugging facility for timer (ab)use.

hrtimers/

	- info on the hrtimers subsystem for high-resolution kernel timers.

timers/

	- info on the timer related topics

hw_random.txt

	- info on Linux support for random number generator in i8xx chipsets.

hwmon/

include/linux/hrtimer.h

+0 −2
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ struct hrtimer_clock_base { 
 * struct hrtimer_cpu_base - the per cpu clock bases

 * @lock:		lock protecting the base and associated clock bases

 *			and timers

 * @lock_key:		the lock_class_key for use with lockdep

 * @clock_base:		array of clock bases for this cpu

 * @curr_timer:		the timer which is executing a callback right now

 * @expires_next:	absolute time of the next event which was scheduled
@@ -189,7 +188,6 @@ struct hrtimer_clock_base { 
 */

struct hrtimer_cpu_base {

	spinlock_t			lock;

	struct lock_class_key		lock_key;

	struct hrtimer_clock_base	clock_base[HRTIMER_MAX_CLOCK_BASES];

	struct list_head		cb_pending;

#ifdef CONFIG_HIGH_RES_TIMERS