> On Jul 11, 2018, at 4:29 AM, Joerg Roedel <joro@xxxxxxxxxx> wrote:
>
> From: Joerg Roedel <jroedel@xxxxxxx>
>
> These offsets will be used in 32 bit assembly code as well,
> so make them available for all of x86 code.
Reviewed-by: Andy Lutomirski <luto@xxxxxxxxxx>
>
> Signed-off-by: Joerg Roedel <jroedel@xxxxxxx>
> ---
> arch/x86/kernel/asm-offsets.c | 4 ++++
> arch/x86/kernel/asm-offsets_64.c | 2 --
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
> index dcb008c..a1e1628 100644
> --- a/arch/x86/kernel/asm-offsets.c
> +++ b/arch/x86/kernel/asm-offsets.c
> @@ -103,4 +103,8 @@ void common(void) {
> OFFSET(CPU_ENTRY_AREA_entry_trampoline, cpu_entry_area, entry_trampoline);
> OFFSET(CPU_ENTRY_AREA_entry_stack, cpu_entry_area, entry_stack_page);
> DEFINE(SIZEOF_entry_stack, sizeof(struct entry_stack));
> +
> + /* Offset for sp0 and sp1 into the tss_struct */
> + OFFSET(TSS_sp0, tss_struct, x86_tss.sp0);
> + OFFSET(TSS_sp1, tss_struct, x86_tss.sp1);
> }
> diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
> index b2dcd16..3b9405e 100644
> --- a/arch/x86/kernel/asm-offsets_64.c
> +++ b/arch/x86/kernel/asm-offsets_64.c
> @@ -65,8 +65,6 @@ int main(void)
> #undef ENTRY
>
> OFFSET(TSS_ist, tss_struct, x86_tss.ist);
> - OFFSET(TSS_sp0, tss_struct, x86_tss.sp0);
> - OFFSET(TSS_sp1, tss_struct, x86_tss.sp1);
> BLANK();
>
> #ifdef CONFIG_STACKPROTECTOR
> --
> 2.7.4
>
