From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Thu, 18 Aug 2011 18:33:39 +0000 (-0700)
Subject: x86/cmpxchg: linux/alternative.h has LOCK_PREFIX
X-Git-Tag: next-20110826~15^2^2~11
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e1c8d3bcee83cc5ad00bdf8900a99add7abb1cb9;p=karo-tx-linux.git

x86/cmpxchg: linux/alternative.h has LOCK_PREFIX

Not linux/bitops.h.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
---

diff --git a/arch/x86/include/asm/cmpxchg_32.h b/arch/x86/include/asm/cmpxchg_32.h
index 284a6e8f7ce1..8d53b16fe930 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