diff options
| author |   Jens Axboe <axboe@kernel.dk> | 2012-05-01 14:29:55 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-05-01 14:29:55 +0200 |
| commit | 0b7877d4eea3f93e3dd941999522bbd8c538cb53 (patch) | |
| tree | ade6d4e411b9b9b569c802e3b2179826162c934c /arch/microblaze/include/asm/cmpxchg.h | |
| parent | vmsplice: relax alignement requirements for SPLICE_F_GIFT (diff) | |
| parent | Linux 3.4-rc5 (diff) | |
| download | linux-dev-0b7877d4eea3f93e3dd941999522bbd8c538cb53.tar.xz linux-dev-0b7877d4eea3f93e3dd941999522bbd8c538cb53.zip | |
Merge tag 'v3.4-rc5' into for-3.5/core
The core branch is behind driver commits that we want to build
on for 3.5, hence I'm pulling in a later -rc.
Linux 3.4-rc5
Conflicts:
Documentation/feature-removal-schedule.txt
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'arch/microblaze/include/asm/cmpxchg.h')
| -rw-r--r-- | arch/microblaze/include/asm/cmpxchg.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/microblaze/include/asm/cmpxchg.h b/arch/microblaze/include/asm/cmpxchg.h index 0094859abd9b..538afc0ab9f3 100644 --- a/arch/microblaze/include/asm/cmpxchg.h +++ b/arch/microblaze/include/asm/cmpxchg.h @@ -1,6 +1,8 @@ #ifndef _ASM_MICROBLAZE_CMPXCHG_H #define _ASM_MICROBLAZE_CMPXCHG_H +#include <linux/irqflags.h> + void __bad_xchg(volatile void *ptr, int size); static inline unsigned long __xchg(unsigned long x, volatile void *ptr, |