summaryrefslogtreecommitdiffstats
path: root/arch/microblaze/include/asm/atomic.h
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2012-03-30 12:10:03 +0200
committerMichal Simek <monstr@monstr.eu>2012-03-30 12:10:03 +0200
commit6a4770e335bd4df0a4577146f76e116ab6e23f40 (patch)
tree305056c20b6ccf3a4fed00e9e32f3a1dd039cd70 /arch/microblaze/include/asm/atomic.h
parentmicroblaze: Fix stack usage in PAGE_SIZE copy_tofrom_user (diff)
parentMerge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh (diff)
downloadlinux-6a4770e335bd4df0a4577146f76e116ab6e23f40.tar.xz
linux-6a4770e335bd4df0a4577146f76e116ab6e23f40.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
Diffstat (limited to 'arch/microblaze/include/asm/atomic.h')
-rw-r--r--arch/microblaze/include/asm/atomic.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/microblaze/include/asm/atomic.h b/arch/microblaze/include/asm/atomic.h
index 615f53992c65..472d8bf726df 100644
--- a/arch/microblaze/include/asm/atomic.h
+++ b/arch/microblaze/include/asm/atomic.h
@@ -1,6 +1,7 @@
#ifndef _ASM_MICROBLAZE_ATOMIC_H
#define _ASM_MICROBLAZE_ATOMIC_H
+#include <asm/cmpxchg.h>
#include <asm-generic/atomic.h>
#include <asm-generic/atomic64.h>