---

yaml --- r: 117631 b: refs/heads/master c: 592aa99 h: refs/heads/master i: 117629: fa5fbe1 117627: 756d3ee 117623: 9101b8e 117615: a10b27f 117599: c8344f0 117567: 309c637 117503: 5c62248 v: v3
git-mirror · Oct 20, 2008 · b7ca0fc · b7ca0fc
1 parent f8890e9
commit b7ca0fc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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)