diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-18 15:17:52 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-18 15:17:52 +0200 |
| commit | e7cfbea9cb7a02ea29fdae5d39c9e3d09102c4d5 (patch) | |
| tree | 37c20ec03e70dc7b5df1d02f16b6ac38d8ed1364 /kernel/timer.c | |
| parent | 7ac03db84baa204d7d280401ed65842541ed1078 (diff) | |
| parent | 56385a12d9bb9e173751f74b6c430742018cafc0 (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index f1b8afe1ad86..97bf05baade7 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -326,6 +326,7 @@ EXPORT_SYMBOL_GPL(round_jiffies_up_relative); /** * set_timer_slack - set the allowed slack for a timer + * @timer: the timer to be modified * @slack_hz: the amount of time (in jiffies) allowed for rounding * * Set the amount of time, in jiffies, that a certain timer has |