Re: [PATCH 5/16] CRIS architecture: Correct compile errors

Andrew Morton
2007-10-30T22:14:47Z

On Tue, 30 Oct 2007 10:30:31 +0100
Jesper Nilsson <jesper.nilsson@axis.com> wrote:

> Include file linux/compiler.h is needed for 'likely'.
>
> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
>
> ---
> 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
> --- clean_linux-2.6.23/include/asm-cris/atomic.h 2007-10-09 22:31:38.000000000 +0200
> +++ linux-2.6.23/include/asm-cris/atomic.h 2007-10-22 10:32:54.000000000 +0200
> @@ -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
> --

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>

/*