CRIS architecture: Correct compile errors

PATCH In review Jesper Nilsson 2 participants 2 messages Oct 30, 2007 Atomic infrastructure

lore

Share & tools

lore

Jesper Nilsson

author

2007-10-30 09:30 UTC #0 lore raw

PATCH 5/16 CRIS architecture: Correct compile errors

Include file linux/compiler.h is needed for 'likely'.

Signed-off-by Jesper Nilsson <[email protected]>

---
 atomic.h |    1 +
 1 file changed, 1 insertion(+)

include/asm-cris/atomic.h +1 -0

diff -urBb -X /h/jespern/.exclude_files clean_linux-2.6.23/include/asm-cris/atomic.h linux-2.6.23/include/asm-cris/atomic.h
@@ -5,6 +5,7 @@
 
 #include <asm/system.h>
 #include <asm/arch/atomic.h>
+#include <linux/compiler.h>
 
 /*
  * Atomic operations that C can't guarantee us.  Useful for

/^JN - Jesper Nilsson
--
Jesper Nilsson -- [email protected]

Andrew Morton

2007-10-30 22:14 UTC #1 lore raw

Quoted 19 lines · On Tue, 30 Oct 2007 10:30:31 +0100 Jesper Nilsson <[email protected]>…

Include file linux/compiler.h is needed for 'likely'.
Signed-off-by Jesper Nilsson <[email protected]>
---
 atomic.h |    1 +
 1 file changed, 1 insertion(+)
diff -urBb -X /h/jespern/.exclude_files clean_linux-2.6.23/include/asm-cris/atomic.h linux-2.6.23/include/asm-cris/atomic.h
include/asm-cris/atomic.h +1 -0
@@ -5,6 +5,7 @@
 
 #include <asm/system.h>
 #include <asm/arch/atomic.h>
+#include <linux/compiler.h>
 
 /*
  * Atomic operations that C can't guarantee us.  Useful for

Quoted 2 lines

/^JN - Jesper Nilsson
--

We conventionally include the <linux/...> headers before the <asm/...> headers, with a single blank line between them. So:

#ifndef __ASM_CRIS_ATOMIC__
#define __ASM_CRIS_ATOMIC__

#include <linux/compiler.h>

#include <asm/system.h>
#include <asm/arch/atomic.h>