diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
| commit | bef986502fa398b1785a3979b1aa17cd902d3527 (patch) | |
| tree | b59c1afe7b1dfcc001b86e54863f550d7ddc8c34 /include/linux/jiffies.h | |
| parent | 4bdbd2807deeccc0793d57fb5120d7a53f2c0b3c (diff) | |
| parent | c99767974ebd2a719d849fdeaaa1674456f5283f (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/hid.h
Diffstat (limited to 'include/linux/jiffies.h')
| -rw-r--r-- | include/linux/jiffies.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h index c8d5f207c3d4..0ec6e28bccd2 100644 --- a/include/linux/jiffies.h +++ b/include/linux/jiffies.h | |||
| @@ -74,7 +74,7 @@ | |||
| 74 | #define __jiffy_data __attribute__((section(".data"))) | 74 | #define __jiffy_data __attribute__((section(".data"))) |
| 75 | 75 | ||
| 76 | /* | 76 | /* |
| 77 | * The 64-bit value is not volatile - you MUST NOT read it | 77 | * The 64-bit value is not atomic - you MUST NOT read it |
| 78 | * without sampling the sequence number in xtime_lock. | 78 | * without sampling the sequence number in xtime_lock. |
| 79 | * get_jiffies_64() will do this for you as appropriate. | 79 | * get_jiffies_64() will do this for you as appropriate. |
| 80 | */ | 80 | */ |