diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-30 11:59:46 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-30 11:59:46 -0500 |
| commit | f07d4a76474045ac1b6d17662d2f6f041f5ce093 (patch) | |
| tree | 0176e61c9b8b4851c6d71ff3776bb7a883d1a54f /arch | |
| parent | dfd07ec3fa42fb14c4e333747cb73903220c6e81 (diff) | |
| parent | eacb6ec9ae5932ea02a44268684a56e4b5996ccf (diff) | |
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 74f23a460ba2..c8d6efb99dbf 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig | |||
| @@ -19,6 +19,7 @@ config MICROBLAZE | |||
| 19 | select GENERIC_IRQ_SHOW | 19 | select GENERIC_IRQ_SHOW |
| 20 | select GENERIC_PCI_IOMAP | 20 | select GENERIC_PCI_IOMAP |
| 21 | select GENERIC_CPU_DEVICES | 21 | select GENERIC_CPU_DEVICES |
| 22 | select GENERIC_ATOMIC64 | ||
| 22 | 23 | ||
| 23 | config SWAP | 24 | config SWAP |
| 24 | def_bool n | 25 | def_bool n |
diff --git a/arch/microblaze/include/asm/atomic.h b/arch/microblaze/include/asm/atomic.h index 6d2e1d418be7..615f53992c65 100644 --- a/arch/microblaze/include/asm/atomic.h +++ b/arch/microblaze/include/asm/atomic.h | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | #define _ASM_MICROBLAZE_ATOMIC_H | 2 | #define _ASM_MICROBLAZE_ATOMIC_H |
| 3 | 3 | ||
| 4 | #include <asm-generic/atomic.h> | 4 | #include <asm-generic/atomic.h> |
| 5 | #include <asm-generic/atomic64.h> | ||
| 5 | 6 | ||
| 6 | /* | 7 | /* |
| 7 | * Atomically test *v and decrement if it is greater than 0. | 8 | * Atomically test *v and decrement if it is greater than 0. |