diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-06-11 08:01:14 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-06-11 08:01:14 +0200 |
| commit | cf9fe114e3b37e14fc8434d5abb192e35df551b1 (patch) | |
| tree | 0f82879295dc792f9df1a3ce79e143a3c073510f /kernel/time/timekeeping.c | |
| parent | sh: plug vsyscall dir in to archclean. (diff) | |
| parent | Merge branch 'tracing-urgent-for-linus' of git://git.kernel.org/pub/scm/linux... (diff) | |
| download | linux-cf9fe114e3b37e14fc8434d5abb192e35df551b1.tar.xz linux-cf9fe114e3b37e14fc8434d5abb192e35df551b1.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/time/timekeeping.c')
| -rw-r--r-- | kernel/time/timekeeping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index e97c50f8458b..e8c77d9c633a 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -22,7 +22,7 @@ /* * This read-write spinlock protects us from races in SMP while - * playing with xtime and avenrun. + * playing with xtime. */ __cacheline_aligned_in_smp DEFINE_SEQLOCK(xtime_lock); |