x86-tip cleanup series
cover x86-tip cleanup series
Hi,
here is a small series of trivial cleanups.
I'm not sure if it's a good idea to bring GLOBALs into entry_64.S so please check if it really become forming into better shape
(patch titled x86: head_64.S - use GLOBAL macro)
Please review.
Cyrill
PATCH 1/6 x86: head_64.S - remove useless balign
Impact: cleanup
NEXT_PAGE already has 'balign' so no
need to keep this redundant one.
---
No functional change -- md5 sum remains the same.
arch/x86/kernel/head_64.S | 2 -- 1 file changed, 2 deletions(-)
arch/x86/kernel/head_64.S +0 -2
@@ -329,8 +329,6 @@ early_idt_ripmsg: #endif /* CONFIG_EARLY_PRINTK */ .previous -.balign PAGE_SIZE - #define NEXT_PAGE(name) \ .balign PAGE_SIZE; \ ENTRY(name)
PATCH 2/6 x86: head_64.S - use IDT_ENTRIES instead of hardcoded number
In reply to Cyrill GorcunovImpact: cleanup
--- arch/x86/kernel/head_64.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/head_64.S +1 -1
@@ -417,7 +417,7 @@ ENTRY(phys_base) .section .bss, "aw", @nobits .align L1_CACHE_BYTES ENTRY(idt_table) - .skip 256 * 16 + .skip IDT_ENTRIES * 16 .section .bss.page_aligned, "aw", @nobits .align PAGE_SIZE
PATCH 3/6 x86: invalid_vm86_irq -- use predefined macros
In reply to Cyrill GorcunovImpact: cleanup
---
arch/x86/include/asm/irq_vectors.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/asm/irq_vectors.h +1 -1
@@ -128,7 +128,7 @@#ifndef __ASSEMBLY__static inline int invalid_vm86_irq (int irq) { -return irq <3 || irq >15 ; +return irq <FIRST_VM86_IRQ || irq >LAST_VM86_IRQ ; }#endif
PATCH 4/6 x86: entry_64.S - add missing ENDPROC
In reply to Cyrill Gorcunovnative_usergs_sysret64 is described as
extern void native_usergs_sysret64(void)
so lets add ENDPROC here
--- arch/x86/kernel/entry_64.S | 1 + 1 file changed, 1 insertion(+)
arch/x86/kernel/entry_64.S +1 -0
@@ -188,6 +188,7 @@ return_to_handler: ENTRY(native_usergs_sysret64) swapgs sysretq +ENDPROC(native_usergs_sysret64) #endif /* CONFIG_PARAVIRT */
PATCH 5/6 x86: head_64.S - use GLOBAL macro
In reply to Cyrill GorcunovImpact: cleanup
--- arch/x86/kernel/entry_64.S | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)
arch/x86/kernel/entry_64.S +7 -15
@@ -77,20 +77,17 @@ ENTRY(ftrace_caller) movq 8(%rbp), %rsi subq $MCOUNT_INSN_SIZE, %rdi -.globl ftrace_call -ftrace_call: +GLOBAL(ftrace_call) call ftrace_stub MCOUNT_RESTORE_FRAME #ifdef CONFIG_FUNCTION_GRAPH_TRACER -.globl ftrace_graph_call -ftrace_graph_call: +GLOBAL(ftrace_graph_call) jmp ftrace_stub #endif -.globl ftrace_stub -ftrace_stub: +GLOBAL(ftrace_stub) retq END(ftrace_caller)
@@ -110,8 +107,7 @@ ENTRY(mcount) jnz ftrace_graph_caller #endif -.globl ftrace_stub -ftrace_stub: +GLOBAL(ftrace_stub) retq trace:
@@ -148,9 +144,7 @@ ENTRY(ftrace_graph_caller) retq END(ftrace_graph_caller) - -.globl return_to_handler -return_to_handler: +GLOBAL(return_to_handler) subq $80, %rsp movq %rax, (%rsp)
@@ -634,16 +628,14 @@ tracesys: * Syscall return path ending with IRET. * Has correct top of stack, but partial stack frame. */ - .globl int_ret_from_sys_call - .globl int_with_check -int_ret_from_sys_call: +GLOBAL(int_ret_from_sys_call) DISABLE_INTERRUPTS(CLBR_NONE) TRACE_IRQS_OFF testl $3,CS-ARGOFFSET(%rsp) je retint_restore_args movl $_TIF_ALLWORK_MASK,%edi /* edi: mask to check */ -int_with_check: +GLOBAL(int_with_check) LOCKDEP_SYS_EXIT_IRQ GET_THREAD_INFO(%rcx) movl TI_flags(%rcx),%edx
PATCH 6/6 x86: efi_stub_32,64 - add missing ENDPROCs
In reply to Cyrill Gorcunov--- arch/x86/kernel/efi_stub_32.S | 1 + arch/x86/kernel/efi_stub_64.S | 7 +++++++ 2 files changed, 8 insertions(+)
arch/x86/kernel/efi_stub_32.S +1 -0
@@ -113,6 +113,7 @@ ENTRY(efi_call_phys) movl (%edx), %ecx pushl %ecx ret +ENDPROC(efi_call_phys) .previous .data
arch/x86/kernel/efi_stub_64.S +7 -0
@@ -41,6 +41,7 @@ ENTRY(efi_call0) addq $32, %rsp RESTORE_XMM ret +ENDPROC(efi_call0) ENTRY(efi_call1) SAVE_XMM
@@ -50,6 +51,7 @@ ENTRY(efi_call1) addq $32, %rsp RESTORE_XMM ret +ENDPROC(efi_call1) ENTRY(efi_call2) SAVE_XMM
@@ -59,6 +61,7 @@ ENTRY(efi_call2) addq $32, %rsp RESTORE_XMM ret +ENDPROC(efi_call2) ENTRY(efi_call3) SAVE_XMM
@@ -69,6 +72,7 @@ ENTRY(efi_call3) addq $32, %rsp RESTORE_XMM ret +ENDPROC(efi_call3) ENTRY(efi_call4) SAVE_XMM
@@ -80,6 +84,7 @@ ENTRY(efi_call4) addq $32, %rsp RESTORE_XMM ret +ENDPROC(efi_call4) ENTRY(efi_call5) SAVE_XMM
@@ -92,6 +97,7 @@ ENTRY(efi_call5) addq $48, %rsp RESTORE_XMM ret +ENDPROC(efi_call5) ENTRY(efi_call6) SAVE_XMM
@@ -107,3 +113,4 @@ ENTRY(efi_call6) addq $48, %rsp RESTORE_XMM ret +ENDPROC(efi_call6)
Quoted 8 lines · Cyrill Gorcunov
Hi,
here is a small series of trivial cleanups.
I'm not sure if it's a good idea to bring GLOBALs into
entry_64.Sso please check if it really become forming into better shape
(patch titled x86:head_64.S- use GLOBAL macro)
they look good - i've applied them to tip:x86/asm, thanks Cyrill!
Ingo