diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2019-01-30 13:46:45 +0100 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2019-01-30 16:07:10 +0100 |
| commit | 5a064d398fbe2901e55be15c108f7ffa98b7eefb (patch) | |
| tree | 6a963db211174380dd333188c283c00f40c27852 /arch/x86/kernel/acpi/wakeup_64.S | |
| parent | x86/hw_breakpoints, kprobes: Remove kprobes ifdeffery (diff) | |
| download | linux-5a064d398fbe2901e55be15c108f7ffa98b7eefb.tar.xz linux-5a064d398fbe2901e55be15c108f7ffa98b7eefb.zip | |
x86/asm/suspend: Drop ENTRY from local data
ENTRY is intended for functions and shall be paired with ENDPROC. ENTRY
also aligns symbols which creates unnecessary holes between data.
So drop ENTRY from saved_eip in wakeup_32 and many saved_* in wakeup_64,
as these symbols are local only.
One could've used SYM_DATA_LOCAL for these symbols, but it was
discouraged earlier:
https://lkml.kernel.org/r/20170427124310.GC23352@amd
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Len Brown <len.brown@intel.com>
Cc: linux-arch@vger.kernel.org
Cc: linux-pm@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86-ml <x86@kernel.org>
Link: https://lkml.kernel.org/r/20190130124711.12463-3-jslaby@suse.cz
Diffstat (limited to 'arch/x86/kernel/acpi/wakeup_64.S')
| -rw-r--r-- | arch/x86/kernel/acpi/wakeup_64.S | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kernel/acpi/wakeup_64.S b/arch/x86/kernel/acpi/wakeup_64.S index 50b8ed0317a3..510fa12aab73 100644 --- a/arch/x86/kernel/acpi/wakeup_64.S +++ b/arch/x86/kernel/acpi/wakeup_64.S @@ -125,12 +125,12 @@ ENTRY(do_suspend_lowlevel) ENDPROC(do_suspend_lowlevel) .data -ENTRY(saved_rbp) .quad 0 -ENTRY(saved_rsi) .quad 0 -ENTRY(saved_rdi) .quad 0 -ENTRY(saved_rbx) .quad 0 +saved_rbp: .quad 0 +saved_rsi: .quad 0 +saved_rdi: .quad 0 +saved_rbx: .quad 0 -ENTRY(saved_rip) .quad 0 -ENTRY(saved_rsp) .quad 0 +saved_rip: .quad 0 +saved_rsp: .quad 0 ENTRY(saved_magic) .quad 0 |