hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

x86 vDSO: harmonize asm-offsets 

This change harmonizes the asm-offsets macros used in the 32-bit vDSO
across 32-bit and 64-bit builds.  It's a purely cosmetic change for now,
but it paves the way for consolidating the 32-bit vDSO builds.

Signed-off-by: Roland McGrath <roland@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Roland McGrath 2008-01-30 13:30:41 +01:00 committed by Ingo Molnar
parent f6b46ebf90
commit 108b545137
2 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/x86/kernel/asm-offsets_32.c
View File

@ -38,15 +38,15 @@ void foo(void);
void foo(void) void foo(void)
{ {
OFFSET(SIGCONTEXT_eax, sigcontext, eax); OFFSET(IA32_SIGCONTEXT_eax, sigcontext, eax);
OFFSET(SIGCONTEXT_ebx, sigcontext, ebx); OFFSET(IA32_SIGCONTEXT_ebx, sigcontext, ebx);
OFFSET(SIGCONTEXT_ecx, sigcontext, ecx); OFFSET(IA32_SIGCONTEXT_ecx, sigcontext, ecx);
OFFSET(SIGCONTEXT_edx, sigcontext, edx); OFFSET(IA32_SIGCONTEXT_edx, sigcontext, edx);
OFFSET(SIGCONTEXT_esi, sigcontext, esi); OFFSET(IA32_SIGCONTEXT_esi, sigcontext, esi);
OFFSET(SIGCONTEXT_edi, sigcontext, edi); OFFSET(IA32_SIGCONTEXT_edi, sigcontext, edi);
OFFSET(SIGCONTEXT_ebp, sigcontext, ebp); OFFSET(IA32_SIGCONTEXT_ebp, sigcontext, ebp);
OFFSET(SIGCONTEXT_esp, sigcontext, esp); OFFSET(IA32_SIGCONTEXT_esp, sigcontext, esp);
OFFSET(SIGCONTEXT_eip, sigcontext, eip); OFFSET(IA32_SIGCONTEXT_eip, sigcontext, eip);
BLANK(); BLANK();
OFFSET(CPUINFO_x86, cpuinfo_x86, x86); OFFSET(CPUINFO_x86, cpuinfo_x86, x86);
@ -94,7 +94,7 @@ void foo(void)
BLANK(); BLANK();
OFFSET(EXEC_DOMAIN_handler, exec_domain, handler); OFFSET(EXEC_DOMAIN_handler, exec_domain, handler);
OFFSET(RT_SIGFRAME_sigcontext, rt_sigframe, uc.uc_mcontext); OFFSET(IA32_RT_SIGFRAME_sigcontext, rt_sigframe, uc.uc_mcontext);
BLANK(); BLANK();
OFFSET(pbe_address, pbe, address); OFFSET(pbe_address, pbe, address);

54
arch/x86/kernel/vsyscall-sigreturn_32.S
View File

@ -91,27 +91,27 @@ __kernel_rt_sigreturn:
.sleb128 offset; /* offset */ \ .sleb128 offset; /* offset */ \
1: 1:
do_cfa_expr(SIGCONTEXT_esp+4) do_cfa_expr(IA32_SIGCONTEXT_esp+4)
do_expr(0, SIGCONTEXT_eax+4) do_expr(0, IA32_SIGCONTEXT_eax+4)
do_expr(1, SIGCONTEXT_ecx+4) do_expr(1, IA32_SIGCONTEXT_ecx+4)
do_expr(2, SIGCONTEXT_edx+4) do_expr(2, IA32_SIGCONTEXT_edx+4)
do_expr(3, SIGCONTEXT_ebx+4) do_expr(3, IA32_SIGCONTEXT_ebx+4)
do_expr(5, SIGCONTEXT_ebp+4) do_expr(5, IA32_SIGCONTEXT_ebp+4)
do_expr(6, SIGCONTEXT_esi+4) do_expr(6, IA32_SIGCONTEXT_esi+4)
do_expr(7, SIGCONTEXT_edi+4) do_expr(7, IA32_SIGCONTEXT_edi+4)
do_expr(8, SIGCONTEXT_eip+4) do_expr(8, IA32_SIGCONTEXT_eip+4)
.byte 0x42 /* DW_CFA_advance_loc 2 -- nop; popl eax. */ .byte 0x42 /* DW_CFA_advance_loc 2 -- nop; popl eax. */
do_cfa_expr(SIGCONTEXT_esp) do_cfa_expr(IA32_SIGCONTEXT_esp)
do_expr(0, SIGCONTEXT_eax) do_expr(0, IA32_SIGCONTEXT_eax)
do_expr(1, SIGCONTEXT_ecx) do_expr(1, IA32_SIGCONTEXT_ecx)
do_expr(2, SIGCONTEXT_edx) do_expr(2, IA32_SIGCONTEXT_edx)
do_expr(3, SIGCONTEXT_ebx) do_expr(3, IA32_SIGCONTEXT_ebx)
do_expr(5, SIGCONTEXT_ebp) do_expr(5, IA32_SIGCONTEXT_ebp)
do_expr(6, SIGCONTEXT_esi) do_expr(6, IA32_SIGCONTEXT_esi)
do_expr(7, SIGCONTEXT_edi) do_expr(7, IA32_SIGCONTEXT_edi)
do_expr(8, SIGCONTEXT_eip) do_expr(8, IA32_SIGCONTEXT_eip)
.align 4 .align 4
.LENDFDEDLSI1: .LENDFDEDLSI1:
@ -128,15 +128,15 @@ __kernel_rt_sigreturn:
slightly less complicated than the above, since we don't slightly less complicated than the above, since we don't
modify the stack pointer in the process. */ modify the stack pointer in the process. */
do_cfa_expr(RT_SIGFRAME_sigcontext-4 + SIGCONTEXT_esp) do_cfa_expr(IA32_RT_SIGFRAME_sigcontext-4 + IA32_SIGCONTEXT_esp)
do_expr(0, RT_SIGFRAME_sigcontext-4 + SIGCONTEXT_eax) do_expr(0, IA32_RT_SIGFRAME_sigcontext-4 + IA32_SIGCONTEXT_eax)
do_expr(1, RT_SIGFRAME_sigcontext-4 + SIGCONTEXT_ecx) do_expr(1, IA32_RT_SIGFRAME_sigcontext-4 + IA32_SIGCONTEXT_ecx)
do_expr(2, RT_SIGFRAME_sigcontext-4 + SIGCONTEXT_edx) do_expr(2, IA32_RT_SIGFRAME_sigcontext-4 + IA32_SIGCONTEXT_edx)
do_expr(3, RT_SIGFRAME_sigcontext-4 + SIGCONTEXT_ebx) do_expr(3, IA32_RT_SIGFRAME_sigcontext-4 + IA32_SIGCONTEXT_ebx)
do_expr(5, RT_SIGFRAME_sigcontext-4 + SIGCONTEXT_ebp) do_expr(5, IA32_RT_SIGFRAME_sigcontext-4 + IA32_SIGCONTEXT_ebp)
do_expr(6, RT_SIGFRAME_sigcontext-4 + SIGCONTEXT_esi) do_expr(6, IA32_RT_SIGFRAME_sigcontext-4 + IA32_SIGCONTEXT_esi)
do_expr(7, RT_SIGFRAME_sigcontext-4 + SIGCONTEXT_edi) do_expr(7, IA32_RT_SIGFRAME_sigcontext-4 + IA32_SIGCONTEXT_edi)
do_expr(8, RT_SIGFRAME_sigcontext-4 + SIGCONTEXT_eip) do_expr(8, IA32_RT_SIGFRAME_sigcontext-4 + IA32_SIGCONTEXT_eip)
.align 4 .align 4
.LENDFDEDLSI2: .LENDFDEDLSI2: