Re: linux-next: build failure after merge of the final tree (akpmtree related)

From: Stephen Rothwell
Date: Thu Sep 13 2012 - 08:29:05 EST


Hi,

On Thu, 13 Sep 2012 18:01:36 +0800 Shaohua Li <shli@xxxxxxxxxx> wrote:
>
> Index: linux/arch/microblaze/include/asm/atomic.h
> ===================================================================
> --- linux.orig/arch/microblaze/include/asm/atomic.h 2012-09-13 17:56:54.206807900 +0800
> +++ linux/arch/microblaze/include/asm/atomic.h 2012-09-13 17:57:18.202506238 +0800
> @@ -9,7 +9,7 @@
> * Atomically test *v and decrement if it is greater than 0.
> * The function returns the old value of *v minus 1.
> */
> -static inline int atomic_dec_if_positive(atomic_t *v)
> +static inline int __atomic_dec_if_positive(atomic_t *v)
> {
> unsigned long flags;
> int res;
> @@ -22,5 +22,6 @@ static inline int atomic_dec_if_positive
>
> return res;
> }
> +#define atomic_dec_if_positive __atomic_dec_if_positive

You could just do

#define atomic_dec_if_positive atomic_dec_if_positive

without renaming the function.

--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature