diff options
| author | Brian Gerst <brgerst@gmail.com> | 2020-03-13 20:51:38 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-03-21 16:03:23 +0100 |
| commit | cab56d3484d4bb8b21e4d9500392ac1ce99af026 (patch) | |
| tree | d4a8beaa2f48e787385c32b5b16a5c219823a1e7 /arch/x86/entry/syscalls/syscalltbl.sh | |
| parent | x86/entry/64: Add __SYSCALL_COMMON() (diff) | |
| download | linux-cab56d3484d4bb8b21e4d9500392ac1ce99af026.tar.xz linux-cab56d3484d4bb8b21e4d9500392ac1ce99af026.zip | |
x86/entry: Remove ABI prefixes from functions in syscall tables
Move the ABI prefixes to the __SYSCALL_[abi]() macros. This allows removal
of the need to strip the prefix for UML.
Signed-off-by: Brian Gerst <brgerst@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20200313195144.164260-13-brgerst@gmail.com
Diffstat (limited to 'arch/x86/entry/syscalls/syscalltbl.sh')
| -rw-r--r-- | arch/x86/entry/syscalls/syscalltbl.sh | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/x86/entry/syscalls/syscalltbl.sh b/arch/x86/entry/syscalls/syscalltbl.sh index 6106ed37b8de..929bde120d6b 100644 --- a/arch/x86/entry/syscalls/syscalltbl.sh +++ b/arch/x86/entry/syscalls/syscalltbl.sh @@ -17,27 +17,15 @@ emit() { local nr="$2" local entry="$3" local compat="$4" - local umlentry="" if [ "$abi" != "I386" -a -n "$compat" ]; then echo "a compat entry ($abi: $compat) for a 64-bit syscall makes no sense" >&2 exit 1 fi - # For CONFIG_UML, we need to strip the __x64_sys prefix - if [ "${entry}" != "${entry#__x64_sys}" ]; then - umlentry="sys${entry#__x64_sys}" - fi - if [ -z "$compat" ]; then - if [ -n "$entry" -a -z "$umlentry" ]; then - syscall_macro "$abi" "$nr" "$entry" - elif [ -n "$umlentry" ]; then # implies -n "$entry" - echo "#ifdef CONFIG_X86" + if [ -n "$entry" ]; then syscall_macro "$abi" "$nr" "$entry" - echo "#else /* CONFIG_UML */" - syscall_macro "$abi" "$nr" "$umlentry" - echo "#endif" fi else echo "#ifdef CONFIG_X86_32" |