[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-b701a47ba48b698976fb2fe05fb285b0edc1d26a@git.kernel.org>
Date: Thu, 29 Apr 2010 23:24:43 GMT
From: "tip-bot for H. Peter Anvin" <hpa@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
luca@...a-barbieri.com, tglx@...utronix.de
Subject: [tip:x86/atomic] x86: Fix LOCK_PREFIX_HERE for uniprocessor build
Commit-ID: b701a47ba48b698976fb2fe05fb285b0edc1d26a
Gitweb: http://git.kernel.org/tip/b701a47ba48b698976fb2fe05fb285b0edc1d26a
Author: H. Peter Anvin <hpa@...or.com>
AuthorDate: Thu, 29 Apr 2010 16:03:57 -0700
Committer: H. Peter Anvin <hpa@...or.com>
CommitDate: Thu, 29 Apr 2010 16:08:54 -0700
x86: Fix LOCK_PREFIX_HERE for uniprocessor build
Checkin b3ac891b67bd4b1fc728d1c784cad1212dea433d:
x86: Add support for lock prefix in alternatives
... did not define LOCK_PREFIX_HERE in the case of a uniprocessor
build. As a result, it would cause any of the usages of this macro to
fail on a uniprocessor build. Fix this by defining LOCK_PREFIX_HERE
as a null string.
Signed-off-by: H. Peter Anvin <hpa@...or.com>
Cc: Luca Barbieri <luca@...a-barbieri.com>
LKML-Reference: <1267005265-27958-2-git-send-email-luca@...a-barbieri.com>
---
arch/x86/include/asm/alternative.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
index 55fee12..e29a6c9 100644
--- a/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
@@ -38,6 +38,7 @@
#define LOCK_PREFIX LOCK_PREFIX_HERE "\n\tlock; "
#else /* ! CONFIG_SMP */
+#define LOCK_PREFIX_HERE ""
#define LOCK_PREFIX ""
#endif
--
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