linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] microblaze: generic atomic64 support
@ 2012-01-18 13:25 danborkmann
  0 siblings, 0 replies; 3+ messages in thread
From: danborkmann @ 2012-01-18 13:25 UTC (permalink / raw)
  To: Michal Simek, linux-kernel; +Cc: microblaze-uclinux, Ariane Keller

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


Signed-off-by: Ariane Keller <ariane.keller@tik.ee.ethz.ch>
Signed-off-by: Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch>

diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 74f23a4..c8d6efb 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 6d2e1d4..615f539 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.



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] microblaze: generic atomic64 support
  2012-01-19 11:37 Daniel Borkmann
@ 2012-01-24  8:26 ` Michal Simek
  0 siblings, 0 replies; 3+ messages in thread
From: Michal Simek @ 2012-01-24  8:26 UTC (permalink / raw)
  To: Daniel Borkmann; +Cc: linux-kernel, Ariane Keller

Daniel Borkmann wrote:
> 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 <ariane.keller@tik.ee.ethz.ch>
> Signed-off-by: Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch>
> ---
>  arch/microblaze/Kconfig              |    1 +
>  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 74f23a4..c8d6efb 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 6d2e1d4..615f539 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.

Applied to microblaze next branch.

Thanks,
Michal


-- 
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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH] microblaze: generic atomic64 support
@ 2012-01-19 11:37 Daniel Borkmann
  2012-01-24  8:26 ` Michal Simek
  0 siblings, 1 reply; 3+ messages in thread
From: Daniel Borkmann @ 2012-01-19 11:37 UTC (permalink / raw)
  To: Michal Simek, linux-kernel; +Cc: Ariane Keller

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 <ariane.keller@tik.ee.ethz.ch>
Signed-off-by: Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch>
---
 arch/microblaze/Kconfig              |    1 +
 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 74f23a4..c8d6efb 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 6d2e1d4..615f539 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.

^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-01-24  8:26 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-18 13:25 [PATCH] microblaze: generic atomic64 support danborkmann
2012-01-19 11:37 Daniel Borkmann
2012-01-24  8:26 ` Michal Simek

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).