Commit-ID: 4009338d62e9d1c21b230bd7ebab6c43c482430e Gitweb: http://git.kernel.org/tip/4009338d62e9d1c21b230bd7ebab6c43c482430e Author: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx> AuthorDate: Thu, 18 Aug 2011 11:33:39 -0700 Committer: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx> CommitDate: Mon, 29 Aug 2011 13:40:25 -0700 x86, cmpxchg: <linux/alternative.h> has LOCK_PREFIX Not <linux/bitops.h>. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx> Link: http://lkml.kernel.org/r/4E5BCC40.3030501@xxxxxxxx Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx> --- arch/x86/include/asm/cmpxchg_32.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/include/asm/cmpxchg_32.h b/arch/x86/include/asm/cmpxchg_32.h index 3deb725..024b694 100644 --- a/arch/x86/include/asm/cmpxchg_32.h +++ b/arch/x86/include/asm/cmpxchg_32.h @@ -1,7 +1,7 @@ #ifndef _ASM_X86_CMPXCHG_32_H #define _ASM_X86_CMPXCHG_32_H -#include <linux/bitops.h> /* for LOCK_PREFIX */ +#include <asm/alternative.h> /* Provides LOCK_PREFIX */ /* * Note: if you use set64_bit(), __cmpxchg64(), or their variants, you -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|