From fc1a8a27410527e148454c8a7d11a87392ed56dc Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Thu, 18 Aug 2011 11:34:46 -0700 Subject: [PATCH] --- yaml --- r: 269545 b: refs/heads/master c: 416185bd5ac8a749ee43d1b0967b43782843d1a0 h: refs/heads/master i: 269543: c42d7583ddd8cae5eff65a268e9d03087444199e v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/cmpxchg_32.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f04b12756ec4..82981f237295 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4009338d62e9d1c21b230bd7ebab6c43c482430e +refs/heads/master: 416185bd5ac8a749ee43d1b0967b43782843d1a0 diff --git a/trunk/arch/x86/include/asm/cmpxchg_32.h b/trunk/arch/x86/include/asm/cmpxchg_32.h index 024b694517ce..59d8e36d1eed 100644 --- a/trunk/arch/x86/include/asm/cmpxchg_32.h +++ b/trunk/arch/x86/include/asm/cmpxchg_32.h @@ -9,6 +9,7 @@ */ extern void __xchg_wrong_size(void); +extern void __cmpxchg_wrong_size(void); /* * Note: no "lock" prefix even on SMP: xchg always implies lock anyway. @@ -84,8 +85,6 @@ static inline void set_64bit(volatile u64 *ptr, u64 value) : "memory"); } -extern void __cmpxchg_wrong_size(void); - /* * Atomic compare and exchange. Compare OLD with MEM, if identical, * store NEW in MEM. Return the initial value in MEM. Success is