diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-14 02:36:32 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-14 02:36:32 +0200 |
| commit | d791a4da6be46559393b23beab73d2ca20518864 (patch) | |
| tree | aa54f0010293968754460e7dbf4d80688370c69a /arch/x86/boot | |
| parent | Merge tag 'x86-misc-2024-05-13' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | x86/alternatives: Remove a superfluous newline in _static_cpu_has() (diff) | |
| download | linux-d791a4da6be46559393b23beab73d2ca20518864.tar.xz linux-d791a4da6be46559393b23beab73d2ca20518864.zip | |
Merge tag 'x86-asm-2024-05-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 asm updates from Ingo Molnar:
- Clean up & fix asm() operand modifiers & constraints
- Misc cleanups
* tag 'x86-asm-2024-05-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/alternatives: Remove a superfluous newline in _static_cpu_has()
x86/asm/64: Clean up memset16(), memset32(), memset64() assembly constraints in <asm/string_64.h>
x86/asm: Use "m" operand constraint in WRUSSQ asm template
x86/asm: Use %a instead of %P operand modifier in asm templates
x86/asm: Use %c/%n instead of %P operand modifier in asm templates
x86/asm: Remove %P operand modifier from altinstr asm templates
Diffstat (limited to 'arch/x86/boot')
| -rw-r--r-- | arch/x86/boot/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/boot/main.c b/arch/x86/boot/main.c index c4ea5258ab55..9049f390d834 100644 --- a/arch/x86/boot/main.c +++ b/arch/x86/boot/main.c @@ -119,8 +119,8 @@ static void init_heap(void) char *stack_end; if (boot_params.hdr.loadflags & CAN_USE_HEAP) { - asm("leal %P1(%%esp),%0" - : "=r" (stack_end) : "i" (-STACK_SIZE)); + asm("leal %n1(%%esp),%0" + : "=r" (stack_end) : "i" (STACK_SIZE)); heap_end = (char *) ((size_t)boot_params.hdr.heap_end_ptr + 0x200); |