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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Thu, 13 Sep 2012 22:29:05 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Shaohua Li <shli@...nel.org>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"David S. Miller" <davem@...emloft.net>,
	Rik van Riel <riel@...hat.com>
Subject: Re: linux-next: build failure after merge of the final tree (akpm
 tree related)

Hi,

On Thu, 13 Sep 2012 18:01:36 +0800 Shaohua Li <shli@...nel.org> 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@...b.auug.org.au

Content of type "application/pgp-signature" skipped