* [patch 1/6] x86: head_64.S - remove useless balign
2009-02-23 19:56 [patch 0/6] x86-tip cleanup series Cyrill Gorcunov
@ 2009-02-23 19:56 ` Cyrill Gorcunov
2009-02-23 19:56 ` [patch 2/6] x86: head_64.S - use IDT_ENTRIES instead of hardcoded number Cyrill Gorcunov
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Cyrill Gorcunov @ 2009-02-23 19:56 UTC (permalink / raw)
To: hpa, mingo, linux-kernel; +Cc: heukelum, Cyrill Gorcunov
[-- Attachment #1: x86-remove-balign --]
[-- Type: text/plain, Size: 646 bytes --]
Impact: cleanup
NEXT_PAGE already has 'balign' so no
need to keep this redundant one.
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
---
No functional change -- md5 sum remains the same.
arch/x86/kernel/head_64.S | 2 --
1 file changed, 2 deletions(-)
Index: linux-2.6.git/arch/x86/kernel/head_64.S
===================================================================
--- linux-2.6.git.orig/arch/x86/kernel/head_64.S
+++ linux-2.6.git/arch/x86/kernel/head_64.S
@@ -329,8 +329,6 @@ early_idt_ripmsg:
#endif /* CONFIG_EARLY_PRINTK */
.previous
-.balign PAGE_SIZE
-
#define NEXT_PAGE(name) \
.balign PAGE_SIZE; \
ENTRY(name)
^ permalink raw reply [flat|nested] 8+ messages in thread* [patch 2/6] x86: head_64.S - use IDT_ENTRIES instead of hardcoded number
2009-02-23 19:56 [patch 0/6] x86-tip cleanup series Cyrill Gorcunov
2009-02-23 19:56 ` [patch 1/6] x86: head_64.S - remove useless balign Cyrill Gorcunov
@ 2009-02-23 19:56 ` Cyrill Gorcunov
2009-02-23 19:56 ` [patch 3/6] x86: invalid_vm86_irq -- use predefined macros Cyrill Gorcunov
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Cyrill Gorcunov @ 2009-02-23 19:56 UTC (permalink / raw)
To: hpa, mingo, linux-kernel; +Cc: heukelum, Cyrill Gorcunov
[-- Attachment #1: x86-use-IDT_ENTRIES --]
[-- Type: text/plain, Size: 585 bytes --]
Impact: cleanup
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
---
arch/x86/kernel/head_64.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6.git/arch/x86/kernel/head_64.S
===================================================================
--- linux-2.6.git.orig/arch/x86/kernel/head_64.S
+++ linux-2.6.git/arch/x86/kernel/head_64.S
@@ -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
^ permalink raw reply [flat|nested] 8+ messages in thread* [patch 3/6] x86: invalid_vm86_irq -- use predefined macros
2009-02-23 19:56 [patch 0/6] x86-tip cleanup series Cyrill Gorcunov
2009-02-23 19:56 ` [patch 1/6] x86: head_64.S - remove useless balign Cyrill Gorcunov
2009-02-23 19:56 ` [patch 2/6] x86: head_64.S - use IDT_ENTRIES instead of hardcoded number Cyrill Gorcunov
@ 2009-02-23 19:56 ` Cyrill Gorcunov
2009-02-23 19:57 ` [patch 4/6] x86: entry_64.S - add missing ENDPROC Cyrill Gorcunov
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Cyrill Gorcunov @ 2009-02-23 19:56 UTC (permalink / raw)
To: hpa, mingo, linux-kernel; +Cc: heukelum, Cyrill Gorcunov
[-- Attachment #1: x86-invalid_vm86_irq --]
[-- Type: text/plain, Size: 592 bytes --]
Impact: cleanup
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
---
arch/x86/include/asm/irq_vectors.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6.git/arch/x86/include/asm/irq_vectors.h
===================================================================
--- linux-2.6.git.orig/arch/x86/include/asm/irq_vectors.h
+++ linux-2.6.git/arch/x86/include/asm/irq_vectors.h
@@ -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
^ permalink raw reply [flat|nested] 8+ messages in thread* [patch 4/6] x86: entry_64.S - add missing ENDPROC
2009-02-23 19:56 [patch 0/6] x86-tip cleanup series Cyrill Gorcunov
` (2 preceding siblings ...)
2009-02-23 19:56 ` [patch 3/6] x86: invalid_vm86_irq -- use predefined macros Cyrill Gorcunov
@ 2009-02-23 19:57 ` Cyrill Gorcunov
2009-02-23 19:57 ` [patch 5/6] x86: head_64.S - use GLOBAL macro Cyrill Gorcunov
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Cyrill Gorcunov @ 2009-02-23 19:57 UTC (permalink / raw)
To: hpa, mingo, linux-kernel; +Cc: heukelum, Jeremy Fitzhardinge, Cyrill Gorcunov
[-- Attachment #1: x86-add-missed-end-native_usergs_sysret64 --]
[-- Type: text/plain, Size: 651 bytes --]
native_usergs_sysret64 is described as
extern void native_usergs_sysret64(void)
so lets add ENDPROC here
CC: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
---
arch/x86/kernel/entry_64.S | 1 +
1 file changed, 1 insertion(+)
Index: linux-2.6.git/arch/x86/kernel/entry_64.S
===================================================================
--- linux-2.6.git.orig/arch/x86/kernel/entry_64.S
+++ linux-2.6.git/arch/x86/kernel/entry_64.S
@@ -188,6 +188,7 @@ return_to_handler:
ENTRY(native_usergs_sysret64)
swapgs
sysretq
+ENDPROC(native_usergs_sysret64)
#endif /* CONFIG_PARAVIRT */
^ permalink raw reply [flat|nested] 8+ messages in thread* [patch 5/6] x86: head_64.S - use GLOBAL macro
2009-02-23 19:56 [patch 0/6] x86-tip cleanup series Cyrill Gorcunov
` (3 preceding siblings ...)
2009-02-23 19:57 ` [patch 4/6] x86: entry_64.S - add missing ENDPROC Cyrill Gorcunov
@ 2009-02-23 19:57 ` Cyrill Gorcunov
2009-02-23 19:57 ` [patch 6/6] x86: efi_stub_32,64 - add missing ENDPROCs Cyrill Gorcunov
2009-02-24 17:09 ` [patch 0/6] x86-tip cleanup series Ingo Molnar
6 siblings, 0 replies; 8+ messages in thread
From: Cyrill Gorcunov @ 2009-02-23 19:57 UTC (permalink / raw)
To: hpa, mingo, linux-kernel; +Cc: heukelum, Cyrill Gorcunov
[-- Attachment #1: x86-entry-add-GLOBAL --]
[-- Type: text/plain, Size: 1673 bytes --]
Impact: cleanup
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
---
arch/x86/kernel/entry_64.S | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
Index: linux-2.6.git/arch/x86/kernel/entry_64.S
===================================================================
--- linux-2.6.git.orig/arch/x86/kernel/entry_64.S
+++ linux-2.6.git/arch/x86/kernel/entry_64.S
@@ -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
^ permalink raw reply [flat|nested] 8+ messages in thread* [patch 6/6] x86: efi_stub_32,64 - add missing ENDPROCs
2009-02-23 19:56 [patch 0/6] x86-tip cleanup series Cyrill Gorcunov
` (4 preceding siblings ...)
2009-02-23 19:57 ` [patch 5/6] x86: head_64.S - use GLOBAL macro Cyrill Gorcunov
@ 2009-02-23 19:57 ` Cyrill Gorcunov
2009-02-24 17:09 ` [patch 0/6] x86-tip cleanup series Ingo Molnar
6 siblings, 0 replies; 8+ messages in thread
From: Cyrill Gorcunov @ 2009-02-23 19:57 UTC (permalink / raw)
To: hpa, mingo, linux-kernel; +Cc: heukelum, Cyrill Gorcunov
[-- Attachment #1: x86-efi-stub --]
[-- Type: text/plain, Size: 1575 bytes --]
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
---
arch/x86/kernel/efi_stub_32.S | 1 +
arch/x86/kernel/efi_stub_64.S | 7 +++++++
2 files changed, 8 insertions(+)
Index: linux-2.6.git/arch/x86/kernel/efi_stub_32.S
===================================================================
--- linux-2.6.git.orig/arch/x86/kernel/efi_stub_32.S
+++ linux-2.6.git/arch/x86/kernel/efi_stub_32.S
@@ -113,6 +113,7 @@ ENTRY(efi_call_phys)
movl (%edx), %ecx
pushl %ecx
ret
+ENDPROC(efi_call_phys)
.previous
.data
Index: linux-2.6.git/arch/x86/kernel/efi_stub_64.S
===================================================================
--- linux-2.6.git.orig/arch/x86/kernel/efi_stub_64.S
+++ linux-2.6.git/arch/x86/kernel/efi_stub_64.S
@@ -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)
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [patch 0/6] x86-tip cleanup series
2009-02-23 19:56 [patch 0/6] x86-tip cleanup series Cyrill Gorcunov
` (5 preceding siblings ...)
2009-02-23 19:57 ` [patch 6/6] x86: efi_stub_32,64 - add missing ENDPROCs Cyrill Gorcunov
@ 2009-02-24 17:09 ` Ingo Molnar
6 siblings, 0 replies; 8+ messages in thread
From: Ingo Molnar @ 2009-02-24 17:09 UTC (permalink / raw)
To: Cyrill Gorcunov; +Cc: hpa, linux-kernel, heukelum
* Cyrill Gorcunov <gorcunov@gmail.com> wrote:
> 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)
they look good - i've applied them to tip:x86/asm, thanks
Cyrill!
Ingo
^ permalink raw reply [flat|nested] 8+ messages in thread