mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 00:48:50 +00:00
bace7117d3
Brian Gerst noticed that I did a weird rename in the following commit:
b2502b418e ("x86/asm/entry: Untangle 'system_call' into two entry points: entry_SYSCALL_64 and entry_INT80_32")
which renamed __NR_ia32_syscall_max to __NR_entry_INT80_compat_max.
Now the original name was a misnomer, but the new one is a misnomer as well,
as all the 32-bit compat syscall entry points (sysenter, syscall) share the
system call table, not just the INT80 based one.
Rename it to __NR_syscall_compat_max.
Reported-by: Brian Gerst <brgerst@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
73 lines
1.6 KiB
C
73 lines
1.6 KiB
C
#ifndef __LINUX_KBUILD_H
|
|
# error "Please do not build this file directly, build asm-offsets.c instead"
|
|
#endif
|
|
|
|
#include <asm/ia32.h>
|
|
|
|
#define __SYSCALL_64(nr, sym, compat) [nr] = 1,
|
|
#define __SYSCALL_COMMON(nr, sym, compat) [nr] = 1,
|
|
#ifdef CONFIG_X86_X32_ABI
|
|
# define __SYSCALL_X32(nr, sym, compat) [nr] = 1,
|
|
#else
|
|
# define __SYSCALL_X32(nr, sym, compat) /* nothing */
|
|
#endif
|
|
static char syscalls_64[] = {
|
|
#include <asm/syscalls_64.h>
|
|
};
|
|
#define __SYSCALL_I386(nr, sym, compat) [nr] = 1,
|
|
static char syscalls_ia32[] = {
|
|
#include <asm/syscalls_32.h>
|
|
};
|
|
|
|
int main(void)
|
|
{
|
|
#ifdef CONFIG_PARAVIRT
|
|
OFFSET(PV_IRQ_adjust_exception_frame, pv_irq_ops, adjust_exception_frame);
|
|
OFFSET(PV_CPU_usergs_sysret32, pv_cpu_ops, usergs_sysret32);
|
|
OFFSET(PV_CPU_usergs_sysret64, pv_cpu_ops, usergs_sysret64);
|
|
OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs);
|
|
BLANK();
|
|
#endif
|
|
|
|
#define ENTRY(entry) OFFSET(pt_regs_ ## entry, pt_regs, entry)
|
|
ENTRY(bx);
|
|
ENTRY(cx);
|
|
ENTRY(dx);
|
|
ENTRY(sp);
|
|
ENTRY(bp);
|
|
ENTRY(si);
|
|
ENTRY(di);
|
|
ENTRY(r8);
|
|
ENTRY(r9);
|
|
ENTRY(r10);
|
|
ENTRY(r11);
|
|
ENTRY(r12);
|
|
ENTRY(r13);
|
|
ENTRY(r14);
|
|
ENTRY(r15);
|
|
ENTRY(flags);
|
|
BLANK();
|
|
#undef ENTRY
|
|
|
|
#define ENTRY(entry) OFFSET(saved_context_ ## entry, saved_context, entry)
|
|
ENTRY(cr0);
|
|
ENTRY(cr2);
|
|
ENTRY(cr3);
|
|
ENTRY(cr4);
|
|
ENTRY(cr8);
|
|
ENTRY(gdt_desc);
|
|
BLANK();
|
|
#undef ENTRY
|
|
|
|
OFFSET(TSS_ist, tss_struct, x86_tss.ist);
|
|
OFFSET(TSS_sp0, tss_struct, x86_tss.sp0);
|
|
BLANK();
|
|
|
|
DEFINE(__NR_syscall_max, sizeof(syscalls_64) - 1);
|
|
DEFINE(NR_syscalls, sizeof(syscalls_64));
|
|
|
|
DEFINE(__NR_syscall_compat_max, sizeof(syscalls_ia32) - 1);
|
|
DEFINE(IA32_NR_syscalls, sizeof(syscalls_ia32));
|
|
|
|
return 0;
|
|
}
|