diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-04-29 19:03:57 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-04-29 19:08:54 -0400 |
| commit | b701a47ba48b698976fb2fe05fb285b0edc1d26a (patch) | |
| tree | 48098b5a7f4179884d59ddd8908795f6beed2ccd | |
| parent | a5c9161f27c3e1ae6c0094d262f03a7e98262181 (diff) | |
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>
| -rw-r--r-- | 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 55fee12cea6d..e29a6c9bba00 100644 --- a/arch/x86/include/asm/alternative.h +++ b/arch/x86/include/asm/alternative.h | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | #define LOCK_PREFIX LOCK_PREFIX_HERE "\n\tlock; " | 38 | #define LOCK_PREFIX LOCK_PREFIX_HERE "\n\tlock; " |
| 39 | 39 | ||
| 40 | #else /* ! CONFIG_SMP */ | 40 | #else /* ! CONFIG_SMP */ |
| 41 | #define LOCK_PREFIX_HERE "" | ||
| 41 | #define LOCK_PREFIX "" | 42 | #define LOCK_PREFIX "" |
| 42 | #endif | 43 | #endif |
| 43 | 44 | ||