Skip to contentSkip to conversation

x86/calling.h: remove unused SAVE_ALL/RESTORE_ALL macro for !CONFIG_x86_64

PATCH Superseded Alexander Kuleshov 2 participants 2 messages Aug 21, 2015 – Aug 24, 2015

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/calling.h: remove unused SAVE_ALL/RESTORE_ALL macro for !CONFIG_x86_64

SAVE_ALL and RESTORE_ALL macros for !CONFIG_X86_64 were introduced in the 1a338ac32 commit (sched, x86: Optimize the preempt_schedule() call) and were used in the ___preempt_schedule and ___preempt_schedule_context from the arch/x86/kernel/preempt.S. But the arch/x86/kernel/preempt.S was removed in the 0ad6e3c5 commit (x86: Speed up ___preempt_schedule*() by using THUNK helpers) and ___preempt_schedule/___preempt_schedule_context are reimplemeted and not used SAVE_ALL/RESTORE_ALL anymore.

These macros have no users anymore, so we can remove it.

---
 arch/x86/entry/calling.h | 36 ------------------------------------
 1 file changed, 36 deletions(-)
arch/x86/entry/calling.h +0 -36
index f4e6308..7631233 100644
@@ -46,8 +46,6 @@ For 32-bit we have the following conventions - kernel is built with
 
 */
 
-#ifdef CONFIG_X86_64
-
 /*
  * 64-bit system call stack frame layout defines and helpers,
  * for assembly code:
@@ -207,37 +205,3 @@ For 32-bit we have the following conventions - kernel is built with
 	.macro icebp
 	.byte 0xf1
 	.endm
-
-#else /* CONFIG_X86_64 */
-
-/*
- * For 32bit only simplified versions of SAVE_ALL/RESTORE_ALL. These
- * are different from the entry_32.S versions in not changing the segment
- * registers. So only suitable for in kernel use, not when transitioning
- * from or to user space. The resulting stack frame is not a standard
- * pt_regs frame. The main use case is calling C code from assembler
- * when all the registers need to be preserved.
- */
-
-	.macro SAVE_ALL
-	pushl %eax
-	pushl %ebp
-	pushl %edi
-	pushl %esi
-	pushl %edx
-	pushl %ecx
-	pushl %ebx
-	.endm
-
-	.macro RESTORE_ALL
-	popl %ebx
-	popl %ecx
-	popl %edx
-	popl %esi
-	popl %edi
-	popl %ebp
-	popl %eax
-	.endm
-
-#endif /* CONFIG_X86_64 */
-
Signature · 1 line
2.5.0
#1 lore raw
Quoted 10 lines
Quoted 1 line
Quoted 1 line · On 21.08.15 at 21:12, <[email protected]> wrote:

SAVE_ALL and RESTORE_ALL macros for !CONFIG_X86_64 were introduced in the 1a338ac32 commit (sched, x86: Optimize the preempt_schedule() call) and were used in the ___preempt_schedule and ___preempt_schedule_context from the arch/x86/kernel/preempt.S. But the arch/x86/kernel/preempt.S was removed in the 0ad6e3c5 commit (x86: Speed up ___preempt_schedule*() by using THUNK helpers) and ___preempt_schedule/___preempt_schedule_context are reimplemeted and not used SAVE_ALL/RESTORE_ALL anymore.

These macros have no users anymore, so we can remove it.

As far as the description goes this is fine, but ...

arch/x86/entry/calling.h For 32-bit we have the following conventions - kernel is built with · line 49

Quoted 7 lines
arch/x86/entry/calling.h +0 -1
@@ -46,8 +46,6 @@ For 32-bit we have the following conventions - kernel is built with
 
 */
 
-#ifdef CONFIG_X86_64

... why do you remove this conditional, thus exposing x86-64-only definitions to ix86 code?

Jan