Skip to contentSkip to conversation

microblaze: generic atomic64 support

PATCH Applied Daniel Borkmann 2 participants 2 messages Jan 19, 2012 – Jan 24, 2012

Subsystems (2)
Microblaze architecture Atomic infrastructure
lore
Share & tools
lore

Daniel Borkmann

author
#0 lore raw

PATCH 1/1 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:

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

(the patch got corrupted beforehand, to that's why the resend)

Signed-off-by Ariane Keller <[email protected]>
Signed-off-by Daniel Borkmann <[email protected]>
---
 arch/microblaze/Kconfig              |    1 +
 arch/microblaze/include/asm/atomic.h |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)
arch/microblaze/Kconfig +1 -0
index 74f23a4..c8d6efb 100644
@@ -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
arch/microblaze/include/asm/atomic.h +1 -0
index 6d2e1d4..615f539 100644
@@ -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.
maintainer Applied
#1 lore raw
Quoted 35 lines · Daniel Borkmann

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:

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

(the patch got corrupted beforehand, to that's why the resend)

Signed-off-by Ariane Keller <[email protected]>
Signed-off-by Daniel Borkmann <[email protected]>
---
 arch/microblaze/Kconfig              |    1 +
 arch/microblaze/include/asm/atomic.h |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)
arch/microblaze/Kconfig +1 -0
index 74f23a4..c8d6efb 100644
@@ -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
arch/microblaze/include/asm/atomic.h +0 -0
index 6d2e1d4..615f539 100644

arch/microblaze/include/asm/atomic.h line 8

Quoted 7 lines
arch/microblaze/include/asm/atomic.h +1 -0
@@ -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.

Applied to microblaze next branch.

Thanks,
Michal

Signature · 4 lines
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian