From b7ca0fcc8df06653d12c3436a53837d4f609a13f Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 20 Oct 2008 16:38:19 +0200
Subject: [PATCH] --- yaml --- r: 117631 b: refs/heads/master c:
 592aa999d6a272856c9bfbdaac0cfba1bb37c24c h: refs/heads/master i:   117629:
 fa5fbe17463f274b55a3afc86619f066561bfd69   117627:
 756d3eed2c9f2712332521894a5f7c304a54f8b2   117623:
 9101b8e6ce550d5c02eb5a6f37396f6b05e3c1bc   117615:
 a10b27f66f181fb5c07568146917d72b9636e414   117599:
 c8344f0dbb40c08104a25c2e8dcd3e0516829339   117567:
 309c637e95e404b2abb779ea9daad4b1817b3b29   117503:
 5c622485b446a4bf3a1be5601e17024cc9f41dc7 v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/hrtimer.h | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f481fe879e96..d0998b3b4ce5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 643bdf68f92a8516574ed7ca3713f9334c331b8d
+refs/heads/master: 592aa999d6a272856c9bfbdaac0cfba1bb37c24c
diff --git a/trunk/include/linux/hrtimer.h b/trunk/include/linux/hrtimer.h
index cb25c1cc2352..58bca8e9bae1 100644
--- a/trunk/include/linux/hrtimer.h
+++ b/trunk/include/linux/hrtimer.h
@@ -103,9 +103,14 @@ enum hrtimer_cb_mode {
 /**
  * struct hrtimer - the basic hrtimer structure
  * @node:	red black tree node for time ordered insertion
- * @expires:	the absolute expiry time in the hrtimers internal
+ * @_expires:	the absolute expiry time in the hrtimers internal
  *		representation. The time is related to the clock on
- *		which the timer is based.
+ *		which the timer is based. Is setup by adding
+ *		slack to the _softexpires value. For non range timers
+ *		identical to _softexpires.
+ * @_softexpires: the absolute earliest expiry time of the hrtimer.
+ *		The time which was given as expiry time when the timer
+ *		was armed.
  * @function:	timer expiry callback function
  * @base:	pointer to the timer base (per cpu and per clock)
  * @state:	state information (See bit values above)