diff options
author | Daniel Borkmann <danborkmann@iogearbox.net> | 2012-01-19 06:37:13 -0500 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2012-01-20 02:48:11 -0500 |
commit | eacb6ec9ae5932ea02a44268684a56e4b5996ccf (patch) | |
tree | 611fb92971519742837e7151405755bcb7b2d50f /arch/microblaze | |
parent | dcd6c92267155e70a94b3927bce681ce74b80d1f (diff) |
microblaze: generic atomic64 support
This tiny patch adds generic atomic64 support for the Microblaze
architecture.
The patch is against the latest linux-2.6-microblaze tree. It also
fixes the kernel build for microblaze:
Error log:
CC kernel/trace/trace_clock.o
kernel/trace/trace_clock.c:117: error: expected '=', ',', ';', 'asm'
or '__attribute__' before 'trace_counter'
kernel/trace/trace_clock.c: In function 'trace_clock_counter':
kernel/trace/trace_clock.c:126: error: implicit declaration of
function 'atomic64_add_return'
kernel/trace/trace_clock.c:126: error: 'trace_counter' undeclared
(first use in this function)
kernel/trace/trace_clock.c:126: error: (Each undeclared identifier is
reported only once
kernel/trace/trace_clock.c:126: error: for each function it appears in.)
make[2]: *** [kernel/trace/trace_clock.o] Error 1
make[1]: *** [kernel/trace] Error 2
make: *** [kernel] Error 2
Signed-off-by: Ariane Keller <ariane.keller@tik.ee.ethz.ch>
Signed-off-by: Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch>
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze')
-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. |