diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-05-13 10:35:27 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-05-13 10:35:27 +0200 |
| commit | 821f82125c47217390099532b09bd09cee9adaac (patch) | |
| tree | 26b526b4ffa17e5bd302381bff5d4bbadfe1299d /arch/x86/boot/boot.h | |
| parent | Merge branch 'x86/bugs' into x86/core, to merge dependent commits (diff) | |
| parent | x86/sev: Disentangle #VC handling code from startup code (diff) | |
| download | linux-821f82125c47217390099532b09bd09cee9adaac.tar.gz linux-821f82125c47217390099532b09bd09cee9adaac.zip | |
Merge branch 'x86/boot' into x86/core, to merge dependent commits
Prepare to resolve conflicts with an upstream series of fixes that conflict
with pending x86 changes:
6f5bf947bab0 Merge tag 'its-for-linus-20250509' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/boot/boot.h')
| -rw-r--r-- | arch/x86/boot/boot.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h index f899717f9e48..60580836daf7 100644 --- a/arch/x86/boot/boot.h +++ b/arch/x86/boot/boot.h @@ -155,14 +155,14 @@ static inline void wrgs32(u32 v, addr_t addr) static inline bool memcmp_fs(const void *s1, addr_t s2, size_t len) { bool diff; - asm volatile("fs; repe; cmpsb" CC_SET(nz) + asm volatile("fs repe cmpsb" CC_SET(nz) : CC_OUT(nz) (diff), "+D" (s1), "+S" (s2), "+c" (len)); return diff; } static inline bool memcmp_gs(const void *s1, addr_t s2, size_t len) { bool diff; - asm volatile("gs; repe; cmpsb" CC_SET(nz) + asm volatile("gs repe cmpsb" CC_SET(nz) : CC_OUT(nz) (diff), "+D" (s1), "+S" (s2), "+c" (len)); return diff; } |