diff options
| author | James Morris <jmorris@namei.org> | 2011-06-30 04:43:56 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-06-30 04:43:56 -0400 |
| commit | 5b944a71a192977c1c018bbcfa0c52dca48e2368 (patch) | |
| tree | 9f234c4a93bb28890ad086c846d2bf0b35f7f7ae /include/linux/seqlock.h | |
| parent | 0e4ae0e0dec634b2ae53ac57d14141b140467dbe (diff) | |
| parent | c017d0d1351f916c0ced3f358afc491fdcf490b4 (diff) | |
Merge branch 'linus' into next
Diffstat (limited to 'include/linux/seqlock.h')
| -rw-r--r-- | include/linux/seqlock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h index e9811892844f..c6db9fb33c44 100644 --- a/include/linux/seqlock.h +++ b/include/linux/seqlock.h | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | 28 | ||
| 29 | #include <linux/spinlock.h> | 29 | #include <linux/spinlock.h> |
| 30 | #include <linux/preempt.h> | 30 | #include <linux/preempt.h> |
| 31 | #include <asm/processor.h> | ||
| 31 | 32 | ||
| 32 | typedef struct { | 33 | typedef struct { |
| 33 | unsigned sequence; | 34 | unsigned sequence; |