diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-30 08:59:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-30 08:59:46 -0800 |
| commit | f07d4a76474045ac1b6d17662d2f6f041f5ce093 (patch) | |
| tree | 0176e61c9b8b4851c6d71ff3776bb7a883d1a54f /arch | |
| parent | dfd07ec3fa42fb14c4e333747cb73903220c6e81 (diff) | |
| parent | eacb6ec9ae5932ea02a44268684a56e4b5996ccf (diff) | |
| download | linux-3.10-f07d4a76474045ac1b6d17662d2f6f041f5ce093.tar.gz linux-3.10-f07d4a76474045ac1b6d17662d2f6f041f5ce093.tar.bz2 linux-3.10-f07d4a76474045ac1b6d17662d2f6f041f5ce093.zip | |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: generic atomic64 support
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/microblaze/Kconfig | 1 | ||||
| -rw-r--r-- | arch/microblaze/include/asm/atomic.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index 74f23a460ba..c8d6efb99db 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig @@ -19,6 +19,7 @@ config MICROBLAZE select GENERIC_IRQ_SHOW select GENERIC_PCI_IOMAP select GENERIC_CPU_DEVICES + select GENERIC_ATOMIC64 config SWAP def_bool n diff --git a/arch/microblaze/include/asm/atomic.h b/arch/microblaze/include/asm/atomic.h index 6d2e1d418be..615f53992c6 100644 --- a/arch/microblaze/include/asm/atomic.h +++ b/arch/microblaze/include/asm/atomic.h @@ -2,6 +2,7 @@ #define _ASM_MICROBLAZE_ATOMIC_H #include <asm-generic/atomic.h> +#include <asm-generic/atomic64.h> /* * Atomically test *v and decrement if it is greater than 0. |