summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/alternative.h
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-04-29 16:03:57 -0700
committerH. Peter Anvin <hpa@zytor.com>2010-04-29 16:08:54 -0700
commitb701a47ba48b698976fb2fe05fb285b0edc1d26a (patch)
tree48098b5a7f4179884d59ddd8908795f6beed2ccd /arch/x86/include/asm/alternative.h
parenta5c9161f27c3e1ae6c0094d262f03a7e98262181 (diff)
downloadlinux-b701a47ba48b698976fb2fe05fb285b0edc1d26a.tar.gz
linux-b701a47ba48b698976fb2fe05fb285b0edc1d26a.tar.bz2
linux-b701a47ba48b698976fb2fe05fb285b0edc1d26a.zip
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@zytor.com> Cc: Luca Barbieri <luca@luca-barbieri.com> LKML-Reference: <1267005265-27958-2-git-send-email-luca@luca-barbieri.com>
Diffstat (limited to 'arch/x86/include/asm/alternative.h')
-rw-r--r--arch/x86/include/asm/alternative.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
index 55fee12cea6d..e29a6c9bba00 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