diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-09 06:53:45 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-09 06:53:45 -0400 |
| commit | 1eecb8280b038019f2f914abc01b28caf5d0a168 (patch) | |
| tree | 7efa7cfc60b64ce50d437342d6457211effbb0ea /include/asm-generic/cmpxchg.h | |
| parent | c2f6702d318e43bf841da9c0ba5b6f1695661bbc (diff) | |
| parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) | |
Merge tag 'v3.4-rc2' into for-3.5
Linux 3.4-rc2 contains some bug fixes we need, including the addition of
an export for regcache_sync_region().
Diffstat (limited to 'include/asm-generic/cmpxchg.h')
| -rw-r--r-- | include/asm-generic/cmpxchg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-generic/cmpxchg.h b/include/asm-generic/cmpxchg.h index 8a361834dc25..14883026015d 100644 --- a/include/asm-generic/cmpxchg.h +++ b/include/asm-generic/cmpxchg.h | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #error "Cannot use generic cmpxchg on SMP" | 10 | #error "Cannot use generic cmpxchg on SMP" |
| 11 | #endif | 11 | #endif |
| 12 | 12 | ||
| 13 | #include <linux/types.h> | ||
| 13 | #include <linux/irqflags.h> | 14 | #include <linux/irqflags.h> |
| 14 | 15 | ||
| 15 | #ifndef xchg | 16 | #ifndef xchg |