[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-4009338d62e9d1c21b230bd7ebab6c43c482430e@git.kernel.org>
Date: Tue, 30 Aug 2011 05:22:27 GMT
From: tip-bot for Jeremy Fitzhardinge <jeremy.fitzhardinge@...rix.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
tglx@...utronix.de, hpa@...ux.intel.com,
jeremy.fitzhardinge@...rix.com
Subject: [tip:x86/spinlocks] x86, cmpxchg: <linux/alternative.h> has LOCK_PREFIX
Commit-ID: 4009338d62e9d1c21b230bd7ebab6c43c482430e
Gitweb: http://git.kernel.org/tip/4009338d62e9d1c21b230bd7ebab6c43c482430e
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge@...rix.com>
AuthorDate: Thu, 18 Aug 2011 11:33:39 -0700
Committer: H. Peter Anvin <hpa@...ux.intel.com>
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@...rix.com>
Link: http://lkml.kernel.org/r/4E5BCC40.3030501@goop.org
Signed-off-by: H. Peter Anvin <hpa@...ux.intel.com>
---
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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists